From ac4551057a66838c28b19b85028806375b17485d0c2086ac119f5acb60d11ac2 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 2 Dec 2019 20:03:51 +0000
Subject: [PATCH] - Update to release 1.8.4

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=136
---
 iptables-1.8.3.tar.bz2     |   3 ---
 iptables-1.8.3.tar.bz2.sig | Bin 590 -> 0 bytes
 iptables-1.8.4.tar.bz2     |   3 +++
 iptables-1.8.4.tar.bz2.sig | Bin 0 -> 590 bytes
 iptables.changes           |  11 +++++++++++
 iptables.spec              |   7 +++----
 6 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 iptables-1.8.3.tar.bz2
 delete mode 100644 iptables-1.8.3.tar.bz2.sig
 create mode 100644 iptables-1.8.4.tar.bz2
 create mode 100644 iptables-1.8.4.tar.bz2.sig

diff --git a/iptables-1.8.3.tar.bz2 b/iptables-1.8.3.tar.bz2
deleted file mode 100644
index 9fc86e2..0000000
--- a/iptables-1.8.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80
-size 716257
diff --git a/iptables-1.8.3.tar.bz2.sig b/iptables-1.8.3.tar.bz2.sig
deleted file mode 100644
index e9ef737a2b0f4f9b56ef3f2d0f100173e771e14057872f7627bf732e24d61e1f..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryx0!st{0SEv!79j+{ow5c$9dI<dVN$KDMpdCE(vsu_0$l6<?iU<mZ*paH
zWnpbVZe?_4X>4?5axQOjX8;Nb5UWO2p(fIj<UQyQ{0pT{`!Ks7!z8R~TZx`()eA@7
zNJ2OH>MX#@xUzvy?+cjhajj0_ofH2f`1ajhTBK0F7yBW7D3eWB9RQSH09ZwTKEhRW
zP-sFJd1}Lj1x-B=ozW?T33lXKfT^B|o#|d6(F7!k#zw7leMdkw&)8v>SiaFeCgv}<
z0JowgM|7y|bM<T`bvvp$*o5+B%fJB@I_%erkDIGp<$tSOQzciSna_nT)k(4a7<Wfk
zwJ=x<MZ%z|$uf)nN~gvx#)fVO?L>-_6=cxMN6<|kCDHM%{>1MD3bBG{*xqfs1<~6W
zklFT4{QFgB{@A-_LT}P>K#wM!X=p2^ox|-DD_+<Amgko<I5nhPo%(UoxmLlHd$Z*<
zwk~=kkX<miIVGxMU|mm6sMs4#p55L=A<a?4=bxGwz&byhkSQRYJa6eJ;>Ek{b?ecQ
zKKs#8n$}yzMbQ&9kZ>a?jC`R5X%f~oK#EAp37tQd&P%cZ>z<u=Wz(CD(<2f&PFbqn
z|2(JDfSd*+uj6D0ty46NP9rK1z9A5tq*lG3tF7p66{8x|RiMHg&_--=FknC<*wcE{
zV|x`wLUqr_!nu&4xeJxKpv6cqfx`wj>1zxaq*6OqJQby1%ir;&BGQqhh{<QMVd5#i
cR53x#)$W}_e2TK&ja976xTy<@<y#hfR;!^Lm;e9(

diff --git a/iptables-1.8.4.tar.bz2 b/iptables-1.8.4.tar.bz2
new file mode 100644
index 0000000..cf3f7ae
--- /dev/null
+++ b/iptables-1.8.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c
+size 704312
diff --git a/iptables-1.8.4.tar.bz2.sig b/iptables-1.8.4.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..ea5b4c2546fc5c5bef08b7437edb2b4b1837df745bbffe06aa29bf95284bfabd
GIT binary patch
literal 590
zcmV-U0<ryx0!st{0SEv!79j+{ow5c$9dI<dVN$KDMpdCE(vsu_0$t@e*%usRZ*paH
zWnpbVZe?_4X>4?5axQOjX8;Nb5UWO2p(fIj<gPOh|4C;JKVb((PRU7*LBE@O&Ane=
zLbVMJu!TShs)cyE6%J7mK^wv=5a=vdBz8pWqOTgAoZ;=xY0ETE=AO31TU;u`hpPr5
z05JprS6k6Zq0xn5)j)8=Zm910#t3R841%<)TEwcV!E}lQC-z?o#R7HEIX$HuP%4zO
z6l7070Amm(M48xc)FR&7cgYdiM7K0fNDC945h_jBDIc+>(xvJ-xiZlb(heMp&%5AA
z1v?xA#^IAms$AgxU8g)z^l)^?B1$^JbRn0C%bVY*o`2V-S7U8XnfbW%?IK4o1%Zen
znqO)fPdg_^E;pjtW^Qs-h_-1PlFNc`S~YcKtt=R{oYxtcR=@eE=pIkGry06dN~meM
zE03W?G*Kv~bY=+m08V{O4}G}LUrQ&t3f-f!^oa4gmlb!m$#L2S-$X)6KVEThycoT~
zrYZ-D?D5=?V4~RR=*roBZ3O1ZH+28iWjm5I%e-LuAp0+;!4Li>38cnU8%k1_ea}e)
zJvd!xZ!BL}9vRDdZ6FTTHl>U&qQ^m|Z@4D_u?Vj7li^o0OyEb+Jy2V77Tg}Kn}I5l
zGjy{xoZmw#cF=Z<3VR^v4VYoURcN05+p>rMjt4bktK1vM&q{p<K721No<1s*iGp7G
cwl5Ju-~J&i-WBYfNWGa3lF0CR8<K^UljF?`xBvhE

literal 0
HcmV?d00001

diff --git a/iptables.changes b/iptables.changes
index 77e1d3f..ff4fe8d 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec  2 20:01:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.8.4
+  * Fix for wrong counter format in `ebtables-nft-save -c` output.
+  * Print typical iptables-save comments in arptables- and
+    ebtables-save, too.
+  * xt_owner: add --suppl-groups option
+  * Remove support for /etc/xtables.conf
+  * Restore support for "-4" and "-6" options in rule lines.
+
 -------------------------------------------------------------------
 Mon Sep 30 13:21:38 UTC 2019 - Kristyna Streitova <kstreitova@suse.com>
 
diff --git a/iptables.spec b/iptables.spec
index e0904df..1431df4 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iptables
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           iptables
-Version:        1.8.3
+Version:        1.8.4
 Release:        0
 Summary:        IP packet filter administration utilities
 License:        GPL-2.0-only AND Artistic-2.0
@@ -33,7 +33,6 @@ Patch5:         iptables-batch-lock.patch
 Patch6:         iptables-1.8.2-dont_read_garbage.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires:  autoconf, automake >= 1.10
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex >= 2.5.33
@@ -43,7 +42,7 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(libmnl) >= 1.0
 BuildRequires:  pkgconfig(libnetfilter_conntrack) >= 1.0.4
 BuildRequires:  pkgconfig(libnfnetlink) >= 1.0.0
-BuildRequires:  pkgconfig(libnftnl) >= 1.1.3
+BuildRequires:  pkgconfig(libnftnl) >= 1.1.5
 Requires:       netcfg >= 11.6
 Requires:       xtables-plugins = %version-%release
 Requires(post): update-alternatives