From afadf7cc4cf654b96187e401e444d359b4adf1210c0cd73f6959365b82182079 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 8 Nov 2024 17:18:33 +0100
Subject: [PATCH] iptables 1.8.11

---
 iptables-1.8.10.tar.xz     |   3 ---
 iptables-1.8.10.tar.xz.sig | Bin 566 -> 0 bytes
 iptables-1.8.11.tar.xz     |   3 +++
 iptables-1.8.11.tar.xz.sig | Bin 0 -> 566 bytes
 iptables-batch-lock.patch  |  16 ++++++++--------
 iptables.changes           |   8 ++++++++
 iptables.spec              |   5 +++--
 7 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 iptables-1.8.10.tar.xz
 delete mode 100644 iptables-1.8.10.tar.xz.sig
 create mode 100644 iptables-1.8.11.tar.xz
 create mode 100644 iptables-1.8.11.tar.xz.sig

diff --git a/iptables-1.8.10.tar.xz b/iptables-1.8.10.tar.xz
deleted file mode 100644
index 36f17e6..0000000
--- a/iptables-1.8.10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c
-size 641168
diff --git a/iptables-1.8.10.tar.xz.sig b/iptables-1.8.10.tar.xz.sig
deleted file mode 100644
index 51a35740ccb4da520ed6458b97ce3204070e0ad51ba789978cfa8d0427fd4e65..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SW*e79j*T*<`H1NrA^z0Q;NOU6+cA6d>dU0%av0xBv<X5Y=6m
zii#8<<l$8h{x*YxUbjemK=ux=eql5blV7Y5i`%>RtGX)S$BWsG6597`f|<vg5p~W)
zld;Qk;$GXtEDaDZ2&|1(*ZpDxdOST(?_@c=|MbY(Heet_F~<*Kk$rtU76NqL1v-S+
zlr^>rA0|}Nz@7JwDc*l&xD-)no*6#9u;1<IH(-rb7s6(W@;}-EH+;!To;)(3W2uZv
zO@Rywb*GaPvSGO*r&iVWmGrP3()lhDbk_1ke{*%Hxq0;wd!2A)zabUQmYC3}(;n#n
zelT>(E<g%&qKgzbLl^tDFSW2ph!hTw24LT!49YYu4vFW<=Y?J~@!Opw=>~HDBlXQA
zUixREQlZ9INGIKuZsLzsEVr&$McO#JYo`Ois`*Pcp86oCGVD42k$1cBdwE&8n09#&
zp7&aFjrkucDdKN+g?P9qmL~=V=cK;UQmvz`byhu`Vqs7I>yYM60_)g*#FjsCYs4LX
zZKtKth8Vt?O3Q*%(i4_b8dr0@-7zG&eBW}<CG~$onGf`4TrJq;#XmN2EO0N<T?EQ$
zp;$%%sH@+dcZ(k0mS;NgHV7G7f(8UL%ksjBCq_~~LMTZF^&;F!w;xAci;j|EYE<Tj
z8_hh&3YN1}buv{rM`wSGVmByIpCcCbV`k`2Ke2n^=sk;vMSl^RGK2EJsOvQT%P2pB
E1JdyeH2?qr

diff --git a/iptables-1.8.11.tar.xz b/iptables-1.8.11.tar.xz
new file mode 100644
index 0000000..d92db88
--- /dev/null
+++ b/iptables-1.8.11.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2
+size 649284
diff --git a/iptables-1.8.11.tar.xz.sig b/iptables-1.8.11.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..44921dcb67185addaa597edebf877acc50adbe4e390b92b475e2df9f7250d7c4
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j+TUvWmEb$VsuLMoKk4H{-@&nqDX0%tA}n*a(45Z4VF
zW@^tXAyPaK{TK2frZ{zAAO+uxs7)T6oD&wpt;>OUvLa}nTU{wpUl+(@zM+?_DrI}=
z{O<oO4*-J&LhWb;`c*nS9wPLZx#xTMMq#Wv7Y>y8DjYnJH#Or8Ux5l3xrh)X3lQV{
z3^wzSI<+L20*M6Q;b*$W!dS%St(HCO^|M|(LeGVf-Axp~nGU}mxQh}7Zp2c_5kw$`
z=T!M;DuqBjq4V-@>ysbeaZDnP7XK)YPQlpldgbWz+oJUYyYpBx?Xxbp$~-xz8&ssO
zx0K2A;<+S|Es1{sXm*ErG^B&sMW9c-?=&4p);8RNf}?}y5NL-gK8dRv5n6YgAqV+v
z8R?cA{E5mozBm+u2~jFK^LlJVcv?XT#dmSB;?|t=_u{Kg^^BQyUE<r1v3huyVA)Nv
z73A*sO^n_84PAJneJgeeugn8lw83SOmRZ{PEhHSOsFXuj%3hb2xmu>48rH4JIK)O5
zI+GT`6dhsG^Buqx|EoY;2wBuA^?kIRKil*hVTVIKjqTV3Jm@P4uM8*m!hk!aNgo2!
z!W*ZfN1$%FGcyULRk#~ioiv0HH$6;Q0R%jvI{ie;rA3Zd9sHw*;PP@6h$#u*(u7_1
z9%|#4<`l<dR1qPnDV4KHMmCJNezc{Wz0XNaF~<}T=LuTaJjd9kPNF~9`bA;1Tz%}|
ET__g_M*si-

literal 0
HcmV?d00001

diff --git a/iptables-batch-lock.patch b/iptables-batch-lock.patch
index fe6f729..100b8f9 100644
--- a/iptables-batch-lock.patch
+++ b/iptables-batch-lock.patch
@@ -10,10 +10,10 @@ Date: 2017-06-26T10:53:24+0000
  iptables/xshared.c        |    8 +++++++-
  2 files changed, 28 insertions(+), 1 deletion(-)
 
-Index: iptables-1.8.10/iptables/iptables-batch.c
+Index: iptables-1.8.11/iptables/iptables-batch.c
 ===================================================================
---- iptables-1.8.10.orig/iptables/iptables-batch.c
-+++ iptables-1.8.10/iptables/iptables-batch.c
+--- iptables-1.8.11.orig/iptables/iptables-batch.c
++++ iptables-1.8.11/iptables/iptables-batch.c
 @@ -44,6 +44,7 @@
  #include <iptables.h>
  #endif
@@ -49,10 +49,10 @@ Index: iptables-1.8.10/iptables/iptables-batch.c
  
  	while((r = getline(&iline, &llen, fp)) != -1)
  	{
-Index: iptables-1.8.10/iptables/xshared.c
+Index: iptables-1.8.11/iptables/xshared.c
 ===================================================================
---- iptables-1.8.10.orig/iptables/xshared.c
-+++ iptables-1.8.10/iptables/xshared.c
+--- iptables-1.8.11.orig/iptables/xshared.c
++++ iptables-1.8.11/iptables/xshared.c
 @@ -255,10 +255,14 @@ static void alarm_ignore(int i) {
  
  static int xtables_lock(int wait)
@@ -72,8 +72,8 @@ Index: iptables-1.8.10/iptables/xshared.c
  		alarm(wait);
  	}
  
--	if (flock(fd, LOCK_EX) == 0)
-+	if (flock(fd, LOCK_EX) == 0) {
+-	if (flock(fd, LOCK_EX | (wait ? 0 : LOCK_NB)) == 0)
++	if (flock(fd, LOCK_EX | (wait ? 0 : LOCK_NB)) == 0) {
 +		already_locked = true;
  		return fd;
 +	}
diff --git a/iptables.changes b/iptables.changes
index 663aad5..4b4ac15 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  8 16:14:22 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.8.11
+  * New arptables-translate tool
+  * ebtables-nft: support --replace and --list-rules commands
+  * iptables-translate: support socket match and TPROXY target
+
 -------------------------------------------------------------------
 Fri May 24 15:07:24 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/iptables.spec b/iptables.spec
index c6cb679..68b89bb 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           iptables
-Version:        1.8.10
+Version:        1.8.11
 Release:        0
 Summary:        IP packet filter administration utilities
 License:        Artistic-2.0 AND GPL-2.0-only
@@ -47,7 +47,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.6
+BuildRequires:  pkgconfig(libnftnl) >= 1.2.6
 Requires:       netcfg >= 11.6
 Requires:       xtables-plugins = %version-%release
 %if %{with libalternatives}
@@ -319,6 +319,7 @@ fi
 %files
 %license COPYING
 %_bindir/iptables-xml
+%_sbindir/arptables-*translate*
 %_sbindir/iptables-apply
 %_sbindir/iptables-legacy*
 %_sbindir/iptables-nft*