rpms/iptables/devel iptables-1.3.4-status.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 iptables-1.3.0-cleanup.patch, 1.1, 1.2 iptables.spec, 1.32, 1.33 sources, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 18 12:26:18 UTC 2005
Author: twoerner
Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29756
Modified Files:
.cvsignore iptables-1.3.0-cleanup.patch iptables.spec sources
Added Files:
iptables-1.3.4-status.patch
Log Message:
[tw]
- new version 1.3.4
- dropped free_opts patch (upstream fixed)
- made libipq PIC (#158623)
- additional configuration options for iptables startup script (#172929)
Thanks to Jan Gruenwald for the patch
- spec file cleanup (dropped linux_header define and usage)
iptables-1.3.4-status.patch:
rc.d/init.d/iptables | 13 ++++++++++---
sysconfig/iptables-config | 10 ++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
--- NEW FILE iptables-1.3.4-status.patch ---
--- /etc/sysconfig/iptables-config.jgorig 2005-09-19 12:30:35.485936848 +0200
+++ /etc/sysconfig/iptables-config 2005-09-19 13:27:44.427658472 +0200
@@ -36,3 +36,13 @@
# Print IP addresses and port numbers in numeric format in the status output.
IPTABLES_STATUS_NUMERIC="yes"
+# Verbose status output
+# Value: yes|no, default: yes
+# Print info about the number of packets and bytes plus the "input-" and
+# "outputdevice" in the status output.
+IPTABLES_STATUS_VERBOSE="no"
+
+# Status output with numbered lines
+# Value: yes|no, default: yes
+# Print a counter/number for every rule in the status output.
+IPTABLES_STATUS_LINENUMBERS="yes"
--- /etc/rc.d/init.d/iptables.jgorig 2005-09-19 12:30:04.959577560 +0200
+++ /etc/rc.d/init.d/iptables 2005-09-19 13:27:17.368772048 +0200
@@ -244,10 +244,13 @@
}
status() {
+
+ tables=`cat $PROC_IPTABLES_NAMES 2>/dev/null`
+
# Do not print status if lockfile is missing and iptables modules are not
# loaded.
# Check if iptable module is loaded
- if [ ! -f "$VAR_SUBSYS_IPTABLES" ]; then
+ if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z $tables ]; then
echo $"Firewall is stopped."
return 1
fi
@@ -257,7 +260,6 @@
echo $"Firewall is not configured. "
return 1
fi
- tables=`cat $PROC_IPTABLES_NAMES 2>/dev/null`
if [ -z "$tables" ]; then
echo $"Firewall is not configured. "
return 1
@@ -265,10 +267,15 @@
NUM=
[ "x$IPTABLES_STATUS_NUMERIC" = "xyes" ] && NUM="-n"
+ VERBOSE=
+ [ "x$IPTABLES_STATUS_VERBOSE" = "xyes" ] && VERBOSE="--verbose"
+ COUNT=
+ [ "x$IPTABLES_STATUS_LINENUMBERS" = "xyes" ] && COUNT="--line-numbers"
+
for table in $tables; do
echo $"Table: $table"
- $IPTABLES -t $table --list $NUM && echo
+ $IPTABLES -t $table --list $NUM $VERBOSE $COUNT && echo
done
return 0
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 18 Jul 2005 12:16:48 -0000 1.16
+++ .cvsignore 18 Nov 2005 12:26:15 -0000 1.17
@@ -2,3 +2,4 @@
iptables-1.3.0.tar.bz2
iptables-1.3.1.tar.bz2
iptables-1.3.2.tar.bz2
+iptables-1.3.4.tar.bz2
iptables-1.3.0-cleanup.patch:
libipt_REJECT.c | 20 +++++++++++++-------
libipt_rpc.c | 6 +++---
2 files changed, 16 insertions(+), 10 deletions(-)
Index: iptables-1.3.0-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables-1.3.0-cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptables-1.3.0-cleanup.patch 18 Mar 2005 16:45:13 -0000 1.1
+++ iptables-1.3.0-cleanup.patch 18 Nov 2005 12:26:15 -0000 1.2
@@ -1,3 +1,23 @@
+--- iptables-1.3.0/extensions/libipt_rpc.c.cleanup 2005-11-09 16:37:34.000000000 +0100
++++ iptables-1.3.0/extensions/libipt_rpc.c 2005-11-09 16:37:38.000000000 +0100
+@@ -205,7 +205,7 @@
+
+ memset(buf, 0, sizeof(buf));
+
+- for (src=string, dst=buf; term != 1 ; src++, dst++) {
++ for (src=string, dst=buf; term != 1 ; src++) {
+
+ if ( *src != ',' && *src != '\0' ) {
+ if ( ( *src >= 65 && *src <= 90 ) || ( *src >= 97 && *src <= 122) ) {
+@@ -220,7 +220,7 @@
+ string, src - string + 1);
+
+ }
+-
++ dst++;
+ } else {
+ *dst = '\0';
+ if ( idup == 1 ) {
--- iptables-1.3.0/extensions/libipt_rpc.c.cleanup 2005-03-18 16:25:34.174370567 +0100
+++ iptables-1.3.0/extensions/libipt_rpc.c 2005-03-18 16:25:32.000000000 +0100
@@ -252,7 +252,7 @@
Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iptables.spec 18 Jul 2005 12:16:48 -0000 1.32
+++ iptables.spec 18 Nov 2005 12:26:15 -0000 1.33
@@ -1,16 +1,12 @@
%define build_devel 1
-%define linux_header 0
Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.3.2
+Version: 1.3.4
Release: 1
Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
Source1: iptables.init
Source2: iptables-config
-%if %{linux_header}
-Source3: netfilter-2.4.20.tar.gz
-%endif
Patch2: iptables-1.2.8-nolibnsl.patch
Patch4: iptables-1.2.9-netlink.patch
Patch5: iptables-1.3.0-selinux.patch
@@ -18,7 +14,7 @@
Patch8: iptables-1.3.0-cleanup.patch
Patch9: iptables-1.3.0-autoload.patch
Patch10: iptables-1.3.0-no_root.patch
-Patch11: iptables-1.3.2-free_opts.patch
+Patch11: iptables-1.3.4-status.patch
Group: System Environment/Base
URL: http://www.netfilter.org/
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -65,11 +61,6 @@
rm -rf %{buildroot}
%setup -q
-%if %{linux_header}
-cd include
-tar -zxf %{SOURCE3}
-cd ..
-%endif
%patch2 -p1 -b .nolibnsl
%patch4 -p1 -b .netlink
%patch5 -p1 -b .selinux
@@ -77,14 +68,14 @@
%patch8 -p1 -b .cleanup
%patch9 -p1 -b .autoload
%patch10 -p1 -b .no_root
-%patch11 -p1 -b .free_opts
+%patch11 -p1 -b .status
# Put it to a reasonable place
find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \;
%build
TOPDIR=`pwd`
-OPT="$RPM_OPT_FLAGS -I$TOPDIR/include"
+OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC"
make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib}
make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} iptables-save iptables-restore
make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} ip6tables-save ip6tables-restore
@@ -152,6 +143,14 @@
%endif
%changelog
+* Fri Nov 18 2005 Thomas Woerner <twoerner at redhat.com> 1.3.4-1
+- new version 1.3.4
+- dropped free_opts patch (upstream fixed)
+- made libipq PIC (#158623)
+- additional configuration options for iptables startup script (#172929)
+ Thanks to Jan Gruenwald for the patch
+- spec file cleanup (dropped linux_header define and usage)
+
* Mon Jul 18 2005 Thomas Woerner <twoerner at redhat.com> 1.3.2-1
- new version 1.3.2 with additional patch for the misplaced free_opts call
from Marcus Sundberg
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 18 Jul 2005 12:16:48 -0000 1.16
+++ sources 18 Nov 2005 12:26:15 -0000 1.17
@@ -1 +1 @@
-9a951971de3f6c7f60dece4023a48687 iptables-1.3.2.tar.bz2
+fdff8abe890807968226b0c374335305 iptables-1.3.4.tar.bz2
More information about the fedora-cvs-commits
mailing list