Accepting request 98346 from security:netfilter

- iptables-apply-mktemp-fix.patch (bnc#730161) 

- add automake as buildrequire to avoid implicit dependency

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

iptables-apply-mktemp-fix.patch

@@ -0,0 +1,22 @@
+Index: iptables-1.4.12.1+16/iptables/iptables-apply
+===================================================================
+--- iptables-1.4.12.1+16.orig/iptables/iptables-apply
++++ iptables-1.4.12.1+16/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 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+ 
+ if ! "$SAVE" >"$TMPFILE"; then

iptables.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Dec 28 09:50:23 UTC 2011 - puzel@suse.com
+
+- iptables-apply-mktemp-fix.patch (bnc#730161) 
+
+-------------------------------------------------------------------
+Wed Nov 30 14:28:11 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
 -------------------------------------------------------------------
 Tue Oct  4 23:01:57 UTC 2011 - jengelh@medozas.de
 

iptables.spec

@@ -15,22 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           iptables
-License:        GPLv2+
-Group:          Productivity/Networking/Security
 Version:        1.4.12.1+16
-Release:        1
+Release:        0
 %define xt_sover	7
 Summary:        IP Packet Filter Administration
-
+License:        GPL-2.0+
+Group:          Productivity/Networking/Security
 #DL-URL:	ftp://ftp.netfilter.org/pub/iptables/
 #Git-Web:	http://git.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/iptables
 Source:         %name-%version.tar.xz
 Patch1:         iptables-batch.patch
-URL:            http://netfilter.org/
+Patch2:         iptables-apply-mktemp-fix.patch
+Url:            http://netfilter.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 BuildRequires:  sgmltool
@@ -40,7 +38,11 @@ BuildRequires:  sgml-common
 Provides:       iptables-ipv6 = %version-%release
 Obsoletes:      iptables-ipv6 < %version-%release
 %endif
-BuildRequires:  fdupes libnfnetlink-devel pkgconfig xz
+BuildRequires:  automake
+BuildRequires:  fdupes
+BuildRequires:  libnfnetlink-devel
+BuildRequires:  pkgconfig
+BuildRequires:  xz
 
 %description
 Iptables is used to set up, maintain, and inspect the tables of IP
@@ -74,6 +76,7 @@ tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
 %patch -P 1 -p1
+%patch2 -p1
 
 %build
 if [ ! -e configure ]; then