From 7c10e2837d692a2e272b2ebe036eb322fe1f45c7 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 10 Dec 2008 18:58:44 +0000
Subject: [PATCH] Fix some more build errors

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8975 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Zones.pm |  2 --
 Shorewall6/shorewall6.spec        |  2 +-
 tools/build/buildshorewall        | 29 ++++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm
index bee62356a..2c98c807b 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -627,7 +627,6 @@ sub validate_interfaces_file( $ )
     } else {
 	%validoptions = (  blacklist   => SIMPLE_IF_OPTION,
 			   bridge      => SIMPLE_IF_OPTION,
-			   nosmurfs    => SIMPLE_IF_OPTION,
 			   optional    => SIMPLE_IF_OPTION,
 			   routeback   => SIMPLE_IF_OPTION + IF_OPTION_ZONEONLY,
 			   sourceroute => BINARY_IF_OPTION,
@@ -982,7 +981,6 @@ sub validate_hosts_file()
     } else {
 	%validoptions = (
 			 blacklist => 1,
-			 nosmurfs => 1,
 			 routeback => 1,
 			 tcpflags => 1,
 			);
diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec
index 8102e9b1a..a4fa5b643 100644
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@@ -148,7 +148,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall6/configfiles/tcfilters
 %attr(0644,root,root) /usr/share/shorewall6/configfiles/Makefile
 
-%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
+%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples6
 
 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index f904fc654..a9609e7ff 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -320,7 +320,7 @@ case $VERSION in
 	SHELLBRANCH="trunk/Shorewall-shell"
 	DOCTAG="trunk/docs"
 	XMLPROJ="docs-4.3"
-	SAMPLESTAG="trunk/Samples"
+	SAMPLETAGS="trunk/Samples"
 	SAMPLES6TAG="trunk/Samples6"
 	MANPAGETAG=trunk/manpages
 	LITEMANPAGETAG=trunk/manpages-lite
@@ -576,6 +576,33 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	cd $DIR
     fi
 
+    if [ -n "$BUILD6" ]; then
+	cd $SHOREWALL6DIR
+	do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLES6TAG Samples >> $LOGFILE 2>&1"
+	if false; then
+	    progress_message "Exporting $MANPAGETAG from SVN..."
+	    do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
+	    cd manpages
+	    for f in *.xml; do
+		if [ $f != shorewall-template.xml ]; then
+		    progress_message "Generating Man Page from $f..."
+		    do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
+		    case $f in
+			*.conf.*|shorewall.xml)
+			    ;;
+			*)
+			    g=${f#shorewall-}
+			    h=$(ls ${g%.xml}.[58])
+			    mv $h shorewall-$h
+			    ;;
+		    esac
+		fi
+	    done
+	    rm *.xml
+	fi
+	cd $DIR
+    fi
+
     if [ -n "$BUILDLITE" ]; then
 	cd $SHOREWALLLITEDIR
 	progress_message "Exporting $LITEMANPAGETAG from SVN..."