ipset-6.23

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=41

ipset-6.22.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c042850b863b87afce57935fdcef85f96af92027068ce4f8c5f593ed5910caa
-size 515491

ipset-6.23.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffb8245320fc13f22233fcaf8b92a5f51298224fecc183e20785f94975310523
+size 516754

ipset.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep 23 18:04:06 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 6.23
+* Order create and add options in manpage so that generic ones
+  come first
+* Centralise generic create options (family, hashsize, maxelem)
+  on top of man page in the generic options section.
+* Add description of hash:mac set type to man page.
+* Add missing space for skbinfo option synopsis.
+* Support updating extensions when the set is full
+- Drop sovers.diff (no longer needed)
+
 -------------------------------------------------------------------
 Tue Sep 16 06:27:32 UTC 2014 - jengelh@inai.de
 

ipset.spec

@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.22
+Version:        6.23
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -29,7 +29,6 @@ Url:            http://ipset.netfilter.org/
 #Git-Web:	http://git.netfilter.org/
 Source:         ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
 Source3:        %name-preamble
-Patch1:         sovers.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -103,10 +102,8 @@ when matching an entry against a set.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
-autoreconf -fi
 %if 0%{?with_kmp}
 for flavor in %flavors_to_build; do
 	cp -a . "../%name-$flavor-%version";
@@ -115,12 +112,13 @@ for flavor in %flavors_to_build; do
 	%configure --disable-static \
 		--with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \
 		--with-ksource="/usr/src/linux" \
-		--includedir="%_includedir/pkg"
+		--includedir="%_includedir/pkg/%name-%version"
 	make %{?_smp_mflags} all modules;
 	popd;
 done;
 %else
-%configure --disable-static --with-kmod=no --includedir="%_includedir/pkg"
+%configure --disable-static --with-kmod=no \
+	--includedir="%_includedir/pkg/%name-%version"
 make %{?_smp_mflags};
 %endif
 
@@ -139,7 +137,6 @@ make %{?_smp_mflags} install DESTDIR="$b";
 find "$b/%_libdir" -type f -name "*.la" -delete;
 
 %post   -n %lname -p /sbin/ldconfig
-
 %postun -n %lname -p /sbin/ldconfig
 
 %files

sovers.diff

@@ -1,45 +0,0 @@
-Date: 2014-09-21 10:41:20.781875821 +0200
-References: http://marc.info/?l=netfilter-devel&m=141123569528296&w=2
-
-Yes, that's right - I have forgotten to update the library map file
-and bump the library number. I'm going to fix it at the weekend.
-	-Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-
-Immediate patch for openSUSE.
-	-Jan Engelhardt <jengelh@inai.de>
-
----
- Make_global.am   |    2 +-
- lib/libipset.map |    9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-Index: ipset/Make_global.am
-===================================================================
---- ipset.orig/Make_global.am
-+++ ipset/Make_global.am
-@@ -69,7 +69,7 @@
- # interface. 
- 
- #            curr:rev:age
--LIBVERSION = 7:0:4
-+LIBVERSION = 8:0:5
- 
- AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \
- 	-I/usr/local/include
-Index: ipset/lib/libipset.map
-===================================================================
---- ipset.orig/lib/libipset.map
-+++ ipset/lib/libipset.map
-@@ -144,3 +144,12 @@ global:
-   ipset_parse_mark;
-   ipset_print_mark;
- } LIBIPSET_4.1;
-+
-+LIBIPSET_4.2PLUS {
-+global:
-+	ipset_parse_uint16;
-+	ipset_parse_skbmark;
-+	ipset_parse_skbprio;
-+	ipset_print_skbmark;
-+	ipset_print_skbprio;
-+} LIBIPSET_4.2;