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

Accepting request 202575 from security:netfilter

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/202575
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=53
This commit is contained in:
Tomáš Chvátal 2013-10-08 08:52:00 +00:00 committed by Git OBS Bridge
commit 24bdc4d6b3
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iptables-1.4.19.1.tar.bz2
View File

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

BIN
iptables-1.4.19.1.tar.bz2.sig
View File

Binary file not shown.

3
iptables-1.4.20.tar.bz2 Normal file
View File

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

BIN
iptables-1.4.20.tar.bz2.sig Normal file
View File

Binary file not shown.

14
iptables-batch.patch
View File

@ -3,10 +3,10 @@
iptables/iptables-batch.c | 468 ++++++++++++++++++++++++++++++++++++++++++++++ iptables/iptables-batch.c | 468 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 477 insertions(+), 1 deletion(-) 2 files changed, 477 insertions(+), 1 deletion(-)
Index: iptables-1.4.16.2/iptables/Makefile.am Index: iptables-1.4.20/iptables/Makefile.am
=================================================================== ===================================================================
--- iptables-1.4.16.2.orig/iptables/Makefile.am --- iptables-1.4.20.orig/iptables/Makefile.am
+++ iptables-1.4.16.2/iptables/Makefile.am +++ iptables-1.4.20/iptables/Makefile.am
@@ -24,7 +24,15 @@ endif @@ -24,7 +24,15 @@ endif
xtables_multi_SOURCES += xshared.c xtables_multi_SOURCES += xshared.c
xtables_multi_LDADD += ../libxtables/libxtables.la -lm xtables_multi_LDADD += ../libxtables/libxtables.la -lm
@ -24,10 +24,10 @@ Index: iptables-1.4.16.2/iptables/Makefile.am
man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
iptables-xml.1 ip6tables.8 ip6tables-restore.8 \ iptables-xml.1 ip6tables.8 ip6tables-restore.8 \
ip6tables-save.8 iptables-extensions.8 ip6tables-save.8 iptables-extensions.8
Index: iptables-1.4.16.2/iptables/iptables-batch.c Index: iptables-1.4.20/iptables/iptables-batch.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ iptables-1.4.16.2/iptables/iptables-batch.c +++ iptables-1.4.20/iptables/iptables-batch.c
@@ -0,0 +1,468 @@ @@ -0,0 +1,468 @@
+/* +/*
+ * Author: Ludwig Nussel <ludwig.nussel@suse.de> + * Author: Ludwig Nussel <ludwig.nussel@suse.de>
@ -296,7 +296,7 @@ Index: iptables-1.4.16.2/iptables/iptables-batch.c
+ return 0; + return 0;
+ +
+#ifdef IP6T +#ifdef IP6T
+ ret = do_command6(argc, argv, &table, &current_table->handle); + ret = do_command6(argc, argv, &table, &current_table->handle, true);
+ +
+ if (!ret) + if (!ret)
+ { + {
@ -312,7 +312,7 @@ Index: iptables-1.4.16.2/iptables/iptables-batch.c
+ } + }
+ } + }
+#else +#else
+ ret = do_command4(argc, argv, &table, &current_table->handle); + ret = do_command4(argc, argv, &table, &current_table->handle, true);
+ +
+ if (!ret) + if (!ret)
+ { + {

7
iptables.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 7 13:19:02 UTC 2013 - jengelh@inai.de
- Update to new upstream release 1.4.20
* Introduce a new revision for the set match with the counters support
* Add locking to prevent concurrent instances
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 20:00:39 UTC 2013 - jengelh@inai.de Fri May 31 20:00:39 UTC 2013 - jengelh@inai.de

14
iptables.spec
View File

@ -20,7 +20,7 @@ Name: iptables
%define lname_ipq libipq0 %define lname_ipq libipq0
%define lname_iptc libiptc0 %define lname_iptc libiptc0
%define lname_xt libxtables10 %define lname_xt libxtables10
Version: 1.4.19.1 Version: 1.4.20
Release: 0 Release: 0
Summary: IP Packet Filter Administration utilities Summary: IP Packet Filter Administration utilities
License: GPL-2.0 and Artistic-2.0 License: GPL-2.0 and Artistic-2.0
@ -54,12 +54,11 @@ BuildRequires: fdupes
BuildRequires: gpg-offline BuildRequires: gpg-offline
%endif %endif
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4
BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1110 %if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version}
BuildRequires: libnfnetlink-devel >= 1.0.0 BuildRequires: libnetfilter_conntrack >= 1.0.4
%endif
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
BuildRequires: libnfnetlink-devel >= 1.0.0 BuildRequires: libnfnetlink-devel >= 1.0.0
%endif %endif
Requires: xtables-plugins = %version Requires: xtables-plugins = %version
@ -170,9 +169,6 @@ rm -f "%buildroot/%_libdir"/*.la;
%fdupes %buildroot/%_prefix %fdupes %buildroot/%_prefix
%endif %endif
%clean
:
%post -n %lname_ipq -p /sbin/ldconfig %post -n %lname_ipq -p /sbin/ldconfig
%postun -n %lname_ipq -p /sbin/ldconfig %postun -n %lname_ipq -p /sbin/ldconfig
%post -n %lname_iptc -p /sbin/ldconfig %post -n %lname_iptc -p /sbin/ldconfig
@ -199,8 +195,6 @@ rm -f "%buildroot/%_libdir"/*.la;
%files -n xtables-plugins %files -n xtables-plugins
%defattr(-,root,root) %defattr(-,root,root)
%dir %_sysconfdir/xtables/
%config %_sysconfdir/xtables/*.conf
%_libdir/xtables/ %_libdir/xtables/
%_sbindir/nfnl_osf %_sbindir/nfnl_osf
%_datadir/xtables/ %_datadir/xtables/