From 9d5f1c2833a40708c2b369c82df4863f0a81a4bcb534b25e827a2c3b46207959 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 15 May 2009 21:48:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=11 --- iptables-batch.patch | 12 +++++++----- iptables.changes | 5 +++++ iptables.spec | 4 +++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/iptables-batch.patch b/iptables-batch.patch index daaca75..d597c43 100644 --- a/iptables-batch.patch +++ b/iptables-batch.patch @@ -1,7 +1,7 @@ Index: Makefile.am =================================================================== --- Makefile.am.orig 2009-04-06 13:09:17.000000000 +0200 -+++ Makefile.am 2009-04-20 14:34:45.000000000 +0200 ++++ Makefile.am 2009-05-11 17:05:23.000000000 +0200 @@ -44,6 +44,11 @@ iptables_save_SOURCES = iptables-sav iptables_save_LDFLAGS = ${iptables_LDFLAGS} iptables_save_LDADD = ${iptables_LDADD} @@ -42,8 +42,8 @@ Index: Makefile.am Index: iptables-batch.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ iptables-batch.c 2009-04-21 14:02:54.000000000 +0200 -@@ -0,0 +1,466 @@ ++++ iptables-batch.c 2009-05-11 17:07:58.000000000 +0200 +@@ -0,0 +1,468 @@ +/* + * Author: Ludwig Nussel + * Update for iptables 1.4.3.x: Petr Uzel @@ -499,8 +499,7 @@ Index: iptables-batch.c + } + else if(!strcmp(nargv[0], "commit")) + { -+ ret = do_commit(); -+ if(!ret) break; ++ /* do nothing - see bnc#500990, comment #16 */ + } + else + { @@ -508,5 +507,8 @@ Index: iptables-batch.c + } + } + ++ if(ret) ++ ret = do_commit(); ++ + exit(!ret); +} diff --git a/iptables.changes b/iptables.changes index 8424a70..b6e5db0 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 11 17:12:57 CEST 2009 - puzel@suse.cz + +- make explicit 'commit' in iptables-batch do nothing (bnc#500990) + ------------------------------------------------------------------- Tue Apr 21 14:15:16 CEST 2009 - puzel@suse.cz diff --git a/iptables.spec b/iptables.spec index 415a5fd..da9bc9b 100644 --- a/iptables.spec +++ b/iptables.spec @@ -22,7 +22,7 @@ Name: iptables License: GPL v2 or later Group: Productivity/Networking/Security Version: 1.4.3.2 -Release: 1 +Release: 2 Summary: IP Packet Filter Administration Source0: %{name}-%{version}.tar.bz2 # http://netfilter.org/documentation/index.html#documentation-howto @@ -105,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libiptc.pc %changelog +* Mon May 11 2009 puzel@suse.cz +- make explicit 'commit' in iptables-batch do nothing (bnc#500990) * Tue Apr 21 2009 puzel@suse.cz - update to 1.4.3.2 - numerous documentation updates and bugfixes