SHA256
1
0
forked from pool/ipset

Accepting request 657184 from security:netfilter

- Update to new upstream release 7.1

OBS-URL: https://build.opensuse.org/request/show/657184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipset?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2018-12-19 12:27:20 +00:00 committed by Git OBS Bridge
commit 52acdd7720
5 changed files with 16 additions and 46 deletions

View File

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

3
ipset-7.1.tar.bz2 Normal file
View File

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

View File

@ -1,39 +0,0 @@
From a680d3fdbb637fae53c60e4a30f028bd5ed1fe4b Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Sat, 10 Nov 2018 17:34:57 +0100
Subject: Fix to list/save into file specified by option
list/save into file given by "-f filename" did not work in 7.0,
reported by Isaac Good.
---
lib/ipset.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/ipset.c b/lib/ipset.c
index 8d05b39..4366e60 100644
--- a/lib/ipset.c
+++ b/lib/ipset.c
@@ -633,7 +633,7 @@ restore(struct ipset *ipset)
if (ipset->filename) {
ret = ipset_session_io_normal(session, ipset->filename,
IPSET_IO_INPUT);
- if (ret)
+ if (ret < 0)
return ret;
f = ipset_session_io_stream(session, IPSET_IO_INPUT);
}
@@ -1204,9 +1204,10 @@ ipset_parse_argv(struct ipset *ipset, int oargc, char *oargv[])
if (ipset->filename != NULL) {
ret = ipset_session_io_normal(session,
ipset->filename, IPSET_IO_OUTPUT);
- if (!ret)
+ if (ret < 0)
return ret;
}
+ /* Fall through to parse optional setname */
case IPSET_CMD_DESTROY:
case IPSET_CMD_FLUSH:
/* Args: [setname] */
--
cgit v1.2.1

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Dec 11 13:02:03 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 7.1
* Correct the manpage about the sort option
* Implement sorting for hash types in the ipset tool
* Fix to list/save into file specified by option
- Remove ipset-file.diff (merged)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 17:58:53 UTC 2018 - Arjen de Korte <suse+build@de-korte.org> Tue Nov 20 17:58:53 UTC 2018 - Arjen de Korte <suse+build@de-korte.org>

View File

@ -25,7 +25,7 @@
%define ipset_build_kmp 0 %define ipset_build_kmp 0
%endif %endif
Name: ipset Name: ipset
Version: 7.0 Version: 7.1
Release: 0 Release: 0
Summary: Netfilter ipset administration utility Summary: Netfilter ipset administration utility
License: GPL-2.0-only License: GPL-2.0-only
@ -36,7 +36,6 @@ Url: http://ipset.netfilter.org/
Source: http://ipset.netfilter.org/%name-%version.tar.bz2 Source: http://ipset.netfilter.org/%name-%version.tar.bz2
Source3: %name-preamble Source3: %name-preamble
Patch1: ipset-destdir.diff Patch1: ipset-destdir.diff
Patch2: ipset-file.diff
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
@ -104,8 +103,9 @@ addresses with MAC addresses in a way, which ensures lightning speed
when matching an entry against a set. when matching an entry against a set.
%prep %prep
%setup -q %autosetup -p1
%patch -P 1 -P 2 -p1 #%%setup -q
#%%patch -P 1 -p1
%build %build
# build wants to call modinfo at some point # build wants to call modinfo at some point