rpms/iptables/devel iptables-1.4.0-in6_u.patch, NONE, 1.1 iptables.spec, 1.65, 1.66

Thomas Woerner (twoerner) fedora-extras-commits at redhat.com
Mon Mar 3 13:47:58 UTC 2008


Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29937

Modified Files:
	iptables.spec 
Added Files:
	iptables-1.4.0-in6_u.patch 
Log Message:
- use s6_addr32 instead of in6_u.u6_addr32


iptables-1.4.0-in6_u.patch:

--- NEW FILE iptables-1.4.0-in6_u.patch ---
diff -up iptables-1.4.0/ip6tables.c.in6_u iptables-1.4.0/ip6tables.c
--- iptables-1.4.0/ip6tables.c.in6_u	2008-03-03 14:33:30.000000000 +0100
+++ iptables-1.4.0/ip6tables.c	2008-03-03 14:38:54.000000000 +0100
@@ -678,7 +678,7 @@ parse_hostnetworkmask(const char *name, 
 	for (i = 0, j = 0; i < n; i++) {
 		int k;
 		for (k = 0; k < 4; k++)
-			addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k];
+			addrp[j].s6_addr32[k] &= maskp->s6_addr32[k];
 		j++;
 		for (k = 0; k < j - 1; k++) {
 			if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) {
diff -up iptables-1.4.0/libiptc/libip6tc.c.in6_u iptables-1.4.0/libiptc/libip6tc.c
--- iptables-1.4.0/libiptc/libip6tc.c.in6_u	2008-03-03 14:33:31.000000000 +0100
+++ iptables-1.4.0/libiptc/libip6tc.c	2008-03-03 14:33:31.000000000 +0100
@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
 #include "libiptc.c"
 
 #define BIT6(a, l) \
- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
+ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
 
 int
 ipv6_prefix_length(const struct in6_addr *a)


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- iptables.spec	3 Mar 2008 11:07:40 -0000	1.65
+++ iptables.spec	3 Mar 2008 13:47:25 -0000	1.66
@@ -11,6 +11,7 @@
 Patch0: iptables-1.3.8-iptc.patch
 Patch4: iptables-1.3.8-typo_latter.patch
 Patch5: iptables-1.4.0-cloexec.patch
+Patch6: iptables-1.4.0-in6_u.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -60,6 +61,7 @@
 %patch0 -p1 -b .iptc
 %patch4 -p1 -b .typo_latter
 %patch5 -p1 -b .cloexec
+%patch6 -p1 -b .in6_u
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{_prefix},g" {} \;
@@ -164,6 +166,7 @@
 * Mon Mar  3 2008 Thomas Woerner <twoerner at redhat.com> 1.4.0-3
 - use the kernel headers from the build tree for iptables for now to be able to 
   compile this package, but this makes the package more kernel dependant
+- use s6_addr32 instead of in6_u.u6_addr32
 
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.0-2
 - Autorebuild for GCC 4.3




More information about the fedora-extras-commits mailing list