forked from pool/ipset
ipset-6.20
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=31
This commit is contained in:
Git OBS Bridge
parent
48a623fe73
commit
07492b853d
41
0001-build-fix-incorrect-library-versioning.patch
Normal file
41
0001-build-fix-incorrect-library-versioning.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 99af47d7af976222360e729c0d0e0ff13c03c48b Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e91ea693d76118790a33514df41148f059d8c7d1378997c61a0a416160eae485
|
||||
size 387924
|
||||
3
ipset-6.20.tar.xz
Normal file
3
ipset-6.20.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7896400cb0876ed21d1fd2675ed1129f77578c4ae2683c4f11412e4949132bf5
|
||||
size 423372
|
||||
@ -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
|
||||
|
||||
|
||||
16
ipset.spec
16
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
|
||||
|
||||
21
sles11.diff
21
sles11.diff
@ -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);
|
||||
Loading…
Reference in New Issue
Block a user