From afa6164e7c8d7f5840f22b7ccd6a63357b6f4a336ddb432e09a85dbebb8a46c1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Sep 2014 06:28:50 +0000 Subject: [PATCH 1/5] ipset-6.22 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=38 --- ipset-6.21.1.tar.bz2 | 3 --- ipset-6.22.tar.bz2 | 3 +++ ipset.changes | 10 ++++++++++ ipset.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 ipset-6.21.1.tar.bz2 create mode 100644 ipset-6.22.tar.bz2 diff --git a/ipset-6.21.1.tar.bz2 b/ipset-6.21.1.tar.bz2 deleted file mode 100644 index d34b95b..0000000 --- a/ipset-6.21.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 -size 510013 diff --git a/ipset-6.22.tar.bz2 b/ipset-6.22.tar.bz2 new file mode 100644 index 0000000..deea4cd --- /dev/null +++ b/ipset-6.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c042850b863b87afce57935fdcef85f96af92027068ce4f8c5f593ed5910caa +size 515491 diff --git a/ipset.changes b/ipset.changes index deb30fd..7f0f1e0 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 16 06:27:32 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 6.22 +* includes the new set type hash:mac +* The new skbinfo extension makes possible to store fw mark, tc + class and/or hardware queue parameters together with the set + elements and then attach them to the matchig packets by the SET + target. + ------------------------------------------------------------------- Wed Mar 5 08:47:39 UTC 2014 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 05193a5..2aeda60 100644 --- a/ipset.spec +++ b/ipset.spec @@ -18,7 +18,7 @@ Name: ipset %define lname libipset3 -Version: 6.21.1 +Version: 6.22 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 From af60be980b6e65d55fb6fd707474cf3b6e6e82329cab34c021c8b64db9345abd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 21 Sep 2014 09:16:39 +0000 Subject: [PATCH 2/5] - Add sovers.diff to counter missing symbol errors OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=39 --- ipset.changes | 1 + ipset.spec | 9 +++------ sovers.diff | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 sovers.diff diff --git a/ipset.changes b/ipset.changes index 7f0f1e0..0b80ea7 100644 --- a/ipset.changes +++ b/ipset.changes @@ -7,6 +7,7 @@ Tue Sep 16 06:27:32 UTC 2014 - jengelh@inai.de class and/or hardware queue parameters together with the set elements and then attach them to the matchig packets by the SET target. +- Add sovers.diff to counter missing symbol errors ------------------------------------------------------------------- Wed Mar 5 08:47:39 UTC 2014 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 2aeda60..20df292 100644 --- a/ipset.spec +++ b/ipset.spec @@ -30,6 +30,7 @@ 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 @@ -102,15 +103,11 @@ addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. %prep -%if 0%{?__xz:1} %setup -q -%else -tar --use=xz -xf "%{S:0}"; -%setup -DTq -%endif -autoreconf -fi +%patch -P 1 -p1 %build +autoreconf -fi %if 0%{?with_kmp} for flavor in %flavors_to_build; do cp -a . "../%name-$flavor-%version"; diff --git a/sovers.diff b/sovers.diff new file mode 100644 index 0000000..2124962 --- /dev/null +++ b/sovers.diff @@ -0,0 +1,45 @@ +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 + +Immediate patch for openSUSE. + -Jan Engelhardt + +--- + 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; From e35067375803f0313186f2ae65016b2859d1d70d9516364e6fc00ff0cc56005f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 09:57:30 +0000 Subject: [PATCH 3/5] Freecode is gone OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=40 --- ipset.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ipset.spec b/ipset.spec index 20df292..5d023ed 100644 --- a/ipset.spec +++ b/ipset.spec @@ -25,7 +25,6 @@ License: GPL-2.0 Group: Productivity/Networking/Security Url: http://ipset.netfilter.org/ -#Freecode-URL: http://freecode.com/projects/ipset/ #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2 From 0880198cc27f4bd2346036127d4889f9dbdc6a54394edf66e4980e05f0fdeaf9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 18:34:10 +0000 Subject: [PATCH 4/5] ipset-6.23 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=41 --- ipset-6.22.tar.bz2 | 3 --- ipset-6.23.tar.bz2 | 3 +++ ipset.changes | 13 +++++++++++++ ipset.spec | 13 +++++-------- sovers.diff | 45 --------------------------------------------- 5 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 ipset-6.22.tar.bz2 create mode 100644 ipset-6.23.tar.bz2 delete mode 100644 sovers.diff diff --git a/ipset-6.22.tar.bz2 b/ipset-6.22.tar.bz2 deleted file mode 100644 index deea4cd..0000000 --- a/ipset-6.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c042850b863b87afce57935fdcef85f96af92027068ce4f8c5f593ed5910caa -size 515491 diff --git a/ipset-6.23.tar.bz2 b/ipset-6.23.tar.bz2 new file mode 100644 index 0000000..d313656 --- /dev/null +++ b/ipset-6.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffb8245320fc13f22233fcaf8b92a5f51298224fecc183e20785f94975310523 +size 516754 diff --git a/ipset.changes b/ipset.changes index 0b80ea7..95bf038 100644 --- a/ipset.changes +++ b/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 diff --git a/ipset.spec b/ipset.spec index 5d023ed..b0fff51 100644 --- a/ipset.spec +++ b/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 @@ -138,8 +136,7 @@ make %{?_smp_mflags} install DESTDIR="$b"; %endif find "$b/%_libdir" -type f -name "*.la" -delete; -%post -n %lname -p /sbin/ldconfig - +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files diff --git a/sovers.diff b/sovers.diff deleted file mode 100644 index 2124962..0000000 --- a/sovers.diff +++ /dev/null @@ -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 - -Immediate patch for openSUSE. - -Jan Engelhardt - ---- - 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; From 8308a9030bb04457953e311f4c0f47100f2a3afd0bd8ae1b9ac61ba2f6f7084e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 23:39:25 +0000 Subject: [PATCH 5/5] Avoid version in /usr/include/pkg OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=42 --- ipset.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipset.spec b/ipset.spec index b0fff51..e72f70e 100644 --- a/ipset.spec +++ b/ipset.spec @@ -112,13 +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/%name-%version" + --includedir="%_includedir/pkg/%name" make %{?_smp_mflags} all modules; popd; done; %else %configure --disable-static --with-kmod=no \ - --includedir="%_includedir/pkg/%name-%version" + --includedir="%_includedir/pkg/%name" make %{?_smp_mflags}; %endif