extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more build errors

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8975 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-10 18:58:44 +00:00
parent d6bfd90065
commit 7c10e2837d
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-perl/Shorewall/Zones.pm
View File

@ -627,7 +627,6 @@ sub validate_interfaces_file( $ )
} else { } else {
%validoptions = ( blacklist => SIMPLE_IF_OPTION, %validoptions = ( blacklist => SIMPLE_IF_OPTION,
bridge => SIMPLE_IF_OPTION, bridge => SIMPLE_IF_OPTION,
nosmurfs => SIMPLE_IF_OPTION,
optional => SIMPLE_IF_OPTION, optional => SIMPLE_IF_OPTION,
routeback => SIMPLE_IF_OPTION + IF_OPTION_ZONEONLY, routeback => SIMPLE_IF_OPTION + IF_OPTION_ZONEONLY,
sourceroute => BINARY_IF_OPTION, sourceroute => BINARY_IF_OPTION,
@ -982,7 +981,6 @@ sub validate_hosts_file()
} else { } else {
%validoptions = ( %validoptions = (
blacklist => 1, blacklist => 1,
nosmurfs => 1,
routeback => 1, routeback => 1,
tcpflags => 1, tcpflags => 1,
); );

2
Shorewall6/shorewall6.spec
View File

@ -148,7 +148,7 @@ fi
%attr(0644,root,root) /usr/share/shorewall6/configfiles/tcfilters %attr(0644,root,root) /usr/share/shorewall6/configfiles/tcfilters
%attr(0644,root,root) /usr/share/shorewall6/configfiles/Makefile %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 %changelog
* Wed Dec 10 2008 Tom Eastep tom@shorewall.net * Wed Dec 10 2008 Tom Eastep tom@shorewall.net

29
tools/build/buildshorewall
View File

@ -320,7 +320,7 @@ case $VERSION in
SHELLBRANCH="trunk/Shorewall-shell" SHELLBRANCH="trunk/Shorewall-shell"
DOCTAG="trunk/docs" DOCTAG="trunk/docs"
XMLPROJ="docs-4.3" XMLPROJ="docs-4.3"
SAMPLESTAG="trunk/Samples" SAMPLETAGS="trunk/Samples"
SAMPLES6TAG="trunk/Samples6" SAMPLES6TAG="trunk/Samples6"
MANPAGETAG=trunk/manpages MANPAGETAG=trunk/manpages
LITEMANPAGETAG=trunk/manpages-lite LITEMANPAGETAG=trunk/manpages-lite
@ -576,6 +576,33 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
cd $DIR cd $DIR
fi 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 if [ -n "$BUILDLITE" ]; then
cd $SHOREWALLLITEDIR cd $SHOREWALLLITEDIR
progress_message "Exporting $LITEMANPAGETAG from SVN..." progress_message "Exporting $LITEMANPAGETAG from SVN..."