- updated to 6.12.1

- removed obsolete kernel-3.3,kernel-3.0 patches

Changed files:
    ipset-kernel-3.0.patch -> 1.3
    ipset-kernel-3.3.patch -> 1.4
    ipset.spec -> 1.164

diff --git a/ipset-kernel-3.0.patch b/ipset-kernel-3.0.patch
deleted file mode 100644 (file)
index b8404a1..0000000
--- a/ipset-kernel-3.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c~    2012-04-06 22:33:28.410967308 +0200
-+++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c     2012-04-06 22:48:32.250775653 +0200
-@@ -8,7 +8,7 @@
- /* Get Layer-4 data from the packets */
- 
- #include <linux/version.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
- #include <linux/export.h>
- #endif
- #include <linux/ip.h>
---- ipset-6.11/kernel/net/netfilter/ipset/pfxlen.c~    2012-01-13 21:26:37.000000000 +0100
-+++ ipset-6.11/kernel/net/netfilter/ipset/pfxlen.c     2012-04-06 22:48:59.190670586 +0200
-@@ -1,5 +1,5 @@
- #include <linux/version.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
- #include <linux/export.h>
- #endif
- #include <linux/netfilter/ipset/pfxlen.h>

diff --git a/ipset-kernel-3.3.patch b/ipset-kernel-3.3.patch
deleted file mode 100644 (file)
index 9709f2c..0000000
--- a/ipset-kernel-3.3.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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
-@@ -7,6 +7,7 @@
- 
- /* Kernel module implementing an IP set type: the hash:ip type */
- 
-+#include <linux/version.h>
- #include <linux/jhash.h>
- #include <linux/module.h>
- #include <linux/ip.h>
-@@ -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
---- ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c.orig       2012-01-12 18:53:09.000000000 +0100
-+++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c    2012-04-06 22:42:23.225548191 +0200
-@@ -7,6 +7,7 @@
- 
- /* Kernel module implementing an IP set type: the hash:net type */
- 
-+#include <linux/version.h>
- #include <linux/jhash.h>
- #include <linux/module.h>
- #include <linux/ip.h>
-@@ -295,7 +296,11 @@
- hash_net6_data_copy(struct hash_net6_elem *dst,
-                   const struct hash_net6_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
-       dst->cidr = src->cidr;
-       dst->nomatch = src->nomatch;
- }

diff --git a/ipset.spec b/ipset.spec
index 9e2763da3403a3ddcbd1226e74f3219cd7b3b4ba..a75031d966e5a10dc59a689df61a0249fce89dc3 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -25,24 +25,22 @@
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.11
+Version:       6.12.1
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: bfcc92e30a0fcf10ae6e7c4affa03c84
+# Source0-md5: 80df500a4d93cb14e1373ae290716cda
 Source1:       %{pname}.init
 Patch0:                %{pname}-no_kernel.patch
 Patch1:                %{pname}-hash-net-if-fix.patch
-Patch2:                %{pname}-kernel-3.3.patch
-Patch3:                %{pname}-kernel-3.0.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.38.6}
 BuildRequires: libmnl-devel >= 1
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.0
 %{?with_userspace:BuildRequires:       linux-libc-headers >= 7:2.6.38.6}
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.583
@@ -137,8 +135,6 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %setup -q -n %{pname}-%{version}
 %{!?with_kernel:%patch0 -p1}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -147,6 +143,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --with-kbuild=%{_kernelsrcdir}
 
 %if %{with userspace}