- starting work on ipset 6.x (the one in 2.6.39 kernel, available also for

  older kernels)

Changed files:
    ipset-config_dist.patch -> 1.1
    ipset.spec -> 1.109
    shadow-args.patch -> 1.2

diff --git a/ipset-config_dist.patch b/ipset-config_dist.patch
new file mode 100644 (file)
index 0000000..6865ae4
--- /dev/null
+++ b/ipset-config_dist.patch
@@ -0,0 +1,19 @@
+--- ipset-6.3/configure.ac.orig        2011-04-10 17:25:20.000000000 +0200
++++ ipset-6.3/configure.ac     2011-04-15 12:14:24.000000000 +0200
+@@ -44,14 +44,14 @@
+       AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
+ fi
+ 
+-if test ! -e "$kbuilddir/.config"
++if test ! -e "$kbuilddir/config-dist"
+ then
+       AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
+ fi
+ 
+ AC_PROG_GREP
+ 
+-if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/.config`" = "X"
++if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/config-dist`" = "X"
+ then
+       AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured with IP6_NF_IPTABLES support (ip6tables)])
+ fi

diff --git a/ipset.spec b/ipset.spec
index 0510cc883b07557e763c40ee172040ba32ff2b83..790952481664e629552315c7d99c792be741c2b8 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -16,22 +16,25 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     23
+%define                rel     0.1
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       4.4
+Version:       6.3
 Release:       %{rel}
 License:       GPL
 Group:         Networking/Admin
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: e21e9d9dfb8a01fc0122323ff1d6cbdb
+# Source0-md5: 8830f555133695d455a7aa5d7b5019ea
 Source1:       %{pname}.init
-Patch0:                shadow-args.patch
+Patch0:                %{name}-config_dist.patch
 URL:           http://ipset.netfilter.org/
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-%{?with_userspace:BuildRequires:       linux-libc-headers >= 7:2.6.22.1-2}
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+%{?with_userspace:BuildRequires:       linux-libc-headers >= 7:2.6.34}
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.34}
 BuildRequires: rpmbuild(macros) >= 1.379
 Suggests:      kernel-net-ipset
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -104,22 +107,18 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-mv kernel/{Kbuild,Makefile}
-
-# these options can be overriden by module parameters.
-# maximum number of ipsets.
-%{__sed} -i 's:$(IP_NF_SET_MAX):256:' kernel/Makefile
-# hash size for bindings of IP sets.
-%{__sed} -i 's:$(IP_NF_SET_HASHSIZE):1024:' kernel/Makefile
-
-%if "%{cc_version}" < "3.4"
-%{__sed} -i -e 's/-Wextra//' Makefile
-%{__sed} -i -e 's/-Winit-self//' Makefile
-%{__sed} -i -e 's/-Wold-style-definition//' Makefile
-%{__sed} -i -e 's/-Wno-missing-field-initializers//' Makefile
-%endif
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --with-kbuild=%{_kernelsrcdir}
+
+%{__make}
+
 %if %{with userspace}
 %{__make} binaries \
        CC="%{__cc}" \

diff --git a/shadow-args.patch b/shadow-args.patch
deleted file mode 100644 (file)
index 2eda9c0..0000000
--- a/shadow-args.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipset-4.2/ipset.h~ 2009-11-10 22:45:12.000000000 +0200
-+++ ipset-4.2/ipset.h  2010-07-21 08:14:25.783555041 +0300
-@@ -116,7 +116,7 @@
-       u_int32_t adt_size;
- 
-       /* Function which parses command options */
--      ip_set_ip_t (*adt_parser) (int cmd, const char *optarg, void *data);
-+      ip_set_ip_t (*adt_parser) (int cmd, const char *optarg_, void *data);
- 
-       /*
-        * Printing