Accepting request 811552 from security:netfilter

- Update to release 1.8.5

OBS-URL: https://build.opensuse.org/request/show/811552
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=72

iptables-1.8.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c
-size 704312

iptables-1.8.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309
+size 713769

iptables-apply-mktemp-fix.patch

@@ -1,26 +0,0 @@
----
- iptables/iptables-apply |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: iptables-1.8.1/iptables/iptables-apply
-===================================================================
---- iptables-1.8.1.orig/iptables/iptables-apply
-+++ iptables-1.8.1/iptables/iptables-apply
-@@ -111,7 +111,7 @@ if [[ ! -r "$FILE" ]]; then
- 	exit 2
- fi
- 
--COMMANDS=(tempfile "$SAVE" "$RESTORE")
-+COMMANDS=(mktemp "$SAVE" "$RESTORE")
- 
- for cmd in "${COMMANDS[@]}"; do
- 	if ! command -v $cmd >/dev/null; then
-@@ -122,7 +122,7 @@ done
- 
- umask 0700
- 
--TMPFILE=$(tempfile -p iptap)
-+TMPFILE=$(mktemp)
- trap "rm -f $TMPFILE" EXIT HUP INT QUIT ILL TRAP ABRT BUS \
- 		      FPE USR1 SEGV USR2 PIPE ALRM TERM
- 

iptables-batch.patch

@@ -3,14 +3,14 @@
  iptables/iptables-batch.c |  468 ++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 477 insertions(+)
 
-Index: iptables-1.8.0/iptables/Makefile.am
+Index: iptables-1.8.5/iptables/Makefile.am
 ===================================================================
---- iptables-1.8.0.orig/iptables/Makefile.am
+--- iptables-1.8.5.orig/iptables/Makefile.am
-+++ iptables-1.8.0/iptables/Makefile.am
++++ iptables-1.8.5/iptables/Makefile.am
-@@ -98,3 +98,12 @@ install-exec-hook:
+@@ -111,3 +111,12 @@ install-exec-hook:
- 	for i in ${v4_sbin_links}; do ${LN_S} -f xtables-legacy-multi "${DESTDIR}${sbindir}/$$i"; done;
  	for i in ${v6_sbin_links}; do ${LN_S} -f xtables-legacy-multi "${DESTDIR}${sbindir}/$$i"; done;
  	for i in ${x_sbin_links}; do ${LN_S} -f xtables-nft-multi "${DESTDIR}${sbindir}/$$i"; done;
+ 	${LN_S} -f iptables-apply "${DESTDIR}${sbindir}/ip6tables-apply"
 +
 +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.0/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.0/iptables/iptables-batch.c
+Index: iptables-1.8.5/iptables/iptables-batch.c
 ===================================================================
 --- /dev/null
-+++ iptables-1.8.0/iptables/iptables-batch.c
++++ iptables-1.8.5/iptables/iptables-batch.c
 @@ -0,0 +1,468 @@
 +/*
 + * Author: Ludwig Nussel <ludwig.nussel@suse.de>

iptables.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun  3 13:21:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.8.5
+  * IDLETIMER: Add alarm timer option
+  * nft: CT: add translation for NOTRACK                                                         
+- Drop iptables-apply-mktemp-fix.patch (seemingly applied)
+
 -------------------------------------------------------------------
 Mon Dec  2 20:01:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

iptables.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package iptables
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 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.4
+Version:        1.8.5
 Release:        0
 Summary:        IP packet filter administration utilities
 License:        GPL-2.0-only AND Artistic-2.0
@@ -27,12 +27,10 @@ URL:            https://netfilter.org/projects/iptables/
 Source:         https://netfilter.org/projects/iptables/files/%name-%version.tar.bz2
 Source2:        https://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig
 Source3:        %name.keyring
-Patch3:         iptables-batch.patch
+Patch1:         iptables-batch.patch
-Patch4:         iptables-apply-mktemp-fix.patch
+Patch2:         iptables-batch-lock.patch
-Patch5:         iptables-batch-lock.patch
+Patch3:         iptables-1.8.2-dont_read_garbage.patch
-Patch6:         iptables-1.8.2-dont_read_garbage.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex >= 2.5.33
@@ -42,7 +40,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.5
+BuildRequires:  pkgconfig(libnftnl) >= 1.1.6
 Requires:       netcfg >= 11.6
 Requires:       xtables-plugins = %version-%release
 Requires(post): update-alternatives
@@ -177,7 +175,6 @@ b="%buildroot"
 rm -f "$b/%_libdir/"libiptc.so*
 # iptables-apply is not installed by upstream Makefile
 install -m0755 iptables/iptables-apply "$b/%_sbindir/"
-install -m0644 iptables/iptables-apply.8 "$b/%_mandir/man8/"
 rm -f "$b/%_libdir"/*.la
 rm -f "$b/%_sysconfdir/ethertypes" # -> netcfg
 
@@ -242,6 +239,7 @@ fi
 %_sbindir/iptables-legacy*
 %_sbindir/iptables-nft*
 %_sbindir/iptables-*translate*
+%_sbindir/ip6tables-apply
 %_sbindir/ip6tables-legacy*
 %_sbindir/ip6tables-nft*
 %_sbindir/ip6tables-*translate*