summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-01-04 08:19:31 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-01-04 08:19:31 +0000
commit72b1c191434a2aa522adc2861abcfc585687853b (patch)
tree762c5f171967bd12d887d0c727c8822650949afe /packages
parent842f7bcf3e851d855647fd63627653d1fcc09dae (diff)
ifupdown: updated to 0.6.8 (current Debian version)
Diffstat (limited to 'packages')
-rw-r--r--packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch16
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty (renamed from packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty)0
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/busybox.patch (renamed from packages/ifupdown/ifupdown-0.6.4/busybox.patch)0
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/head-tail.patch (renamed from packages/ifupdown/ifupdown-0.6.4/head-tail.patch)0
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/init (renamed from packages/ifupdown/ifupdown-0.6.4/init)0
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/interfaces (renamed from packages/ifupdown/ifupdown-0.6.4/interfaces)0
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/udhcpc.patch (renamed from packages/ifupdown/ifupdown-0.6.4/udhcpc.patch)14
-rw-r--r--packages/ifupdown/ifupdown-0.6.8/zeroconf.patch (renamed from packages/ifupdown/ifupdown-0.6.4/zeroconf.patch)0
-rw-r--r--packages/ifupdown/ifupdown_0.6.8.bb (renamed from packages/ifupdown/ifupdown_0.6.4.bb)12
9 files changed, 14 insertions, 28 deletions
diff --git a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch b/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch
deleted file mode 100644
index f90e312694..0000000000
--- a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- ifupdown-0.6.4/execute.c~gcc34-fix 2004-04-28 00:16:45.000000000 +0200
-+++ ifupdown-0.6.4/execute.c 2004-04-28 00:17:11.000000000 +0200
-@@ -167,7 +167,7 @@
- case 0: /* child */
- execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ);
- exit(127);
-- default: /* parent */
-+ default:; /* parent */
- }
- waitpid(child, &status, 0);
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) \ No newline at end of file
diff --git a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty
+++ b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty
diff --git a/packages/ifupdown/ifupdown-0.6.4/busybox.patch b/packages/ifupdown/ifupdown-0.6.8/busybox.patch
index 5619ab7c0a..5619ab7c0a 100644
--- a/packages/ifupdown/ifupdown-0.6.4/busybox.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/busybox.patch
diff --git a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch
index a86a25d2fb..a86a25d2fb 100644
--- a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch
diff --git a/packages/ifupdown/ifupdown-0.6.4/init b/packages/ifupdown/ifupdown-0.6.8/init
index d258d51ff4..d258d51ff4 100644
--- a/packages/ifupdown/ifupdown-0.6.4/init
+++ b/packages/ifupdown/ifupdown-0.6.8/init
diff --git a/packages/ifupdown/ifupdown-0.6.4/interfaces b/packages/ifupdown/ifupdown-0.6.8/interfaces
index f1bd92ed2b..f1bd92ed2b 100644
--- a/packages/ifupdown/ifupdown-0.6.4/interfaces
+++ b/packages/ifupdown/ifupdown-0.6.8/interfaces
diff --git a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch
index 39a6b3349d..5b662e7988 100644
--- a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch
@@ -1,18 +1,20 @@
---- ifupdown/inet.defn.orig 2004-04-29 20:16:07.000000000 +0200
-+++ ifupdown/inet.defn 2004-04-29 20:16:13.000000000 +0200
+Index: ifupdown-0.6.8/inet.defn
+===================================================================
+--- ifupdown-0.6.8.orig/inet.defn 2007-01-04 09:11:43.000000000 +0100
++++ ifupdown-0.6.8/inet.defn 2007-01-04 09:12:51.000000000 +0100
@@ -81,8 +81,7 @@
elsif (execable("/sbin/dhclient"))
pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
- udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
-- [[-c %clientid%]] \
+- [[-c %client%]] \
+ udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \
elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
- dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \
+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
[[-l %leasetime%]] %iface% \
@@ -91,11 +90,11 @@
down
- dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
+ dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
if (execable("/sbin/dhclient3"))
- cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
+ kill -TERM `cat /var/run/dhclient.%iface%.pid` \
@@ -23,4 +25,4 @@
+ kill -TERM `cat /var/run/udhcpc.%iface%.pid` \
elsif (execable("/sbin/udhcpc"))
dhcpcd -k %iface% \
- elsif (execable("/sbin/dhcpcd")) \ No newline at end of file
+ elsif (execable("/sbin/dhcpcd"))
diff --git a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch
index 33745db6ff..33745db6ff 100644
--- a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.8.bb
index bf0c82634f..53ccb5fe6c 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.8.bb
@@ -1,6 +1,3 @@
-BROKEN = "1"
-# Debian moved to 0.6.7
-
DESCRIPTION = "High level tools to configure network interfaces \
This package provides the tools ifup and ifdown which may be used to \
configure (or, respectively, deconfigure) network interfaces, based on \
@@ -9,12 +6,10 @@ LICENSE = "GPL"
SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \
- ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz \
file://busybox.patch;patch=1 \
file://udhcpc.patch;patch=1 \
file://zeroconf.patch;patch=1 \
- file://gcc34-fix.patch;patch=1 \
file://init \
file://interfaces"
@@ -28,9 +23,14 @@ do_compile () {
do_install () {
install -d ${D}${sysconfdir}/init.d \
${D}${sysconfdir}/network \
+ ${D}${mandir}/man8 \
+ ${D}${mandir}/man5 \
${D}${base_sbindir}
install -m 0755 ifup ${D}${base_sbindir}/
ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown
install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
+ install -m 0644 ifup.8 ${D}${mandir}/man8
+ install -m 0644 interfaces.5 ${D}${mandir}/man5
+ cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8
}