From 72b1c191434a2aa522adc2861abcfc585687853b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 4 Jan 2007 08:19:31 +0000 Subject: ifupdown: updated to 0.6.8 (current Debian version) --- packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty | 0 packages/ifupdown/ifupdown-0.6.4/busybox.patch | 20 ------------- packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch | 16 ----------- packages/ifupdown/ifupdown-0.6.4/head-tail.patch | 14 --------- packages/ifupdown/ifupdown-0.6.4/init | 13 --------- packages/ifupdown/ifupdown-0.6.4/interfaces | 2 -- packages/ifupdown/ifupdown-0.6.4/udhcpc.patch | 26 ----------------- packages/ifupdown/ifupdown-0.6.4/zeroconf.patch | 21 -------------- packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty | 0 packages/ifupdown/ifupdown-0.6.8/busybox.patch | 20 +++++++++++++ packages/ifupdown/ifupdown-0.6.8/head-tail.patch | 14 +++++++++ packages/ifupdown/ifupdown-0.6.8/init | 13 +++++++++ packages/ifupdown/ifupdown-0.6.8/interfaces | 2 ++ packages/ifupdown/ifupdown-0.6.8/udhcpc.patch | 28 ++++++++++++++++++ packages/ifupdown/ifupdown-0.6.8/zeroconf.patch | 21 ++++++++++++++ packages/ifupdown/ifupdown_0.6.4.bb | 36 ------------------------ packages/ifupdown/ifupdown_0.6.8.bb | 36 ++++++++++++++++++++++++ 17 files changed, 134 insertions(+), 148 deletions(-) delete mode 100644 packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty delete mode 100644 packages/ifupdown/ifupdown-0.6.4/busybox.patch delete mode 100644 packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch delete mode 100644 packages/ifupdown/ifupdown-0.6.4/head-tail.patch delete mode 100644 packages/ifupdown/ifupdown-0.6.4/init delete mode 100644 packages/ifupdown/ifupdown-0.6.4/interfaces delete mode 100644 packages/ifupdown/ifupdown-0.6.4/udhcpc.patch delete mode 100644 packages/ifupdown/ifupdown-0.6.4/zeroconf.patch create mode 100644 packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty create mode 100644 packages/ifupdown/ifupdown-0.6.8/busybox.patch create mode 100644 packages/ifupdown/ifupdown-0.6.8/head-tail.patch create mode 100644 packages/ifupdown/ifupdown-0.6.8/init create mode 100644 packages/ifupdown/ifupdown-0.6.8/interfaces create mode 100644 packages/ifupdown/ifupdown-0.6.8/udhcpc.patch create mode 100644 packages/ifupdown/ifupdown-0.6.8/zeroconf.patch delete mode 100644 packages/ifupdown/ifupdown_0.6.4.bb create mode 100644 packages/ifupdown/ifupdown_0.6.8.bb diff --git a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ifupdown/ifupdown-0.6.4/busybox.patch b/packages/ifupdown/ifupdown-0.6.4/busybox.patch deleted file mode 100644 index 5619ab7c0a..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/busybox.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ifupdown-0.6.4/inet.defn~busybox -+++ ifupdown-0.6.4/inet.defn -@@ -116,8 +116,8 @@ - options - provider name -- Use /name/ as the provider (from /etc/ppp/peers). - up -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \ -- -p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]] -+ /sbin/start-stop-daemon -S -x /usr/bin/wvdial \ -+ -p /var/run/wvdial.%iface% -- [[ %provider% ]] - down -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \ -- -p /var/run/wvdial.%iface% -s 2 -+ /sbin/start-stop-daemon -X -x /usr/bin/wvdial \ -+ -p /var/run/wvdial.%iface% 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/head-tail.patch b/packages/ifupdown/ifupdown-0.6.4/head-tail.patch deleted file mode 100644 index a86a25d2fb..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ifupdown-0.6.4/Makefile~ 2000-11-18 07:12:01.000000000 +0000 -+++ ifupdown-0.6.4/Makefile 2004-04-24 11:06:58.000000000 +0100 -@@ -46,9 +46,9 @@ - LINE=$$(grep -n '^##ADDRESSFAM##$$' $< | sed 's/:.*//g'); \ - WC=`wc -l < $<`; \ - ( \ -- head -$$(($$LINE - 1)) $<; \ -+ head -n $$(($$LINE - 1)) $<; \ - cat $(MAN); \ -- tail -$$(($$WC - $$LINE)) $<; \ -+ tail -n $$(($$WC - $$LINE)) $<; \ - ) > $@ - - ifdown.8: ifup.8 diff --git a/packages/ifupdown/ifupdown-0.6.4/init b/packages/ifupdown/ifupdown-0.6.4/init deleted file mode 100644 index d258d51ff4..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/init +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -case "$1" in - start|restart) - if [ -e /etc/network/ifstate ]; then - echo -n "Cleaning: /etc/network/ifstate" - echo -n >/etc/network/ifstate - echo "." - fi - ;; - stop|reload|force-reload) - ;; -esac diff --git a/packages/ifupdown/ifupdown-0.6.4/interfaces b/packages/ifupdown/ifupdown-0.6.4/interfaces deleted file mode 100644 index f1bd92ed2b..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/interfaces +++ /dev/null @@ -1,2 +0,0 @@ -auto lo -iface lo inet loopback diff --git a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch deleted file mode 100644 index 39a6b3349d..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ifupdown/inet.defn.orig 2004-04-29 20:16:07.000000000 +0200 -+++ ifupdown/inet.defn 2004-04-29 20:16:13.000000000 +0200 -@@ -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%]] \ -+ 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%]] \ - [[-l %leasetime%]] %iface% \ -@@ -91,11 +90,11 @@ - down - dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/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` \ - elsif (execable("/sbin/dhclient")) - pump -i %iface% -r \ - elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) -- cat /var/run/udhcpc.%iface%.pid | xargs -i kill -TERM {} \ -+ 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 diff --git a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch deleted file mode 100644 index 33745db6ff..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ifupdown-0.6.4/inet.defn~zeroconf -+++ ifupdown-0.6.4/inet.defn -@@ -120,3 +120,13 @@ - down - /sbin/start-stop-daemon -X -x /usr/bin/wvdial \ - -p /var/run/wvdial.%iface% -+ -+method zeroconf -+ description -+ This method uses zeroconf to configure an interface. See the man page -+ for zcip for details. -+ up -+ /sbin/start-stop-daemon -S -x /usr/sbin/zcip -p /var/run/zcip.%iface% \ -+ -- -s -i %iface% -+ down -+ /sbin/start-stop-daemon -X -x /usr/sbin/zcip -p /var/run/zcip.%iface% diff --git a/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ifupdown/ifupdown-0.6.8/busybox.patch b/packages/ifupdown/ifupdown-0.6.8/busybox.patch new file mode 100644 index 0000000000..5619ab7c0a --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/busybox.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ifupdown-0.6.4/inet.defn~busybox ++++ ifupdown-0.6.4/inet.defn +@@ -116,8 +116,8 @@ + options + provider name -- Use /name/ as the provider (from /etc/ppp/peers). + up +- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \ +- -p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]] ++ /sbin/start-stop-daemon -S -x /usr/bin/wvdial \ ++ -p /var/run/wvdial.%iface% -- [[ %provider% ]] + down +- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \ +- -p /var/run/wvdial.%iface% -s 2 ++ /sbin/start-stop-daemon -X -x /usr/bin/wvdial \ ++ -p /var/run/wvdial.%iface% diff --git a/packages/ifupdown/ifupdown-0.6.8/head-tail.patch b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch new file mode 100644 index 0000000000..a86a25d2fb --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch @@ -0,0 +1,14 @@ +--- ifupdown-0.6.4/Makefile~ 2000-11-18 07:12:01.000000000 +0000 ++++ ifupdown-0.6.4/Makefile 2004-04-24 11:06:58.000000000 +0100 +@@ -46,9 +46,9 @@ + LINE=$$(grep -n '^##ADDRESSFAM##$$' $< | sed 's/:.*//g'); \ + WC=`wc -l < $<`; \ + ( \ +- head -$$(($$LINE - 1)) $<; \ ++ head -n $$(($$LINE - 1)) $<; \ + cat $(MAN); \ +- tail -$$(($$WC - $$LINE)) $<; \ ++ tail -n $$(($$WC - $$LINE)) $<; \ + ) > $@ + + ifdown.8: ifup.8 diff --git a/packages/ifupdown/ifupdown-0.6.8/init b/packages/ifupdown/ifupdown-0.6.8/init new file mode 100644 index 0000000000..d258d51ff4 --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/init @@ -0,0 +1,13 @@ +#!/bin/sh -e + +case "$1" in + start|restart) + if [ -e /etc/network/ifstate ]; then + echo -n "Cleaning: /etc/network/ifstate" + echo -n >/etc/network/ifstate + echo "." + fi + ;; + stop|reload|force-reload) + ;; +esac diff --git a/packages/ifupdown/ifupdown-0.6.8/interfaces b/packages/ifupdown/ifupdown-0.6.8/interfaces new file mode 100644 index 0000000000..f1bd92ed2b --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/interfaces @@ -0,0 +1,2 @@ +auto lo +iface lo inet loopback diff --git a/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch new file mode 100644 index 0000000000..5b662e7988 --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch @@ -0,0 +1,28 @@ +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 %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 %client%]] \ + [[-l %leasetime%]] %iface% \ +@@ -91,11 +90,11 @@ + down + 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` \ + elsif (execable("/sbin/dhclient")) + pump -i %iface% -r \ + elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) +- cat /var/run/udhcpc.%iface%.pid | xargs -i kill -TERM {} \ ++ kill -TERM `cat /var/run/udhcpc.%iface%.pid` \ + elsif (execable("/sbin/udhcpc")) + dhcpcd -k %iface% \ + elsif (execable("/sbin/dhcpcd")) diff --git a/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch new file mode 100644 index 0000000000..33745db6ff --- /dev/null +++ b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ifupdown-0.6.4/inet.defn~zeroconf ++++ ifupdown-0.6.4/inet.defn +@@ -120,3 +120,13 @@ + down + /sbin/start-stop-daemon -X -x /usr/bin/wvdial \ + -p /var/run/wvdial.%iface% ++ ++method zeroconf ++ description ++ This method uses zeroconf to configure an interface. See the man page ++ for zcip for details. ++ up ++ /sbin/start-stop-daemon -S -x /usr/sbin/zcip -p /var/run/zcip.%iface% \ ++ -- -s -i %iface% ++ down ++ /sbin/start-stop-daemon -X -x /usr/sbin/zcip -p /var/run/zcip.%iface% diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb deleted file mode 100644 index bf0c82634f..0000000000 --- a/packages/ifupdown/ifupdown_0.6.4.bb +++ /dev/null @@ -1,36 +0,0 @@ -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 \ -the file /etc/network/interfaces." -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 \ - 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" - -EXTRA_OEMAKE = "" - -do_compile () { - chmod a+rx *.pl *.sh - oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'" -} - -do_install () { - install -d ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/network \ - ${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 -} diff --git a/packages/ifupdown/ifupdown_0.6.8.bb b/packages/ifupdown/ifupdown_0.6.8.bb new file mode 100644 index 0000000000..53ccb5fe6c --- /dev/null +++ b/packages/ifupdown/ifupdown_0.6.8.bb @@ -0,0 +1,36 @@ +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 \ +the file /etc/network/interfaces." +LICENSE = "GPL" + +SECTION = "base" + +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://init \ + file://interfaces" + +EXTRA_OEMAKE = "" + +do_compile () { + chmod a+rx *.pl *.sh + oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'" +} + +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 +} -- cgit v1.2.3