diff --git a/bufferov.diff b/bufferov.diff index 4567e6d..f246e71 100644 --- a/bufferov.diff +++ b/bufferov.diff @@ -14,16 +14,16 @@ expr/data_reg.c:69:27: warning: '%d' directive writing between 1 and src/expr/data_reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libnftnl-1.0.8/src/expr/data_reg.c +Index: libnftnl-1.0.9/src/expr/data_reg.c =================================================================== ---- libnftnl-1.0.8/src/expr/data_reg.c -+++ libnftnl-1.0.8/src/expr/data_reg.c -@@ -60,7 +60,7 @@ static int nftnl_data_reg_value_json_par +--- libnftnl-1.0.9.orig/src/expr/data_reg.c ++++ libnftnl-1.0.9/src/expr/data_reg.c +@@ -59,7 +59,7 @@ static int nftnl_data_reg_verdict_json_p + static int nftnl_data_reg_value_json_parse(union nftnl_data_reg *reg, json_t *data, struct nftnl_parse_err *err) { - int i; -- char node_name[6]; -+ char node_name[16]; +- char node_name[8] = {}; /* strlen("data256") + 1 == 8 */ ++ char node_name[16] = {}; /* strlen("data256") + 1 == 8 */ + int ret, remain = sizeof(node_name), offset = 0, i; if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U8, ®->len, err) < 0) - return DATA_NONE; diff --git a/libnftnl-1.0.8.tar.bz2 b/libnftnl-1.0.8.tar.bz2 deleted file mode 100644 index 5ac1228..0000000 --- a/libnftnl-1.0.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6bdd799ef9c59fc247954aba9f2c6469d8e04cfaee73526728011eaa3632038 -size 400496 diff --git a/libnftnl-1.0.8.tar.bz2.sig b/libnftnl-1.0.8.tar.bz2.sig deleted file mode 100644 index e3db27f..0000000 Binary files a/libnftnl-1.0.8.tar.bz2.sig and /dev/null differ diff --git a/libnftnl-1.0.9.tar.bz2 b/libnftnl-1.0.9.tar.bz2 new file mode 100644 index 0000000..925db91 --- /dev/null +++ b/libnftnl-1.0.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec1d824aee301e59a11aeaae2a2d429cb99ead81e6bafab791a4dd6569b3635 +size 402296 diff --git a/libnftnl-1.0.9.tar.bz2.sig b/libnftnl-1.0.9.tar.bz2.sig new file mode 100644 index 0000000..3346221 Binary files /dev/null and b/libnftnl-1.0.9.tar.bz2.sig differ diff --git a/libnftnl.changes b/libnftnl.changes index 577a240..598cf6e 100644 --- a/libnftnl.changes +++ b/libnftnl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 2 21:04:42 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 1.0.9 + * Mostly bug fixes plus one new nftnl_expr_fprintf() function. + ------------------------------------------------------------------- Fri Oct 13 00:29:52 UTC 2017 - jengelh@inai.de diff --git a/libnftnl.spec b/libnftnl.spec index ae86913..2bbfe94 100644 --- a/libnftnl.spec +++ b/libnftnl.spec @@ -1,7 +1,7 @@ # # spec file for package libnftnl # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libnftnl %define lname libnftnl7 -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: Userspace library to access the nftables Netlink interface License: GPL-2.0+ @@ -30,9 +30,6 @@ Source: http://ftp.netfilter.org/pub/libnftnl/%name-%version.tar.bz2 Source2: http://ftp.netfilter.org/pub/libnftnl/%name-%version.tar.bz2.sig Patch1: bufferov.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Normally, this require would not be needed, as upstream ships all headers. -# Except when they don't and then don't bother fixing it. -BuildRequires: linux-glibc-devel >= 2.6.35 BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(jansson) >= 2.3 @@ -67,9 +64,7 @@ applications that want to make use of libnftnl. %patch -P 1 -p1 %build -%configure \ - --with-xml-parsing \ - --with-json-parsing \ +%configure --with-xml-parsing --with-json-parsing \ --includedir="%_includedir/%name" make %{?_smp_mflags}