From ca27c3e6870a16ad234a01b2deef0de7a11955dbb799b074e7ebdfb1b98e9f7a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 13 Nov 2018 14:08:24 +0000 Subject: [PATCH] - Update to new upstream release 1.1.2 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnftnl?expand=0&rev=36 --- bufferov.diff | 29 ----------------------------- libnftnl-1.1.1.tar.bz2 | 3 --- libnftnl-1.1.1.tar.bz2.sig | Bin 590 -> 0 bytes libnftnl-1.1.2.tar.bz2 | 3 +++ libnftnl-1.1.2.tar.bz2.sig | Bin 0 -> 590 bytes libnftnl.changes | 10 ++++++++++ libnftnl.spec | 14 +++++--------- 7 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 bufferov.diff delete mode 100644 libnftnl-1.1.1.tar.bz2 delete mode 100644 libnftnl-1.1.1.tar.bz2.sig create mode 100644 libnftnl-1.1.2.tar.bz2 create mode 100644 libnftnl-1.1.2.tar.bz2.sig diff --git a/bufferov.diff b/bufferov.diff deleted file mode 100644 index f246e71..0000000 --- a/bufferov.diff +++ /dev/null @@ -1,29 +0,0 @@ -From: Jan Engelhardt -Date: 2017-10-13 02:43:06.480980575 +0200 -X-Upstream: reported - -resolve a potential buffer overflow when i > 9 -[reg->len > 36]. - - -expr/data_reg.c:69:27: warning: '%d' directive writing between 1 and -10 bytes into a region of size 2 [-Wformat-overflow=] - sprintf(node_name, "data%d", i); - ---- - src/expr/data_reg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libnftnl-1.0.9/src/expr/data_reg.c -=================================================================== ---- 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) - { -- 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) diff --git a/libnftnl-1.1.1.tar.bz2 b/libnftnl-1.1.1.tar.bz2 deleted file mode 100644 index 764cb2f..0000000 --- a/libnftnl-1.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d6a65413f27ec635eedf6aba033f7cf671d462a2afeacc562ba96b19893aff2 -size 372562 diff --git a/libnftnl-1.1.1.tar.bz2.sig b/libnftnl-1.1.1.tar.bz2.sig deleted file mode 100644 index eb6dc3a63838631f459751f8b42066ef89abc910ae0d4acd669b2cfb7aaafdc1..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U04?5axQOjX8;Nb5UWO2p(fIj zkkH^z{qvWwM$JJaT35CDGQ|cMlm~ZK?{2WlqkFLr$ zMEgTD8OO_U;o=^bipLC`LM6iLgFI^h3R%KA5SQAQH7l$Ep$rpp>O8nGnPS3< zhQ;kOv-HvT2Yyl}MKl|v8O>7a#B`OiW`4p8(X!KkgkMurFpF1--hS%iJS8Bx;~Wt9 zvW7IVXfH%U_x!D0&WCOug=tILnVI%V(T;}1;-dv@FM6AlPpdF zIUDzaTm?OA?KAf1j)(QLoZ1jgVtauS3koqv$(_)`*pY1-qA9Bzt4?5axQOjX8;Nb5UWO2p(fIjc7MUh7oOKCU$f3 z{PhC;o3oM%TX@jBp^MZ83Cuj7h+V(RC-OI5hv{|y?$W0M)G0=wgL)uZy)-SNeMBiC z-VYzv7p`g55y&5*bP5a_xlbBwUUT41NTqU@bRNJ2toUyid2g--w9Y!)7Ovhc*Kr{L z_kd_LSin+^{;<&*FR9CDcaa8a(f(VGYD%FyCE2)e_fj#xzJ*QN5a-cJesq6_H^lhg zI~0UfFlQWFm=beALwzgQ0j4|k9vhI|3&=`8w)f^>aJ$%&=GW@`lEA-GHWm`#swnoQ#8jTo)G;-ycCnR!T`9|E_feL0IL zyMBt5q=-f+B0!r0Bdcrsf911r=5Nu-diSL=uM?XPFb*4}4;8*neMd>rv_xsa9T@rC zRCsd4$lp0TM1H3<7;H(w2P6$J3n7q$NJG_M_Xsvu_U^-Ale|}F3h2Y|Q^DFK;P7v* c|GEl@Q!I824wSwxLXz@a!v4MjGAg#` + +- Update to new upstream release 1.1.2 + * This release adds supports for new kernel extensions: tproxy, + tunneling, xfrm, osf, conntrack timeouts and helpers. This + release deprecates the nftnl_rule_cmp() interface and the low + level JSON infrastructure. +- Remove bufferov.diff (obsolete) + ------------------------------------------------------------------- Sat Jun 9 07:14:08 UTC 2018 - jengelh@inai.de diff --git a/libnftnl.spec b/libnftnl.spec index a9cb392..fe3b378 100644 --- a/libnftnl.spec +++ b/libnftnl.spec @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libnftnl -%define lname libnftnl7 -Version: 1.1.1 +%define lname libnftnl11 +Version: 1.1.2 Release: 0 Summary: Userspace library to access the nftables Netlink interface License: GPL-2.0-or-later @@ -28,11 +28,9 @@ Url: http://netfilter.org/projects/libnftnl/ #Git-Clone: git://git.netfilter.org/libnftnl 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 BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -BuildRequires: pkgconfig(jansson) >= 2.3 BuildRequires: pkgconfig(libmnl) >= 1.0.3 %description @@ -61,11 +59,9 @@ applications that want to make use of libnftnl. %prep %setup -q -%patch -P 1 -p1 %build -%configure --with-xml-parsing --with-json-parsing \ - --includedir="%_includedir/%name" +%configure --with-xml-parsing --includedir="%_includedir/%name" make %{?_smp_mflags} %install @@ -77,7 +73,7 @@ rm -f "%buildroot/%_libdir"/*.la %files -n %lname %defattr(-,root,root) -%_libdir/libnftnl.so.7* +%_libdir/libnftnl.so.11* %files devel %defattr(-,root,root)