packages: ipset/ipset.spec, ipset/ipset-config_dist.patch (NEW), ipset/shad...

[jajcus]

Author: jajcus                       Date: Fri Apr 15 10:21:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- starting work on ipset 6.x (the one in 2.6.39 kernel, available also for
  older kernels)

---- Files affected:
packages/ipset:
   ipset.spec (1.108 -> 1.109) , ipset-config_dist.patch (NONE -> 1.1)  (NEW), shadow-args.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.108 packages/ipset/ipset.spec:1.109
--- packages/ipset/ipset.spec:1.108	Fri Apr  8 06:57:33 2011
+++ packages/ipset/ipset.spec	Fri Apr 15 12:21:12 2011
@@ -17,22 +17,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)
@@ -105,22 +108,18 @@
 %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}" \
@@ -211,6 +210,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2011/04/15 10:21:12  jajcus
+- starting work on ipset 6.x (the one in 2.6.39 kernel, available also for
+  older kernels)
+
 Revision 1.108  2011/04/08 04:57:33  arekm
 - release 23
 

================================================================
Index: packages/ipset/ipset-config_dist.patch
diff -u /dev/null packages/ipset/ipset-config_dist.patch:1.1
--- /dev/null	Fri Apr 15 12:21:17 2011
+++ packages/ipset/ipset-config_dist.patch	Fri Apr 15 12:21:12 2011
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.spec?r1=1.108&r2=1.109&f=u