Author: baggins Date: Fri Apr 6 20:37:06 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- fix build with linux 3.3
---- Files affected:
packages/ipset:
ipset.spec (1.154 -> 1.155) , ipset-kernel-3.3.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.154 packages/ipset/ipset.spec:1.155
--- packages/ipset/ipset.spec:1.154 Fri Apr 6 21:15:42 2012
+++ packages/ipset/ipset.spec Fri Apr 6 22:37:01 2012
@@ -36,6 +36,7 @@
Source1: %{pname}.init
Patch0: %{pname}-no_kernel.patch
Patch1: %{pname}-hash-net-if-fix.patch
+Patch2: %{pname}-kernel-3.3.patch
URL: http://ipset.netfilter.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -136,6 +137,7 @@
%setup -q -n %{pname}-%{version}
%{!?with_kernel:%patch0 -p1}
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -199,7 +201,7 @@
%doc ChangeLog ChangeLog.ippool README UPGRADE
%attr(755,root,root) %{_sbindir}/ipset
%attr(755,root,root) %{_libdir}/libipset.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.2
%{_mandir}/man8/ipset.8*
%files devel
@@ -232,6 +234,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.155 2012/04/06 20:37:01 baggins
+- fix build with linux 3.3
+
Revision 1.154 2012/04/06 19:15:42 baggins
- 6.11
================================================================
Index: packages/ipset/ipset-kernel-3.3.patch
diff -u /dev/null packages/ipset/ipset-kernel-3.3.patch:1.1
--- /dev/null Fri Apr 6 22:37:06 2012
+++ packages/ipset/ipset-kernel-3.3.patch Fri Apr 6 22:37:01 2012
@@ -0,0 +1,33 @@
+--- ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c~ 2012-01-13
21:26:27.000000000 +0100
++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c 2012-04-06
22:33:28.410967308 +0200
+@@ -119,9 +119,16 @@
+ {
+ int protoff;
+ u8 nexthdr;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++ __be16 frag_off;
++#endif
+
+ nexthdr = ipv6_hdr(skb)->nexthdr;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++ protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr,
&frag_off);
++#else
+ protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr);
++#endif
+ if (protoff < 0)
+ return false;
+
+--- ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c~ 2011-10-04
17:18:10.000000000 +0200
++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c 2012-04-06
22:35:56.923721440 +0200
+@@ -241,7 +241,11 @@
+ static inline void
+ hash_ip6_data_copy(struct hash_ip6_elem *dst, const struct hash_ip6_elem *src)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++ dst->ip.in6 = src->ip.in6;
++#else
+ ipv6_addr_copy(&dst->ip.in6, &src->ip.in6);
++#endif
+ }
+
+ static inline void
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/ipset/ipset.spec?r1=1.154&r2=1.155
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
