From 0c23a1e8cb1d83b25c3e65d6234c979cdadec9614900a6c3fb2af6b0212ff43e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 2 Jan 2018 21:10:35 +0000
Subject: [PATCH] libnftnl-1.0.9

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnftnl?expand=0&rev=30
---
 bufferov.diff              |  16 ++++++++--------
 libnftnl-1.0.8.tar.bz2     |   3 ---
 libnftnl-1.0.8.tar.bz2.sig | Bin 543 -> 0 bytes
 libnftnl-1.0.9.tar.bz2     |   3 +++
 libnftnl-1.0.9.tar.bz2.sig | Bin 0 -> 543 bytes
 libnftnl.changes           |   6 ++++++
 libnftnl.spec              |  11 +++--------
 7 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 libnftnl-1.0.8.tar.bz2
 delete mode 100644 libnftnl-1.0.8.tar.bz2.sig
 create mode 100644 libnftnl-1.0.9.tar.bz2
 create mode 100644 libnftnl-1.0.9.tar.bz2.sig

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, &reg->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 e3db27f1229290e54fa4c1e3cd482616d75a406ec4dc5ce7837024f495edd5cf..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-;${Nn%$2@tDBRiP%*lH~ZC5Bv$39P26I<7cadh@;)w
z<`K3}<YY5{*rE%tGuB321pu_>!@t%59XGX#hlF{kJ3tu5vq!B%{p`3t4yI}uI2pWi
z0@1%!iBQ%AtfM`Tw}!5S5RsXd&vOCzn2Uyi>nS9)%>AmwzJ=BvN}Mr;z4hfd>9=QX
ze#U-iGwPHFlofu3xhloe3h9#Ii6loW(x@+EYOBK5L8OlfrH>|ZocfFl&F%(|&Lk>s
zSQXcs+XoDAG~AskLn$=+v#5zNx#)Yc#jj^B#E_4grhOFEhqE9!(Sihr(HTH+pBIca
zH!bi_#4YcTmS2YJpVf6K8@lNKVrn(AjQQC!Bg^mN890ewKfNd!26Ykmk%6k(%m+ts
z3etDQaKowbknkD+`LKcDyCQfOsHtAt7v5QOXc2+rF=t%c$9XM*IoZ)T=V%RXQ!)wB
zti-jZP{Gaa=}m!g-C)G`*_{0`R52+QLjFNe*|sgu7#k3Ac;VFZCSuOjOc5!r+zn_e
zfVJ~az)rUVS7$+se{yaI4d^qOF{sSNL~F<_X+;#_-k-|9Xhg_`acj1219(;KQM#w*
z5i249u}&Lec5rMcr-r)`G@;2nE=3NuBG}a}7LsJX>nAg430UN(sw}``M1WE|U}5p0
h&;9PD`<WfSuFd5QA<{}kbZEcJ$vkfOhi_iNQ{jyF3kd)K

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 0000000000000000000000000000000000000000000000000000000000000000..33462217a39032055e0b770ac084aa6758a2c1f08a139587479a637f3841593c
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-=2!=wNT2@tDBRiP%*lH|Q55B@J2@T78?(2UKugZj|B
zAdLoA6eW9|=b8#67ZR&ljiA{ebNp|)L?|R!#v!)G8&v*xk=<;97F-2oY&m0HPH;Hq
zEqdjJ>s5>{)pRVA-XQb>+n!a6{{W1ROB0R^anZf|E{5ljNa+(qmVBn<*64_DaopOy
zKz&Yk8>>n&T=(*+qOjV(P9@4F$Ph?XZN*vSFU4NlZlQ@|(fz0$tt2zd8vA{BKuu7d
zdT9N|Wv#JT?4uD<k0|!GOgrC^z_aXGg=d*{l`wFgy50qr-9dE&YkY{hO!L{Mzowbd
zx`C0UwSQL7j}$kG8Gfl>>g9_4&J&~n&LS;CDN|peUB&#i7Z1TNh%kQBUC%%+_XAGH
zRUN9O8+dEX>uXedtI2jGRlu=7_{ix-^+tjDF|{AW6jCNnd--8e0JyOd_Y1qbI_WR*
z5WxP8x&MMup2lA=ISi~BjV=(rFC54>ElJ8p`$)F)$5;(}i@eBuZ<t16DoLbu;%DFb
zuHdH~pQnyob~C#~qCORI|MCD%&mL-rGw0kEy1NS6?4`7__m`9>xzctOZ1}_B;3}wv
zq#Oi8w+eJz+IMF)XldW79eHAR8C_`h7jGAC0thkZZJAU~fs@!$S<ir&CM^5}aUr1w
hLI6PB6_&v^?V92~mo^;|=cjN;@QvqFagJ+s95xe{2e|+M

literal 0
HcmV?d00001

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}