Package: ifupdown
Version: 0.6.7-0.3
Tags: patch
Here is the patch for the 0.6.7-0.4 NMU.
diff -ur ifupdown-0.6.7-0.3/debian/changelog ifupdown-0.6.7/debian/changelog
--- ifupdown-0.6.7-0.3/debian/changelog 2006-09-14 15:02:39.000000000 +0200
+++ ifupdown-0.6.7/debian/changelog 2006-09-15 23:26:20.000000000 +0200
@@ -1,3 +1,12 @@
+ifupdown (0.6.7-0.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix the 'client' dhcp option to work as documented. Patch from
+ Roderick Schertler. (Closes: #311011)
+ * Change section from base to admin to match the override file.
+
+ -- Petter Reinholdtsen <[EMAIL PROTECTED]> Fri, 15 Sep 2006 23:26:04 +0200
+
ifupdown (0.6.7-0.3) unstable; urgency=low
* Non-maintainer upload.
diff -ur ifupdown-0.6.7-0.3/debian/control ifupdown-0.6.7/debian/control
--- ifupdown-0.6.7-0.3/debian/control 2006-09-14 14:45:44.000000000 +0200
+++ ifupdown-0.6.7/debian/control 2006-09-15 23:25:00.000000000 +0200
@@ -1,5 +1,5 @@
Source: ifupdown
-Section: base
+Section: admin
Priority: important
Maintainer: Anthony Towns <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
diff -ur ifupdown-0.6.7-0.3/ifupdown.nw ifupdown-0.6.7/ifupdown.nw
--- ifupdown-0.6.7-0.3/ifupdown.nw 2006-09-14 14:46:49.000000000 +0200
+++ ifupdown-0.6.7/ifupdown.nw 2006-09-15 21:57:46.000000000 +0200
@@ -3917,7 +3917,7 @@
leasehours leasetime -- Preferred lease time in hours (pump)
leasetime leasetime -- Preferred lease time in seconds (dhcpcd)
vendor vendor -- Vendor class identifier (dhcpcd)
- client client_id -- Client identifier (dhcpcd, udhcpc)
+ client client -- Client identifier (dhcpcd, udhcpc)
hwaddress class address -- Hardware Address. /class/ is one of \
*ether*, *ax25*, *ARCnet* or *netrom*. \
/address/ is dependent on this choice.
@@ -3931,9 +3931,9 @@
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%]] \
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% \
elsif (execable("/sbin/dhcpcd"))
diff -ur ifupdown-0.6.7-0.3/inet.defn ifupdown-0.6.7/inet.defn
--- ifupdown-0.6.7-0.3/inet.defn 2006-09-14 15:07:45.000000000 +0200
+++ ifupdown-0.6.7/inet.defn 2006-09-15 23:26:28.000000000 +0200
@@ -68,7 +68,7 @@
leasehours leasetime -- Preferred lease time in hours (pump)
leasetime leasetime -- Preferred lease time in seconds (dhcpcd)
vendor vendor -- Vendor class identifier (dhcpcd)
- client client_id -- Client identifier (dhcpcd, udhcpc)
+ client client -- Client identifier (dhcpcd, udhcpc)
hwaddress class address -- Hardware Address. /class/ is one of \
*ether*, *ax25*, *ARCnet* or *netrom*. \
/address/ is dependent on this choice.
@@ -82,9 +82,9 @@
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%]] \
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% \
elsif (execable("/sbin/dhcpcd"))
