Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2018-11-22 13:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset" Thu Nov 22 13:22:25 2018 rev:32 rq:650569 version:7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2018-11-06 15:13:55.305519807 +0100 +++ /work/SRC/openSUSE:Factory/.ipset.new.19453/ipset.changes 2018-11-22 13:22:30.726188244 +0100 @@ -1,0 +2,5 @@ +Tue Nov 20 17:58:53 UTC 2018 - Arjen de Korte <suse+bu...@de-korte.org> + +- Add ipset-file.diff [boo#1116432]. + +------------------------------------------------------------------- New: ---- ipset-file.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.yJy5fL/_old 2018-11-22 13:22:32.242186669 +0100 +++ /var/tmp/diff_new_pack.yJy5fL/_new 2018-11-22 13:22:32.242186669 +0100 @@ -36,6 +36,7 @@ Source: http://ipset.netfilter.org/%name-%version.tar.bz2 Source3: %name-preamble Patch1: ipset-destdir.diff +Patch2: ipset-file.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -104,7 +105,7 @@ %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build # build wants to call modinfo at some point ++++++ ipset-file.diff ++++++ >From a680d3fdbb637fae53c60e4a30f028bd5ed1fe4b Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik <kad...@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
