From b70a3a249eb0345bf8952ecd7de37b3bbeba7b7f5bfebfd46e828bd9c253172d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 30 Nov 2011 17:05:36 +0000 Subject: [PATCH 1/2] Accepting request 94553 from home:coolo:removeautomake add automake to buildrequires OBS-URL: https://build.opensuse.org/request/show/94553 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=37 --- iptables.changes | 5 +++++ iptables.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/iptables.changes b/iptables.changes index d2e0cf5..b2bae13 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/iptables.spec b/iptables.spec index c47764e..88d5b74 100644 --- a/iptables.spec +++ b/iptables.spec @@ -15,22 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: iptables -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Networking/Security Version: 1.4.12.1+16 -Release: 1 +Release: 0 %define xt_sover 7 Summary: IP Packet Filter Administration - #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/ +Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: sgmltool @@ -40,7 +37,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 From bc609749a2dfee9a4ae08d3f5e02d89c19297d5770341971ea4691caeb8a2cb4 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Wed, 28 Dec 2011 10:12:23 +0000 Subject: [PATCH 2/2] - iptables-apply-mktemp-fix.patch (bnc#730161) OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=38 --- iptables-apply-mktemp-fix.patch | 22 ++++++++++++++++++++++ iptables.changes | 5 +++++ iptables.spec | 6 ++++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 iptables-apply-mktemp-fix.patch diff --git a/iptables-apply-mktemp-fix.patch b/iptables-apply-mktemp-fix.patch new file mode 100644 index 0000000..b1215d1 --- /dev/null +++ b/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 diff --git a/iptables.changes b/iptables.changes index b2bae13..8bca555 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/iptables.spec b/iptables.spec index 88d5b74..982b770 100644 --- a/iptables.spec +++ b/iptables.spec @@ -16,17 +16,18 @@ # Name: iptables -License: GPL-2.0+ -Group: Productivity/Networking/Security Version: 1.4.12.1+16 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 +Patch2: iptables-apply-mktemp-fix.patch Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -75,6 +76,7 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif %patch -P 1 -p1 +%patch2 -p1 %build if [ ! -e configure ]; then