1
0
forked from jengelh/iptables

Update to v1.4.12.1-16-gd2b0eaa

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=34
This commit is contained in:
Jan Engelhardt 2011-10-04 23:16:05 +00:00 committed by Git OBS Bridge
parent 1ce4f12eda
commit 6fff193e2b
5 changed files with 23 additions and 17 deletions

View File

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

View File

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

View File

@ -3,13 +3,13 @@
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/iptables/Makefile.am Index: iptables-1.4.12.1+16/iptables/Makefile.am
=================================================================== ===================================================================
--- iptables.orig/iptables/Makefile.am --- iptables-1.4.12.1+16.orig/iptables/Makefile.am
+++ iptables/iptables/Makefile.am +++ iptables-1.4.12.1+16/iptables/Makefile.am
@@ -36,7 +36,15 @@ endif @@ -24,7 +24,15 @@ endif
xtables_multi_SOURCES += xshared.c xtables_multi_SOURCES += xshared.c
xtables_multi_LDADD += libxtables.la -lm xtables_multi_LDADD += ../libxtables/libxtables.la -lm
-sbin_PROGRAMS = xtables-multi -sbin_PROGRAMS = xtables-multi
+iptables_batch_SOURCES = iptables-batch.c iptables.c xshared.c +iptables_batch_SOURCES = iptables-batch.c iptables.c xshared.c
@ -24,10 +24,10 @@ Index: iptables/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 ip6tables-save.8
Index: iptables/iptables/iptables-batch.c Index: iptables-1.4.12.1+16/iptables/iptables-batch.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ iptables/iptables/iptables-batch.c +++ iptables-1.4.12.1+16/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>

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Oct 4 23:01:57 UTC 2011 - jengelh@medozas.de
- Update to a newer git snapshot of the stable branch
(to v1.4.12.1-16-gd2b0eaa)
* resolve failure to load extensions that depend on libm.so
- rediff of iptables-batch due to fuzz
- relax runtime requires
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 1 17:09:05 UTC 2011 - jengelh@medozas.de Thu Sep 1 17:09:05 UTC 2011 - jengelh@medozas.de

View File

@ -15,13 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: iptables Name: iptables
License: GPLv2+ License: GPLv2+
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Version: 1.4.12.1 Version: 1.4.12.1+16
Release: 1 Release: 1
%define xt_sover 7 %define xt_sover 7
Summary: IP Packet Filter Administration Summary: IP Packet Filter Administration
@ -31,7 +30,7 @@ Summary: IP Packet Filter Administration
#Git-Clone: git://git.netfilter.org/iptables #Git-Clone: git://git.netfilter.org/iptables
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: iptables-batch.patch Patch1: iptables-batch.patch
Url: http://netfilter.org/ URL: http://netfilter.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: sgmltool BuildRequires: sgmltool
@ -49,11 +48,10 @@ packet filter rules in the Linux kernel. This version requires kernel
2.4.0 or newer. 2.4.0 or newer.
%package devel %package devel
Summary: Libraries, Headers and Development Man Pages for iptables Summary: Libraries, Headers and Development Man Pages for iptables
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %name = %version-%release Requires: %name = %version
Requires: libxtables%xt_sover = %version-%release Requires: libxtables%xt_sover = %version
%description devel %description devel
These libraries are needed to compile These libraries are needed to compile
@ -61,7 +59,6 @@ These libraries are needed to compile
- programs using libipq - programs using libipq
%package -n libxtables%xt_sover %package -n libxtables%xt_sover
Summary: Library for functions shared between iptables Summary: Library for functions shared between iptables
Group: System/Libraries Group: System/Libraries