diff --git a/ipset-6.30.tar.bz2 b/ipset-6.30.tar.bz2 deleted file mode 100644 index 0629a64..0000000 --- a/ipset-6.30.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 -size 544054 diff --git a/ipset-6.33-export-func.diff b/ipset-6.33-export-func.diff new file mode 100644 index 0000000..e75af16 --- /dev/null +++ b/ipset-6.33-export-func.diff @@ -0,0 +1,28 @@ +From 4fc1ac6a4016c1e09cc393dfedb7eb4e9678efd3 Mon Sep 17 00:00:00 2001 +From: Jozsef Kadlecsik +Date: Thu, 14 Sep 2017 19:29:55 +0200 +Subject: [PATCH] New function added in commit 54802b2c is missing from + libipset.map The patch title was "Report if the option is supported by a + newer kernel release" + +Fixes bugzilla id #1182, reported by irherder@gmail.com. +--- + lib/libipset.map | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/libipset.map b/lib/libipset.map +index d35e299..df632f2 100644 +--- a/lib/libipset.map ++++ b/lib/libipset.map +@@ -158,3 +158,8 @@ global: + ipset_parse_tcp_udp_port; + ipset_parse_uint16; + } LIBIPSET_4.3; ++ ++LIBIPSET_4.5 { ++global: ++ ipset_type_higher_rev; ++} LIBIPSET_4.4; +-- +2.14.1 + diff --git a/ipset-6.33.tar.bz2 b/ipset-6.33.tar.bz2 new file mode 100644 index 0000000..67d7bd2 --- /dev/null +++ b/ipset-6.33.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7b1d886eff32acc97f948871f966f7a53b72440057d4c013c22377b57ea3602 +size 546786 diff --git a/ipset.changes b/ipset.changes index 7d6939f..a6e4684 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Sep 17 21:19:30 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 6.33 + * Report if the option is supported by a newer kernel release +- Add ipset-6.33-export-func.diff + +------------------------------------------------------------------- +Fri Sep 15 16:44:31 UTC 2017 - kstreitova@suse.com + +- fix build for Factory + +------------------------------------------------------------------- +Fri Mar 17 11:45:35 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 6.31 + * ipset: avoid kernel null pointer exception in ipset list:set + * fix bug: sometimes valid entries in hash:* types of sets were + evicted +- Update to new upstream release 6.32 + * fix possible truncated output in ipset output buffer handling + ------------------------------------------------------------------- Thu Oct 20 18:25:24 UTC 2016 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 7dc4532..7da48a0 100644 --- a/ipset.spec +++ b/ipset.spec @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,16 @@ # -Name: ipset %define lname libipset3 -Version: 6.30 +%if 0%{?suse_version} && 0%{?suse_version} < 1330 +# Factory gets new kernels, old releases don't. +# Always build KMPs for all versions older than Factory. +%define ipset_build_kmp 1 +%else +%define ipset_build_kmp 0 +%endif +Name: ipset +Version: 6.33 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 @@ -26,28 +33,23 @@ Group: Productivity/Networking/Security Url: http://ipset.netfilter.org/ #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ -Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2 +Source: http://ipset.netfilter.org/%name-%version.tar.bz2 Source3: %name-preamble Patch1: ipset-destdir.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: ipset-6.33-export-func.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: linux-glibc-devel >= 2.6.24 -BuildRequires: pkg-config >= 0.21 +BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 -%if 0%{?suse_version} && 0%{?suse_version} < 1330 -# Factory gets new kernels, old releases don't. -# Always build KMPs for all versions older than Factory. -%define ipset_build_kmp 1 -%endif %if 0%{?ipset_build_kmp} BuildRequires: %kernel_module_package_buildreqs +BuildRequires: kernel-syms >= 2.6.39 +%kernel_module_package -p %name-preamble %if 0%{?suse_version} >= 1320 BuildRequires: kmod-compat %endif -BuildRequires: kernel-syms >= 2.6.39 -%kernel_module_package -p %name-preamble %endif %description @@ -103,11 +105,11 @@ when matching an entry against a set. %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build # build wants to call modinfo at some point -export PATH="$PATH:/usr/sbin" +export PATH="$PATH:%_sbindir" autoreconf -fi %if 0%{?ipset_build_kmp} for flavor in %flavors_to_build; do @@ -115,8 +117,8 @@ for flavor in %flavors_to_build; do pushd "../%name-$flavor-%version/" # ksource: it just checks for a header %configure --disable-static \ - --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \ - --with-ksource="/usr/src/linux" \ + --with-kbuild="%_prefix/src/linux-obj/%_target_cpu/$flavor" \ + --with-ksource="%_prefix/src/linux" \ --includedir="%_includedir/%name" make %{?_smp_mflags} all modules popd @@ -127,8 +129,8 @@ done make %{?_smp_mflags} %install -export PATH="$PATH:/usr/sbin" -b="%buildroot" +export PATH="$PATH:%_sbindir" +b=%buildroot %if 0%{?ipset_build_kmp} for flavor in %flavors_to_build; do pushd "../%name-$flavor-%version/" @@ -138,22 +140,19 @@ for flavor in %flavors_to_build; do done; %endif make %{?_smp_mflags} install DESTDIR="$b" -find "$b/%_libdir" -type f -name "*.la" -delete +find "$b/%_libdir/" -type f -name "*.la" -delete -print %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -%defattr(-,root,root) %_sbindir/ipset %_mandir/man*/* %files -n %lname -%defattr(-,root,root) %_libdir/libipset.so.3* %files devel -%defattr(-,root,root) %_libdir/libipset.so %_libdir/pkgconfig/libipset.pc %_includedir/%name/