SHA256
1
0
forked from pool/iptables

Accepting request 34217 from security:netfilter

Copy from security:netfilter/iptables based on submit request 34217 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=20
This commit is contained in:
OBS User autobuild 2010-03-07 09:56:32 +00:00 committed by Git OBS Bridge
parent 703b9ea46c
commit b7f2dc18cd
5 changed files with 31 additions and 19 deletions

View File

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

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

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

View File

@ -3,18 +3,18 @@
iptables-batch.c | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ iptables-batch.c | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 478 insertions(+), 2 deletions(-) 2 files changed, 478 insertions(+), 2 deletions(-)
Index: Makefile.am Index: iptables-1.4.7/Makefile.am
=================================================================== ===================================================================
--- Makefile.am.orig --- iptables-1.4.7.orig/Makefile.am
+++ Makefile.am +++ iptables-1.4.7/Makefile.am
@@ -54,6 +54,14 @@ endif @@ -54,6 +54,14 @@ endif
ip6tables_multi_LDFLAGS = -rdynamic ip6tables_multi_LDFLAGS = -rdynamic
ip6tables_multi_LDADD = libiptc/libip6tc.la extensions/libext6.a libxtables.la -lm ip6tables_multi_LDADD = libiptc/libip6tc.la extensions/libext6.a libxtables.la -lm
+iptables_batch_SOURCES = iptables-batch.c iptables.c xtables.c xshared.c +iptables_batch_SOURCES = iptables-batch.c iptables.c xshared.c
+iptables_batch_LDFLAGS = ${iptables_multi_LDFLAGS} +iptables_batch_LDFLAGS = ${iptables_multi_LDFLAGS}
+iptables_batch_LDADD = ${iptables_multi_LDADD} +iptables_batch_LDADD = ${iptables_multi_LDADD}
+ip6tables_batch_SOURCES = iptables-batch.c ip6tables.c xtables.c xshared.c +ip6tables_batch_SOURCES = iptables-batch.c ip6tables.c xshared.c
+ip6tables_batch_CFLAGS = ${AM_CFLAGS} -DIP6T +ip6tables_batch_CFLAGS = ${AM_CFLAGS} -DIP6T
+ip6tables_batch_LDFLAGS = ${ip6tables_multi_LDFLAGS} +ip6tables_batch_LDFLAGS = ${ip6tables_multi_LDFLAGS}
+ip6tables_batch_LDADD = ${ip6tables_multi_LDADD} +ip6tables_batch_LDADD = ${ip6tables_multi_LDADD}
@ -37,10 +37,10 @@ Index: Makefile.am
v6_sbin_links = ip6tables ip6tables-restore ip6tables-save v6_sbin_links = ip6tables ip6tables-restore ip6tables-save
endif endif
Index: iptables-batch.c Index: iptables-1.4.7/iptables-batch.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ iptables-batch.c +++ iptables-1.4.7/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,13 @@
-------------------------------------------------------------------
Mon Mar 1 15:43:30 UTC 2010 - jengelh@medozas.de
- update to new upstream release 1.4.7
* libipq is built as a shared library
* removal of some restrictions on interface names
* documentation updates
- rebase and fix linking of iptables-batch
- fix libdir->libexecdir
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 22 13:09:03 UTC 2010 - jengelh@medozas.de Mon Feb 22 13:09:03 UTC 2010 - jengelh@medozas.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package iptables (Version 1.4.6+git9) # spec file for package iptables (Version 1.4.7)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -21,14 +21,17 @@
Name: iptables Name: iptables
License: GPLv2+ License: GPLv2+
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Version: 1.4.6+git9 Version: 1.4.7
Release: 1 Release: 1
Summary: IP Packet Filter Administration Summary: IP Packet Filter Administration
Source0: %{name}-%{version}.tar.bz2
#Git-Web: http://git.netfilter.org/
#Git-Clone: git://git.netfilter.org/iptables
Source: http://netfilter.org/projects/iptables/files/iptables-1.4.7.tar.bz2
Patch0: %{name}-batch.patch Patch0: %{name}-batch.patch
Url: http://netfilter.org/ Url: http://netfilter.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: linux-kernel-headers sgmltool BuildRequires: sgmltool
%description %description
Iptables is used to set up, maintain, and inspect the tables of IP Iptables is used to set up, maintain, and inspect the tables of IP
@ -59,7 +62,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 %patch -P 0 -p1
%build %build
if [ ! -e configure ]; then if [ ! -e configure ]; then
@ -68,8 +71,7 @@ fi
# bnc#561793 - do not include unclean module in iptables manpage # bnc#561793 - do not include unclean module in iptables manpage
rm -rf extensions/libipt_unclean.man rm -rf extensions/libipt_unclean.man
%configure \ %configure \
--enable-libipq \ --enable-libipq
--libexecdir=%{_libdir}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -93,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/iptables* %{_bindir}/iptables*
%{_sbindir}/iptables* %{_sbindir}/iptables*
%{_sbindir}/ip6tables* %{_sbindir}/ip6tables*
%dir %{_libdir}/xtables %dir %{_libexecdir}/xtables
%{_libdir}/xtables/* %{_libexecdir}/xtables/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel