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

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8974 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 .../{shorewall.conf => shorewall6.conf}       | 71 ++-----------------
 tools/build/buildshorewall                    |  2 +-
 2 files changed, 8 insertions(+), 65 deletions(-)
 rename Shorewall6/{shorewall.conf => shorewall6.conf} (76%)

diff --git a/Shorewall6/shorewall.conf b/Shorewall6/shorewall6.conf
similarity index 76%
rename from Shorewall6/shorewall.conf
rename to Shorewall6/shorewall6.conf
index cf8d1b0b1..c309f48a6 100644
--- a/Shorewall6/shorewall.conf
+++ b/Shorewall6/shorewall6.conf
@@ -1,5 +1,5 @@
 ###############################################################################
-#  /etc/shorewall/shorewall.conf Version 4 - Change the following variables to
+#  /etc/shorewalls/shorewall6.conf Version 4 - Change the following variables to
 #  match your setup
 #
 #  This program is under GPL
@@ -26,13 +26,6 @@ STARTUP_ENABLED=No
 
 VERBOSITY=1
 
-###############################################################################
-#                              C O M P I L E R
-#      (setting this to 'perl' requires installation of Shorewall-perl)
-###############################################################################
-
-SHOREWALL_COMPILER=
-
 ###############################################################################
 #			       L O G G I N G
 ###############################################################################
@@ -55,21 +48,13 @@ LOGALLNEW=
 
 BLACKLIST_LOGLEVEL=
 
-MACLIST_LOG_LEVEL=info
-
 TCP_FLAGS_LOG_LEVEL=info
 
-RFC1918_LOG_LEVEL=info
-
-SMURF_LOG_LEVEL=info
-
-LOG_MARTIANS=Yes
-
 ###############################################################################
 #	L O C A T I O N	  O F	F I L E S   A N D   D I R E C T O R I E S
 ###############################################################################
 
-IPTABLES=
+IP6TABLES=
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 
@@ -79,12 +64,10 @@ SUBSYSLOCK=/var/lock/subsys/shorewall
 
 MODULESDIR=
 
-CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+CONFIG_PATH=/etc/shorewall6:/usr/share/shorewall6
 
 RESTOREFILE=
 
-IPSECFILE=zones
-
 LOCKFILE=
 
 ###############################################################################
@@ -108,67 +91,31 @@ RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
 #			F I R E W A L L	  O P T I O N S
 ###############################################################################
 
-IP_FORWARDING=On
-
-ADD_IP_ALIASES=Yes
-
-ADD_SNAT_ALIASES=No
-
-RETAIN_ALIASES=No
-
-TC_ENABLED=Internal
+TC_ENABLED=No
 
 TC_EXPERT=No
 
-CLEAR_TC=Yes
+CLEAR_TC=No
 
 MARK_IN_FORWARD_CHAIN=No
 
 CLAMPMSS=No
 
-ROUTE_FILTER=No
-
-DETECT_DNAT_IPADDRS=No
-
 MUTEX_TIMEOUT=60
 
 ADMINISABSENTMINDED=Yes
 
 BLACKLISTNEWONLY=Yes
 
-DELAYBLACKLISTLOAD=No
-
 MODULE_SUFFIX=
 
-DISABLE_IPV6=Yes
-
-IPV6=Off
-
-BRIDGING=No
-
-DYNAMIC_ZONES=No
-
-PKTTYPE=Yes
-
-RFC1918_STRICT=No
-
-MACLIST_TABLE=filter
-
-MACLIST_TTL=
-
-SAVE_IPSETS=No
-
-MAPOLDACTIONS=No
-
 FASTACCEPT=No
 
 IMPLICIT_CONTINUE=No
 
 HIGH_ROUTE_MARKS=No
 
-USE_ACTIONS=Yes
-
-OPTIMIZE=0
+OPTIMIZE=1
 
 EXPORTPARAMS=Yes
 
@@ -178,15 +125,13 @@ KEEP_RT_TABLES=No
 
 DELETE_THEN_ADD=Yes
 
-MULTICAST=No
-
 DONT_LOAD=
 
 AUTO_COMMENT=Yes
 
 MANGLE_ENABLED=Yes
 
-USE_DEFAULT_RT=No
+USE_DEFAULT_RT=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
@@ -194,8 +139,6 @@ USE_DEFAULT_RT=No
 
 BLACKLIST_DISPOSITION=DROP
 
-MACLIST_DISPOSITION=REJECT
-
 TCP_FLAGS_DISPOSITION=DROP
 
 #LAST LINE -- DO NOT REMOVE
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 24bf0b104..f904fc654 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -425,7 +425,7 @@ case $VERSION in
 	# Normal Release
 	#
 	RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
-	RPM6NAME=shorewall-common-${VERSION}-0base.noarch.rpm
+	RPM6NAME=shorewall6-${VERSION}-0base.noarch.rpm
 	LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
 	LITE6RPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
 	PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm