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

iptables-1.4.2-rc1.tar.bz2

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

iptables-1.4.2.tar.bz2

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

iptables-batch.patch

@@ -18,8 +18,8 @@
  
 +ip6tables_batch_SOURCES   = iptables-batch.c ip6tables.c xtables.c
 +ip6tables_batch_CFLAGS    = ${AM_CFLAGS} -DIP6T
-+ip6tables_batch_LDFLAGS   = ${iptables_LDFLAGS}
++ip6tables_batch_LDFLAGS   = ${ip6tables_LDFLAGS}
-+ip6tables_batch_LDADD     = ${iptables_LDADD}
++ip6tables_batch_LDADD     = ${ip6tables_LDADD}
 +
  # iptables-multi, semi-static
  ip6tables_static_SOURCES    = ${ip6tables_multi_SOURCES}
@@ -77,12 +77,12 @@
 +#include <errno.h>
 +#include <string.h>
 +
-+#include <xtables.h>
 +#ifdef IP6T
 +#include <ip6tables.h>
 +#else
 +#include <iptables.h>
 +#endif
++#include <xtables.h>
 +
 +static char* errstr = NULL;
 +
@@ -174,9 +174,9 @@
 +
 +// destructive
 +static int
-+tokenize(int* argc, char* argv[], size_t nargvsize, char* line)
++tokenize(int* argc, char* argv[], size_t nargvsize, char* iline)
 +{
-+	char* ptr = skipspace(line);
++	char* ptr = skipspace(iline);
 +	int ret = 0;
 +	char* word;
 +
@@ -377,7 +377,7 @@
 +	int ret = 1;
 +	int numtok;
 +	size_t llen = 0;
-+	char* line = NULL;
++	char* iline = NULL;
 +	ssize_t r = -1;
 +	int nargc = 0;
 +	char* nargv[256];
@@ -425,17 +425,17 @@
 +	tables[3].handle = NULL;
 +	current_table = &tables[0];
 +
-+	while((r = getline(&line, &llen, fp)) != -1)
++	while((r = getline(&iline, &llen, fp)) != -1)
 +	{
-+		if(llen < 1 || !*line)
++		if(llen < 1 || !*iline)
 +			continue;
-+		if(line[strlen(line)-1] == '\n')
++		if(iline[strlen(iline)-1] == '\n')
-+			line[strlen(line) -1 ] = '\0';
++			iline[strlen(iline) -1 ] = '\0';
 +
 +		++current_line;
 +		nargc = 0;
 +		errstr = NULL;
-+		numtok = tokenize(&nargc, nargv, (sizeof(nargv)/sizeof(nargv[0])), line);
++		numtok = tokenize(&nargc, nargv, (sizeof(nargv)/sizeof(nargv[0])), iline);
 +		if(numtok == -1)
 +		{
 +		}

iptables.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jan 16 14:57:14 CET 2009 - prusnak@suse.cz
+
+- updated to 1.4.2
+  * remove dependency on libiptc headers
+  * fix segmentation fault with -tanything
+  * warn about use of DROP in nat table
+  * do allow --rttl for --update
+  * run ldconfig on `make install`
+  * fix invalid iptables-save output
+  * fix hashlimit output
+
 -------------------------------------------------------------------
 Wed Sep 10 13:36:30 CEST 2008 - prusnak@suse.cz
 

iptables.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package iptables (Version 1.4.1.91)
+# spec file for package iptables (Version 1.4.2)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,15 @@
 
 # norootforbuild
 
-%define real_ver 1.4.2-rc1
 
 Name:           iptables
 License:        GPL v2 or later
 Group:          Productivity/Networking/Security
-AutoReqProv:    on
+Version:        1.4.2
-Version:        1.4.1.91
 Release:        1
 Summary:        IP Packet Filter Administration
-Source0:        %{name}-%{real_ver}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
-Source1:        %{name}-%{real_ver}-debian-howtos.tar.bz2
+Source1:        %{name}-%{version}-debian-howtos.tar.bz2
 Patch0:         %{name}-batch.patch
 Url:            http://www.iptables.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -61,7 +59,7 @@ Authors:
     Netfilter Core Team <netfilter-core@linuxcare.com.au>
 
 %prep
-%setup -q -a 1 -n %{name}-%{real_ver}
+%setup -q -a 1
 %patch0
 
 %build
@@ -75,11 +73,15 @@ make
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-# install -m755 iptables-batch ip6tables-batch $RPM_BUILD_ROOT%{_sbindir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxtables.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING INCOMPATIBILITIES howtos/*.html
@@ -89,14 +91,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ip6tables*
 %dir %{_libdir}/xtables
 %{_libdir}/xtables/*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc %{_mandir}/man3/*
-%{_libdir}/*.a
 %{_includedir}/*
+%{_libdir}/*.a
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Fri Jan 16 2009 prusnak@suse.cz
+- updated to 1.4.2
+  * remove dependency on libiptc headers
+  * fix segmentation fault with -tanything
+  * warn about use of DROP in nat table
+  * do allow --rttl for --update
+  * run ldconfig on `make install`
+  * fix invalid iptables-save output
+  * fix hashlimit output
 * Wed Sep 10 2008 prusnak@suse.cz
 - updated to 1.4.2-rc1
   * libxt_TOS: make sure --set-tos value/mask is recognized
@@ -341,7 +355,7 @@ rm -rf $RPM_BUILD_ROOT
   .spec file to compile and install ip(6)tables-save/restore apps.
 * Fri Apr 06 2001 kukuk@suse.de
 - changed neededforbuild from lx_suse to kernel-source
-* Wed Mar 28 2001 lmuelle@suse.de
+* Tue Mar 27 2001 lmuelle@suse.de
 - update to 1.2.1a
 - add devel package with libipq stuff
 - minor spec file cleanup