rpms/dhcpv6/F-7 dhcpv6-0.10-device-names.patch, NONE, 1.1 dhcpv6.spec, 1.58, 1.59

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3927

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-device-names.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
- Fix more segfaults when dhcp6s starts with empty control files (#253968)
- Recognize 802.1Q VLAN network device names (#245115)


dhcpv6-0.10-device-names.patch:

--- NEW FILE dhcpv6-0.10-device-names.patch ---
diff -up dhcp-0.10/server6_token.l.string dhcp-0.10/server6_token.l
--- dhcp-0.10/server6_token.l.string	2007-09-10 11:43:04.000000000 -0400
+++ dhcp-0.10/server6_token.l	2007-09-10 11:43:58.000000000 -0400
@@ -79,7 +79,7 @@ addr_tail       ({hexdigit}{1,4}|({hexdi
 addr_body       ({hexdigit}{1,4}(":"|"::"))*
 ipv6addr        {addr_head}{addr_body}{addr_tail}
 string		[a-zA-Z0-9:\._-][a-zA-Z0-9:\._-]*
-ifname		[a-zA-Z]+[0-9]+
+ifname		({string})+
 
 %s S_IFACE
 %s S_DUID


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- dhcpv6.spec	10 Sep 2007 19:32:30 -0000	1.58
+++ dhcpv6.spec	10 Sep 2007 19:35:19 -0000	1.59
@@ -17,6 +17,7 @@
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-file-checks.patch
+Patch8:  %{name}-0.10-device-names.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -70,6 +71,7 @@
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .file_check
+%patch8 -p1 -b .device-names
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -164,6 +166,7 @@
 %changelog
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
 - Fix more segfaults when dhcp6s starts with empty control files (#253968)
+- Recognize 802.1Q VLAN network device names (#245115)
 
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)