jengelh/iptables
SHA256
1
0
Fork 1
forked from pool/iptables
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2009-05-15 21:48:01 +00:00 committed by Git OBS Bridge
parent 6ef094a568
commit 9d5f1c2833
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iptables-batch.patch
View File

@ -1,7 +1,7 @@
Index: Makefile.am Index: Makefile.am
=================================================================== ===================================================================
--- Makefile.am.orig 2009-04-06 13:09:17.000000000 +0200 --- 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 @@ -44,6 +44,11 @@ iptables_save_SOURCES = iptables-sav
iptables_save_LDFLAGS = ${iptables_LDFLAGS} iptables_save_LDFLAGS = ${iptables_LDFLAGS}
iptables_save_LDADD = ${iptables_LDADD} iptables_save_LDADD = ${iptables_LDADD}
@ -42,8 +42,8 @@ Index: Makefile.am
Index: iptables-batch.c Index: iptables-batch.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ iptables-batch.c 2009-04-21 14:02:54.000000000 +0200 +++ iptables-batch.c 2009-05-11 17:07:58.000000000 +0200
@@ -0,0 +1,466 @@ @@ -0,0 +1,468 @@
+/* +/*
+ * Author: Ludwig Nussel <ludwig.nussel@suse.de> + * Author: Ludwig Nussel <ludwig.nussel@suse.de>
+ * Update for iptables 1.4.3.x: Petr Uzel <petr.uzel@suse.cz> + * Update for iptables 1.4.3.x: Petr Uzel <petr.uzel@suse.cz>
@ -499,8 +499,7 @@ Index: iptables-batch.c
+ } + }
+ else if(!strcmp(nargv[0], "commit")) + else if(!strcmp(nargv[0], "commit"))
+ { + {
+ ret = do_commit(); + /* do nothing - see bnc#500990, comment #16 */
+ if(!ret) break;
+ } + }
+ else + else
+ { + {
@ -508,5 +507,8 @@ Index: iptables-batch.c
+ } + }
+ } + }
+ +
+ if(ret)
+ ret = do_commit();
+
+ exit(!ret); + exit(!ret);
+} +}

5
iptables.changes
View File

@ -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 Tue Apr 21 14:15:16 CEST 2009 - puzel@suse.cz

4
iptables.spec
View File

@ -22,7 +22,7 @@ Name: iptables
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Version: 1.4.3.2 Version: 1.4.3.2
Release: 1 Release: 2
Summary: IP Packet Filter Administration Summary: IP Packet Filter Administration
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
# http://netfilter.org/documentation/index.html#documentation-howto # http://netfilter.org/documentation/index.html#documentation-howto
@ -105,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libiptc.pc %{_libdir}/pkgconfig/libiptc.pc
%changelog %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 * Tue Apr 21 2009 puzel@suse.cz
- update to 1.4.3.2 - update to 1.4.3.2
- numerous documentation updates and bugfixes - numerous documentation updates and bugfixes