From 07492b853d06a72806d0b05a126c1b9a5b703fe00e226060e9c58506ae4f467a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 20 Oct 2013 13:17:58 +0000 Subject: [PATCH 1/2] ipset-6.20 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=31 --- ...ild-fix-incorrect-library-versioning.patch | 41 +++++++++++++++++++ ipset-6.19.tar.xz | 3 -- ipset-6.20.tar.xz | 3 ++ ipset.changes | 14 +++++++ ipset.spec | 16 +++++--- sles11.diff | 21 ---------- 6 files changed, 69 insertions(+), 29 deletions(-) create mode 100644 0001-build-fix-incorrect-library-versioning.patch delete mode 100644 ipset-6.19.tar.xz create mode 100644 ipset-6.20.tar.xz delete mode 100644 sles11.diff diff --git a/0001-build-fix-incorrect-library-versioning.patch b/0001-build-fix-incorrect-library-versioning.patch new file mode 100644 index 0000000..3c4bc99 --- /dev/null +++ b/0001-build-fix-incorrect-library-versioning.patch @@ -0,0 +1,41 @@ +From 99af47d7af976222360e729c0d0e0ff13c03c48b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 20 Oct 2013 14:59:09 +0200 +Subject: [PATCH] build: fix incorrect library versioning + +Commit v6.20~12 caused libipset to shift from libipset.so.3 to +.so.2. That is the wrong thing to do. Set it back to 3+2, as +intended. +--- + Make_global.am | 2 +- + lib/libipset.map | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Make_global.am b/Make_global.am +index 9c228cc..33645da 100644 +--- a/Make_global.am ++++ b/Make_global.am +@@ -69,7 +69,7 @@ + # interface. + + # curr:rev:age +-LIBVERSION = 4:1:2 ++LIBVERSION = 5:0:2 + + AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \ + -I/usr/local/include +diff --git a/lib/libipset.map b/lib/libipset.map +index ab0b96f..1080f0d 100644 +--- a/lib/libipset.map ++++ b/lib/libipset.map +@@ -1,3 +1,7 @@ ++/* ++ * These are library version numbers in here - not to be confused ++ * with the API numbers used with libtool's -version-info string. ++ */ + LIBIPSET_1.0 { + global: + ipset_strlcpy; +-- +1.8.2 + diff --git a/ipset-6.19.tar.xz b/ipset-6.19.tar.xz deleted file mode 100644 index 978a43f..0000000 --- a/ipset-6.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e91ea693d76118790a33514df41148f059d8c7d1378997c61a0a416160eae485 -size 387924 diff --git a/ipset-6.20.tar.xz b/ipset-6.20.tar.xz new file mode 100644 index 0000000..149e600 --- /dev/null +++ b/ipset-6.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7896400cb0876ed21d1fd2675ed1129f77578c4ae2683c4f11412e4949132bf5 +size 423372 diff --git a/ipset.changes b/ipset.changes index df6bad8..3406baf 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Oct 20 13:03:53 UTC 2013 - jengelh@inai.de + +- Add 0001-build-fix-incorrect-library-versioning.patch + +------------------------------------------------------------------- +Sun Oct 20 12:43:51 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 6.20 +* netns support +* new set types: hash:net,net and hash:net,port,net +* new extension: "comment", for annotation of set elements +- Drop sles11.diff (no longer needed, upstream has better fix) + ------------------------------------------------------------------- Fri May 10 20:11:15 UTC 2013 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index fdcce5b..ba17c9a 100644 --- a/ipset.spec +++ b/ipset.spec @@ -18,7 +18,7 @@ Name: ipset %define lname libipset3 -Version: 6.19 +Version: 6.20 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 @@ -31,9 +31,12 @@ Url: http://ipset.netfilter.org/ #Git-Web: http://git.netfilter.org/ Source: %name-%version.tar.xz Source3: %name-preamble -Patch1: sles11.diff +Patch1: 0001-build-fix-incorrect-library-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} @@ -123,6 +126,7 @@ tar --use=xz -xf "%{S:0}"; %setup -DTq %endif %patch -P 1 -p1 +autoreconf -fi %build %if 0%{?with_kmp} @@ -132,12 +136,13 @@ for flavor in %flavors_to_build; do # 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-ksource="/usr/src/linux" \ + --includedir="%_includedir/pkg" make %{?_smp_mflags} all modules; popd; done; %else -%configure --disable-static --with-kmod=no +%configure --disable-static --with-kmod=no --includedir="%_includedir/pkg" make %{?_smp_mflags}; %endif @@ -171,6 +176,7 @@ find "$b/%_libdir" -type f -name "*.la" -delete; %files devel %defattr(-,root,root) %_libdir/libipset.so -%_includedir/libipset +%_libdir/pkgconfig/libipset.pc +%_includedir/pkg/ %changelog diff --git a/sles11.diff b/sles11.diff deleted file mode 100644 index 16adfe3..0000000 --- a/sles11.diff +++ /dev/null @@ -1,21 +0,0 @@ - -The evil overlords backported the 5-argument form, -causing the version check to be meaningless. - ---- - kernel/net/netfilter/ipset/ip_set_core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ipset-6.13/kernel/net/netfilter/ipset/ip_set_core.c -=================================================================== ---- ipset-6.13.orig/kernel/net/netfilter/ipset/ip_set_core.c -+++ ipset-6.13/kernel/net/netfilter/ipset/ip_set_core.c -@@ -1180,7 +1180,7 @@ ip_set_dump(struct sock *ctnl, struct sk - if (unlikely(protocol_failed(attr))) - return -IPSET_ERR_PROTOCOL; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) -+#if 0 - return netlink_dump_start(ctnl, skb, nlh, - ip_set_dump_start, - ip_set_dump_done); From 8a8daca304450ce40ae1f27f79c022fee5233d9a34309b9f0b812231669c7104 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 28 Oct 2013 12:39:08 +0000 Subject: [PATCH 2/2] ipset-6.20.1 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=32 --- ...ild-fix-incorrect-library-versioning.patch | 41 ------------------- ipset-6.20.1.tar.xz | 3 ++ ipset-6.20.tar.xz | 3 -- ipset.changes | 7 ++++ ipset.spec | 4 +- 5 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 0001-build-fix-incorrect-library-versioning.patch create mode 100644 ipset-6.20.1.tar.xz delete mode 100644 ipset-6.20.tar.xz diff --git a/0001-build-fix-incorrect-library-versioning.patch b/0001-build-fix-incorrect-library-versioning.patch deleted file mode 100644 index 3c4bc99..0000000 --- a/0001-build-fix-incorrect-library-versioning.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 99af47d7af976222360e729c0d0e0ff13c03c48b Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sun, 20 Oct 2013 14:59:09 +0200 -Subject: [PATCH] build: fix incorrect library versioning - -Commit v6.20~12 caused libipset to shift from libipset.so.3 to -.so.2. That is the wrong thing to do. Set it back to 3+2, as -intended. ---- - Make_global.am | 2 +- - lib/libipset.map | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Make_global.am b/Make_global.am -index 9c228cc..33645da 100644 ---- a/Make_global.am -+++ b/Make_global.am -@@ -69,7 +69,7 @@ - # interface. - - # curr:rev:age --LIBVERSION = 4:1:2 -+LIBVERSION = 5:0:2 - - AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \ - -I/usr/local/include -diff --git a/lib/libipset.map b/lib/libipset.map -index ab0b96f..1080f0d 100644 ---- a/lib/libipset.map -+++ b/lib/libipset.map -@@ -1,3 +1,7 @@ -+/* -+ * These are library version numbers in here - not to be confused -+ * with the API numbers used with libtool's -version-info string. -+ */ - LIBIPSET_1.0 { - global: - ipset_strlcpy; --- -1.8.2 - diff --git a/ipset-6.20.1.tar.xz b/ipset-6.20.1.tar.xz new file mode 100644 index 0000000..97c99e9 --- /dev/null +++ b/ipset-6.20.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08456439ead82686f5884c90791240009f828be349c9564e5deef70734e53dcd +size 423584 diff --git a/ipset-6.20.tar.xz b/ipset-6.20.tar.xz deleted file mode 100644 index 149e600..0000000 --- a/ipset-6.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7896400cb0876ed21d1fd2675ed1129f77578c4ae2683c4f11412e4949132bf5 -size 423372 diff --git a/ipset.changes b/ipset.changes index 3406baf..9391623 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 28 12:34:04 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 6.20.1 +* build fixes for kernel 3.8 and the userspace library +- Remove 0001-build-fix-incorrect-library-versioning.patch (merged) + ------------------------------------------------------------------- Sun Oct 20 13:03:53 UTC 2013 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index ba17c9a..8f25c29 100644 --- a/ipset.spec +++ b/ipset.spec @@ -18,7 +18,7 @@ Name: ipset %define lname libipset3 -Version: 6.20 +Version: 6.20.1 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 @@ -31,7 +31,6 @@ Url: http://ipset.netfilter.org/ #Git-Web: http://git.netfilter.org/ Source: %name-%version.tar.xz Source3: %name-preamble -Patch1: 0001-build-fix-incorrect-library-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -125,7 +124,6 @@ when matching an entry against a set. tar --use=xz -xf "%{S:0}"; %setup -DTq %endif -%patch -P 1 -p1 autoreconf -fi %build