ifplugd 0.25 remove nylonisms and bashisms, remove 0.20, closes #1587

diff --git a/packages/ifplugd/files/nobash.patch b/packages/ifplugd/files/nobash.patch
new file mode 100644 (file)
index 0000000..8d0be50
--- /dev/null
+++ b/packages/ifplugd/files/nobash.patch
@@ -0,0 +1,8 @@
+--- ifplugd-0.28/conf/ifplugd.init.in.orig     2007-05-24 19:00:03.000000000 +0000
++++ ifplugd-0.28/conf/ifplugd.init.in  2007-05-24 19:00:09.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # $Id: ifplugd.init.in 86 2004-01-26 15:34:24Z lennart $
+ 
+ # This file is part of ifplugd.

diff --git a/packages/ifplugd/ifplugd_0.20.bb b/packages/ifplugd/ifplugd_0.20.bb
deleted file mode 100644 (file)
index 18e9a66..0000000
--- a/packages/ifplugd/ifplugd_0.20.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device when a cable is plugged in and automatically unconfigure it if the cable is pulled."
-DEPENDS = "libdaemon"
-LICENSE = "GPL"
-
-SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz"
-
-inherit autotools update-rc.d
-
-EXTRA_OECONF = "--disable-lynx"
-
-INITSCRIPT_NAME = "ifplugd"
-INITSCRIPT_PARAMS = "defaults"
\ No newline at end of file

diff --git a/packages/ifplugd/ifplugd_0.25.bb b/packages/ifplugd/ifplugd_0.25.bb
index 55c2be0..ca7f219 100644 (file)
--- a/packages/ifplugd/ifplugd_0.25.bb
+++ b/packages/ifplugd/ifplugd_0.25.bb
@@ -1,12 +1,14 @@
-SECTION = "console/network"
-DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device when a cable is plugged in and automatically unconfigure it if the cable is pulled."
+DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device \
+when a cable is plugged in and automatically unconfigure it if the cable is pulled."
 HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/"
+SECTION = "network"
 DEPENDS = "libdaemon"
 LICENSE = "GPL"
+PR = "r1"
 
-SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz"
-
-SRC_URI_append_nylon = " file://kernel-types.patch;patch=1"
+SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \
+ file://kernel-types.patch;patch=1 \
+ file://nobash.patch;patch=1"
 
 inherit autotools update-rc.d pkgconfig
 
@@ -15,4 +17,4 @@ EXTRA_OECONF = "--disable-lynx"
 INITSCRIPT_NAME = "ifplugd"
 INITSCRIPT_PARAMS = "defaults"
 
-CONFFILES_${PN}_nylon = "${sysconfdir}/ifplugd/ifplugd.conf"
+CONFFILES_${PN} = "${sysconfdir}/ifplugd/ifplugd.conf"