[oe-commits] org.oe.dev ifupdown: updated to 0.6.8 (current Debian version)

[hrw commit]

ifupdown: updated to 0.6.8 (current Debian version)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 4330d1ea6664a907f0be13e3beb2802e88b38ade
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4330d1ea6664a907f0be13e3beb2802e88b38ade
Files:
1
packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch
packages/ifupdown/ifupdown-0.6.4
packages/ifupdown/ifupdown-0.6.8
packages/ifupdown/ifupdown_0.6.4.bb
packages/ifupdown/ifupdown_0.6.8.bb
packages/ifupdown/ifupdown-0.6.8/udhcpc.patch
Diffs:

#
# mt diff -r195a518cd7cd1344369f00d72ef14dc19d4962c9 -r4330d1ea6664a907f0be13e3beb2802e88b38ade
#
# 
# 
# delete "packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch"
# 
# rename "packages/ifupdown/ifupdown-0.6.4"
#     to "packages/ifupdown/ifupdown-0.6.8"
# 
# rename "packages/ifupdown/ifupdown_0.6.4.bb"
#     to "packages/ifupdown/ifupdown_0.6.8.bb"
# 
# patch "packages/ifupdown/ifupdown-0.6.8/udhcpc.patch"
#  from [fdaf9ab34227909d21a652d6000e9b50de764b58]
#    to [2e143fafce544537fa6d126f7942ac9b04fb374b]
# 
# patch "packages/ifupdown/ifupdown_0.6.8.bb"
#  from [b941a1e22cb76dd2071bb54ef9b9f3f3b10ead19]
#    to [2e3dad676818dce12b024a415a76f60ad3b17c07]
# 
============================================================
--- packages/ifupdown/ifupdown-0.6.8/udhcpc.patch	fdaf9ab34227909d21a652d6000e9b50de764b58
+++ packages/ifupdown/ifupdown-0.6.8/udhcpc.patch	2e143fafce544537fa6d126f7942ac9b04fb374b
@@ -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` \
============================================================
--- packages/ifupdown/ifupdown_0.6.4.bb	b941a1e22cb76dd2071bb54ef9b9f3f3b10ead19
+++ packages/ifupdown/ifupdown_0.6.8.bb	2e3dad676818dce12b024a415a76f60ad3b17c07
@@ -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 @@ SECTION = "base"
 
 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_install () {
 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
 }