From 75e1a0da24584391f56a56675eae07dab910df3a8254c6e7d1094bd9cc67c5fd Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 28 Jan 2017 09:17:04 +0000
Subject: [PATCH] iptables-1.6.1

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=91
---
 iptables-1.6.0.tar.bz2     |   3 ---
 iptables-1.6.0.tar.bz2.sig | Bin 543 -> 0 bytes
 iptables-1.6.1.tar.bz2     |   3 +++
 iptables-1.6.1.tar.bz2.sig | Bin 0 -> 543 bytes
 iptables.changes           |   8 ++++++++
 iptables.spec              |  23 ++++++++++-------------
 6 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 iptables-1.6.0.tar.bz2
 delete mode 100644 iptables-1.6.0.tar.bz2.sig
 create mode 100644 iptables-1.6.1.tar.bz2
 create mode 100644 iptables-1.6.1.tar.bz2.sig

diff --git a/iptables-1.6.0.tar.bz2 b/iptables-1.6.0.tar.bz2
deleted file mode 100644
index 01eeb91..0000000
--- a/iptables-1.6.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60
-size 608288
diff --git a/iptables-1.6.0.tar.bz2.sig b/iptables-1.6.0.tar.bz2.sig
deleted file mode 100644
index d66f846a4e3bb2f2239b333dcd3812206692dd124a0fb366dfa8e79b252b37c2..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-!dRz?5{2@tDBRiP%*lH_Xl5C49}dKy_e?xLSHf~H*~
zh3hfq=OUdqd#Wa7pLwezFZ`S2b{+QVw;7`~ZiO{Sm~i!VGpc!!$fA}N-|85Xwt~RW
z$pk~CnH;}&=Vr!5y>^d)Ld8QCBAVF9QTY8EI*4g8#2dt2T*n+?y6rm51D(IupuQbm
zGKr<m$*qEMCVm3RODo#eJ1e|gC(_%Jm}NQ7bB5}1aG%{h#!YafU)nVN1DGJP4qeT&
z@du;b#sy0!{|UeS5ZZa~qcLS=nIT5mS08?n#&Sp?xPG|IyQ>azjW~0hnm)<Xb-wni
zhJr9=!oHFpt>KhdJZwH&Hn-AmHi`nlEefGZX&!_8I|+7ux}mz&Z8c3Ci}Hs<6or$e
z?CQ;@Yl@x7I`<4}QXEI_S|4bE!Hn^ilV%HVB$zub7xb+LS9#(H@qKBnq_tMhw(XD(
zLBjFii_L=v<a-Wu6m8-NfzAdGyj0|7vzpXPwe7}InqIy}ZdmrN?1Gv;!ZojsD6TJ1
zn#>G<d4dl5qO^Wjxf`Q##!PE}ag>77+9x!ohE$H$jUUo<SQQe-Qe^al5yV+DG%ed#
znV%kJ(+h-CdByhe>~m3)Z1T<XmYRJqZf~==-=A_@xg|sL&+BLaNcf7yIy*m}(dI^t
hYDK5#gdvO4?OKnU$t4v21SGRKYp%HQ15C1Qiu7m24Uzx=

diff --git a/iptables-1.6.1.tar.bz2 b/iptables-1.6.1.tar.bz2
new file mode 100644
index 0000000..7a5ad4c
--- /dev/null
+++ b/iptables-1.6.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5
+size 620890
diff --git a/iptables-1.6.1.tar.bz2.sig b/iptables-1.6.1.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..4fd55987854a64d8189415748a175b224e7706d2d2854d3fc7988356501ef5da
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-)$tNZ{82@tDBRiP%*lH_&g5C2+Hc$X`!TtL;aN)nge
z{92#H)+ih~r~n}=<epd??;uY74uq4*yNE4|4G-{0w8_~0|Mxfjp%s}$vJ|`o5NCd3
z0%2=zI(FZJ4jeU${ZpT#56ZDf$huv4>93U}vTW-<Pi-b1d>OtTZ7bZDvc23R_8A4y
zP8MM#OY^k<65xF`;GI15x-GT4h|bk@;Q^y6*Gz}@2Z?zz$|v_}h%OGP(9e%_iZHG>
z_cgIEHiBSmA$tx(FwV$=EVPMn)m5Tu3C*(Q-gj7A9~{Qfey>K+Q7iPqc>##o>a3bG
z$*omuk<Di9M6RDngH--{4icyn7As_TGyXOV;&M-h0O&;ZK`aQ<bsqbRkoZKBRw9Q<
zVWl-C*aQM;6<`CDsy@t|{@3z1CtLR<OoqhzoUgNWk`@8Yh~16Ucmnw%3u))yZ_**@
zbmh>WkNN^S6sgj-FgZf&JDR`kE4`3AmS4H;8~(Gh#ZM-Xe|@!(T!}mDEUj0mO!pZ*
zPs3oTL4FH_G5AngWdE#kjRPIs!_*hRgH%9eJ3AGggWRt3d?4|pN!nVqBXa6Ys4xZ%
zdxj7ltC*DC(L(>t679|<m1`w%SH+no?hd`^igwY(&WENaY~Vh64lzHU4=G2!S62!7
hH1=cm?;rjbjhg;WJ9+?7R)CcDO&DkV^-#ZOjLRMf1`q%M

literal 0
HcmV?d00001

diff --git a/iptables.changes b/iptables.changes
index 7a10658..9ea32a1 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 27 22:53:14 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 1.6.1
+* add support for hashlimit rev 2 for higher pps rates
+* add support for cgroup2 path matching
+* translation program for nft
+
 -------------------------------------------------------------------
 Fri Dec 18 20:06:41 UTC 2015 - jengelh@inai.de
 
diff --git a/iptables.spec b/iptables.spec
index b1694d7..106955b 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iptables
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,16 +17,12 @@
 
 
 Name:           iptables
-Version:        1.6.0
+Version:        1.6.1
 Release:        0
 Summary:        IP Packet Filter Administration utilities
 License:        GPL-2.0 and Artistic-2.0
 Group:          Productivity/Networking/Security
 Url:            http://netfilter.org/projects/iptables/
-
-#Git-Web:	http://git.netfilter.org/
-#Git-Clone:	git://git.netfilter.org/iptables
-#DL-URL:	http://netfilter.org/projects/iptables/files/
 Source:         http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2
 Source2:        http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig
 Source3:        %name.keyring
@@ -121,11 +117,11 @@ Requires:       libiptc0 = %version
 libiptc ("iptables cache") is used to retrieve from the kernel, parse,
 construct, and load new rulesets into the kernel.
 
-%package -n libxtables11
+%package -n libxtables12
 Summary:        iptables extension interface
 Group:          System/Libraries
 
-%description -n libxtables11
+%description -n libxtables12
 This library contains all the iptables code shared between iptables,
 ip6tables, their extensions, and for external integration for e.g.
 iproute2's m_xt.
@@ -133,7 +129,7 @@ iproute2's m_xt.
 %package -n libxtables-devel
 Summary:        Libraries, Headers and Development Man Pages for iptables
 Group:          Development/Libraries/C and C++
-Requires:       libxtables11 = %version
+Requires:       libxtables12 = %version
 
 %description -n libxtables-devel
 This library contains all the iptables code shared between iptables,
@@ -173,8 +169,8 @@ rm -f "%buildroot/%_libdir"/*.la;
 %postun -n libipq0 -p /sbin/ldconfig
 %post   -n libiptc0 -p /sbin/ldconfig
 %postun -n libiptc0 -p /sbin/ldconfig
-%post   -n libxtables11 -p /sbin/ldconfig
-%postun -n libxtables11 -p /sbin/ldconfig
+%post   -n libxtables12 -p /sbin/ldconfig
+%postun -n libxtables12 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -197,6 +193,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 %defattr(-,root,root)
 %_sysconfdir/ethertypes
 %_sbindir/*-compat*
+%_sbindir/*-translate*
 
 %files -n xtables-plugins
 %defattr(-,root,root)
@@ -230,9 +227,9 @@ rm -f "%buildroot/%_libdir"/*.la;
 %_libdir/libip*tc.so
 %_libdir/pkgconfig/libip*tc.pc
 
-%files -n libxtables11
+%files -n libxtables12
 %defattr(-,root,root)
-%_libdir/libxtables.so.11*
+%_libdir/libxtables.so.12*
 
 %files -n libxtables-devel
 %defattr(-,root,root)