From e28516086cb4c521cd5ea2e30090f84ae4c7cef422f897b1598f16c8493bcb81 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 12 Jan 2023 23:00:10 +0000
Subject: [PATCH] - Update to release 1.8.9

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=155
---
 iptables-1.8.8.tar.bz2     |   3 ---
 iptables-1.8.8.tar.bz2.sig | Bin 566 -> 0 bytes
 iptables-1.8.9.tar.xz      |   3 +++
 iptables-1.8.9.tar.xz.sig  | Bin 0 -> 566 bytes
 iptables-batch.patch       |  16 ++++++++--------
 iptables.changes           |  12 ++++++++++++
 iptables.spec              |  10 ++++++----
 7 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 iptables-1.8.8.tar.bz2
 delete mode 100644 iptables-1.8.8.tar.bz2.sig
 create mode 100644 iptables-1.8.9.tar.xz
 create mode 100644 iptables-1.8.9.tar.xz.sig

diff --git a/iptables-1.8.8.tar.bz2 b/iptables-1.8.8.tar.bz2
deleted file mode 100644
index 123c4d7..0000000
--- a/iptables-1.8.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f
-size 746985
diff --git a/iptables-1.8.8.tar.bz2.sig b/iptables-1.8.8.tar.bz2.sig
deleted file mode 100644
index 088b87b0cf2fedede57866d7927c0b7ca37927ac490dca26c8e3b27ec9457178..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SW*e79j*T*<`H1NrA^z0Q;NOU6+cA6d>dU0%Cq*2LK8Q5Y=6m
zii#8<<jd|4|8mL7cfqeiNDWkcV~sBCx+fpr8|m{_>4YP`6gV;*xa**0(Wn~ezeef7
zS164YpCstGw|tG9o`W|qOP@XYI?w>?9jT8mj=z-tNyhqj4!;j;oWO_c{cZPgTGzE<
zuGI1=D{7tJaf85rBT5M^jxF#z1Ts#Cd>VX)rcvF)&eyZ{o;5<$CsraOm&__;*T!c@
znb4CY4^3$JVR2l;uRq?2ZVtnc8#<pGBhbF)^vBsYkc^&|5bT-1iIl$j#-lybg1}Eh
z9u(z8yfMbx>{ga|fuVI+yWfeG!d<^Mtm8fSJJ+hHOld<amI~6!vA%Bd*F67&{)$^k
zMZx@wI*$QhATREs7i)Gnah(u@gN_wsxhmusbL24JwYcihkYSyU9jmqU^s;~61j2-B
zVMVasS~Zy+4r2do#Tm(bTPg<M#8wWIn(ebrc*$)ju>Bupp&EIJ!&UBnLaq+TiQ*-l
z9v_xu^<|>_sFqXHm2sBY&cu=HnGG&11JRpAhi6LS&OLvuF_s*FlUDP1D=23*0Lrm~
z<4(?3=j3qk#3PjAG<PF}Xl$KwQ;3O<`^%R2etd}c87~weZ=YeJ^JRn`2Q{|{YET_m
z|LC$26Q!Vu*<5*3Kxdz#-NY8MwCEul^m82Xw4t>52D#Z`>`)meVS|4HFBwNHJ2HFd
E3<ydXYXATM

diff --git a/iptables-1.8.9.tar.xz b/iptables-1.8.9.tar.xz
new file mode 100644
index 0000000..9a28818
--- /dev/null
+++ b/iptables-1.8.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f
+size 637848
diff --git a/iptables-1.8.9.tar.xz.sig b/iptables-1.8.9.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..f31b9f05dcbc6a1b531648d6a1aff1ef02c8fb030a4564875d061ececc138650
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j*T*<`H1NrA^z0Q;NOU6+cA6d>dU0%O17RsaeK5Y=6m
zii#8<<g}R&{wQNiHySEpHQ4N|B<J?Nk+Iiwn5@$7_I=hO3Ew?yb8}u{VBl_TC-$#A
zHnmn7BxtKy)EhmM^q|8}lEQ#^NFn%zd)T?yZrOd0OJUn@mu30h=5a~^IPE}QNH{nR
zE<P|bQCN)E>6-G1)l(2owBt8>VR#25A+4Eck>Ih8<TyvODgo&R8-@c#CdIhH<fUtF
zA1un3@GC+S6})=wkodM=NN&kBvq`rbz?wsm)AfcI5J#c95R=*WkO$W!FAz`Jp&YpS
znY#)g9|Lv4GL7x>@~;&0jFQcN_FzUrDZiD36db&B6`;94V=Rg4BvoXymri2@FxCqG
zWt*7(2;o~fn*RPq?Z4t*A7M=lz(csAUB0Py`VR=8z@_w<)Q8NoO(<Ddd$^{pjjp61
z-6rOfout?N$HP+5OJlwy|0?3Jl+6nDlYjdNy4nG$2iQfOSwM_Zs*NBER`vJcxQf1q
z7amvfirF;rlL{o}dkWdH$y_Q*7VBsL3CegaR|%H$7FtUZ>ydz9Trjc=st4Y(^dvZb
zmOFmVtgaK5+1au$r5A&^0CrcTo7J<Ncf2(9cEOkp)3cs%U@E^CT7xZ$DUmpTnDYLS
zgY!A^`t@3>Jg`pEz@H?t+wZkFpLl*&4F$#rZvL&r>;;c}g(?MHu%fz0n=x)d#b@gL
EKelHUeE<Le

literal 0
HcmV?d00001

diff --git a/iptables-batch.patch b/iptables-batch.patch
index 0873e7b..8472aef 100644
--- a/iptables-batch.patch
+++ b/iptables-batch.patch
@@ -3,14 +3,14 @@
  iptables/iptables-batch.c |  468 ++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 477 insertions(+)
 
-Index: iptables-1.8.6/iptables/Makefile.am
+Index: iptables-1.8.9/iptables/Makefile.am
 ===================================================================
---- iptables-1.8.6.orig/iptables/Makefile.am
-+++ iptables-1.8.6/iptables/Makefile.am
-@@ -138,3 +138,12 @@ uninstall-hook:
- 		); \
- 		( cd "$$dir" && rm -f ip6tables-apply ); \
+--- iptables-1.8.9.orig/iptables/Makefile.am
++++ iptables-1.8.9/iptables/Makefile.am
+@@ -147,3 +147,12 @@ uninstall-hook:
  	}
+ 
+ EXTRA_DIST = tests
 +
 +iptables_legacy_batch_SOURCES  = iptables-batch.c iptables.c xshared.c
 +iptables_legacy_batch_LDFLAGS  = ${xtables_legacy_multi_LDFLAGS}
@@ -20,10 +20,10 @@ Index: iptables-1.8.6/iptables/Makefile.am
 +ip6tables_legacy_batch_LDFLAGS = ${xtables_legacy_multi_LDFLAGS}
 +ip6tables_legacy_batch_LDADD   = ${xtables_legacy_multi_LDADD}
 +sbin_PROGRAMS += iptables-legacy-batch ip6tables-legacy-batch
-Index: iptables-1.8.6/iptables/iptables-batch.c
+Index: iptables-1.8.9/iptables/iptables-batch.c
 ===================================================================
 --- /dev/null
-+++ iptables-1.8.6/iptables/iptables-batch.c
++++ iptables-1.8.9/iptables/iptables-batch.c
 @@ -0,0 +1,468 @@
 +/*
 + * Author: Ludwig Nussel <ludwig.nussel@suse.de>
diff --git a/iptables.changes b/iptables.changes
index 9359abd..0d15c4c 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 12 22:58:50 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.8.9
+  * arptables-nft: Support --exact flag
+  * Support more chunk types in the "sctp" extension
+  * Print `--` in ip6tables' "opt" column for consistency with
+    iptables
+  * More verbose error messages if iptables-nft-restore fails
+  * Support `-p Length` with ebtables-nft,
+    needed for 802_3 extension.
+
 -------------------------------------------------------------------
 Thu Jul 21 12:43:02 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
 
diff --git a/iptables.spec b/iptables.spec
index f481b2f..813d6a8 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iptables
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,15 +23,15 @@
 %endif
 
 Name:           iptables
-Version:        1.8.8
+Version:        1.8.9
 Release:        0
 Summary:        IP packet filter administration utilities
 License:        Artistic-2.0 AND GPL-2.0-only
 Group:          Productivity/Networking/Security
 URL:            https://netfilter.org/projects/iptables/
 #Git-Clone:     git://git.netfilter.org/iptables
-Source:         https://netfilter.org/projects/iptables/files/%name-%version.tar.bz2
-Source2:        https://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig
+Source:         https://netfilter.org/projects/iptables/files/%name-%version.tar.xz
+Source2:        https://netfilter.org/projects/iptables/files/%name-%version.tar.xz.sig
 Source3:        %name.keyring
 Source4:        baselibs.conf
 Patch1:         iptables-batch.patch
@@ -194,6 +194,7 @@ rm -f "$b/%_libdir/"libiptc.so*
 install -m0755 iptables/iptables-apply "$b/%_sbindir/"
 rm -f "$b/%_libdir"/*.la
 rm -f "$b/%_sysconfdir/ethertypes" # provided by netcfg
+rm -f "$b/%_sysconfdir/xtables.conf" # packaging bug
 
 for i in iptables iptables-restore iptables-save ip6tables ip6tables-restore \
     ip6tables-save arptables arptables-restore arptables-save ebtables \
@@ -328,6 +329,7 @@ fi
 %_sbindir/ip6tables-*translate*
 %_sbindir/arptables-nft*
 %_sbindir/ebtables-nft*
+%_sbindir/ebtables-*translate*
 %_sbindir/xtables*
 %_mandir/man1/*tables*
 %_mandir/man8/*tables*