Merge branch '4.5.2' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.5.2

Conflicts: Shorewall-core/lib.cli Signed-off-by: Tom Eastep <teastep@shorewall.net>
Allow TC experts to SAVE/RESTORE all parts of the packet mark
2012-04-23 14:14:43 -07:00 · 2012-04-23 09:00:32 -07:00 · 2012-04-21 17:51:06 -07:00 · 2012-04-21 09:52:01 -07:00 · 2012-04-20 09:46:47 -07:00 · 2012-04-17 06:57:59 -07:00
7 changed files with 11 additions and 8 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -457,7 +457,9 @@ sort_routes() {
 }

 #
-# Isolate the table in the routing rules being read from stdin
+# Isolate the table in the routing rules being read from stdin.
+# Piping through sed to remove trailing whitespace works around
+# recent 'features' in dash and ip.
 #
 find_tables() {
    sed -r 's/[[:space:]]+$//' | while read rule; do
--- a/Shorewall-core/shorewallrc.debian
+++ b/Shorewall-core/shorewallrc.debian
@@ -9,7 +9,7 @@ LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
 PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
 CONFDIR=/etc                            #Directory where subsystem configurations are installed
 SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/man                    #Directory where manpages are installed.
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
 INITDIR=/etc/init.d                     #Directory where SysV init scripts are installed.
 INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
 INITSOURCE=init.debian.sh               #Name of the distributed file to be installed as the SysV init script
--- a/Shorewall/Macros/macro.Amanda
+++ b/Shorewall/Macros/macro.Amanda
@@ -11,6 +11,7 @@
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
 #				PORT(S)	PORT(S)	LIMIT	GROUP
 PARAM	-	-	udp	10080
+PARAM	-	-	tcp	10080
 #
 # You may also need this rule.  With AMANDA 2.4.4 on Linux kernel 2.6,
 # it should not be necessary to use this.  The ip_conntrack_amanda
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -1959,13 +1959,13 @@ sub setup_tc() {
    if ( $config{TC_ENABLED} ) {
 	our  @tccmd = ( { match     => sub ( $ ) { $_[0] eq 'SAVE' } ,
 			  target    => 'CONNMARK --save-mark --mask' ,
-			  mark      => SMALLMARK ,
+			  mark      => $config{TC_EXPERT} ? HIGHMARK : SMALLMARK,
 			  mask      => in_hex( $globals{TC_MASK} ) ,
 			  connmark  => 1
 			} ,
 			{ match     => sub ( $ ) { $_[0] eq 'RESTORE' },
 			  target    => 'CONNMARK --restore-mark --mask' ,
-			  mark      => SMALLMARK ,
+			  mark      => $config{TC_EXPERT} ? HIGHMARK : SMALLMARK ,
 			  mask      => in_hex( $globals{TC_MASK} ) ,
 			  connmark  => 1
 			} ,
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1072,13 +1072,13 @@ cd manpages
 [ -n "$INSTALLD" ] || mkdir -p ${DESTDIR}${MANDIR}/man5/ ${DESTDIR}${MANDIR}/man8/

 for f in *.5; do
-    gzip -c $f > $f.gz
+    gzip -9c $f > $f.gz
    run_install $INSTALLD  -m 0644 $f.gz ${DESTDIR}${MANDIR}/man5/$f.gz
    echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man5/$f.gz"
 done

 for f in *.8; do
-    gzip -c $f > $f.gz
+    gzip -9c $f > $f.gz
    run_install $INSTALLD  -m 0644 $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz
    echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man8/$f.gz"
 done
--- a/Shorewall/manpages/shorewall-tcrules.xml
+++ b/Shorewall/manpages/shorewall-tcrules.xml
@@ -569,7 +569,7 @@ Normal-Service       =&gt; 0x00</programlisting>
                  <term>T</term>

                  <listitem>
-                    <para>POSTROUTING chain (default).</para>
+                    <para>POSTROUTING chain.</para>
                  </listitem>
                </varlistentry>
              </variablelist>
--- a/Shorewall6/manpages/shorewall6-tcrules.xml
+++ b/Shorewall6/manpages/shorewall6-tcrules.xml
@@ -416,7 +416,7 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
                  <term>T</term>

                  <listitem>
-                    <para>POSTROUTING chain (default).</para>
+                    <para>POSTROUTING chain.</para>
                  </listitem>
                </varlistentry>
              </variablelist>
Author	SHA1	Message	Date
Tom Eastep	f0afb3b3bb	Merge branch '4.5.2' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.5.2 Conflicts: Shorewall-core/lib.cli Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-23 14:14:43 -07:00
Tom Eastep	7737d844da	Allow TC experts to SAVE/RESTORE all parts of the packet mark Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-23 09:00:32 -07:00
Tom Eastep	c82ebe840d	Patch from Roberto Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-21 17:51:06 -07:00
Tom Eastep	2570fcca2c	Corret tcrules manpages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-21 09:52:01 -07:00
Tom Eastep	e0c9a15f13	Add TCP to macro.Amanda Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-20 09:46:47 -07:00
Tom Eastep	8183bac615	Add a comment about 'find_tables()' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-17 06:57:59 -07:00
Tom Eastep	caf60e6c1f	Make 'show routing work with iproute 20111117 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-16 08:21:26 -07:00