From 6991a844c8f469df5c995d691d426447d90f3aa1 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 7 May 2010 20:33:37 -0700 Subject: [PATCH 1/9] Fix broken link --- docs/shorewall_setup_guide.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shorewall_setup_guide.xml b/docs/shorewall_setup_guide.xml index 518a03c8e..a83bc3b1f 100644 --- a/docs/shorewall_setup_guide.xml +++ b/docs/shorewall_setup_guide.xml @@ -363,7 +363,7 @@ all all REJECT info class="devicefile">ppp0 or ippp0 then you will want to set CLAMPMSS=yes in /etc/shorewall/shorewall.conf. + url="manpages/shorewall.conf.html">/etc/shorewall/shorewall.conf. Your Local Interface will be an Ethernet adapter (eth0, From 2a42998d979b3f671b4775ac97fe5f8941ac6dcb Mon Sep 17 00:00:00 2001 From: "Roberto C. Sanchez" Date: Sat, 8 May 2010 15:03:17 -0400 Subject: [PATCH 2/9] Fix typo. --- manpages/shorewall.conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml index c06de1f21..720358702 100644 --- a/manpages/shorewall.conf.xml +++ b/manpages/shorewall.conf.xml @@ -59,7 +59,7 @@ For most Shorewall logging, a level of 6 (info) is appropriate. Shorewall log messages are generated by NetFilter and are logged using - facility 'kern' and the level that you specifify. If you are unsure of the + facility 'kern' and the level that you specify. If you are unsure of the level to choose, 6 (info) is a safe bet. You may specify levels by name or by number. From 111bfa9feff6b86980523f18bc5393771a6c8420 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 6 May 2010 11:23:14 -0700 Subject: [PATCH 3/9] Modify first attempts to allow installaton on a Mac Signed-off-by: Tom Eastep --- Shorewall/install.sh | 8 ++++++-- Shorewall6/install.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index d29c74c02..19fb7a434 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -112,6 +112,7 @@ CYGWIN= MAC= SPARSE= MANDIR=${MANDIR:-"/usr/share/man"} +INSTALLD='-D' case $(uname) in CYGWIN*) @@ -135,6 +136,7 @@ case $(uname) in [ -z "$GROUP" ] && GROUP=wheel MAC=Yes SPARSE=Yes + INSTALLD= ;; *) [ -z "$OWNER" ] && OWNER=root @@ -834,15 +836,17 @@ fi cd manpages +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ + for f in *.5; do gzip -c $f > $f.gz - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz + run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz" done for f in *.8; do gzip -c $f > $f.gz - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz + run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz" done diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 004d44e8a..cd3a6807b 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -112,6 +112,7 @@ CYGWIN= MAC= MANDIR=${MANDIR:-"/usr/share/man"} SPARSE= +INSTALLD='-D' case $(uname) in CYGWIN*) @@ -135,6 +136,7 @@ case $(uname) in [ -z "$GROUP" ] && GROUP=wheel MAC=Yes SPARSE=Yes + INSTALLD= ;; *) [ -z "$OWNER" ] && OWNER=root @@ -693,15 +695,17 @@ fi cd manpages +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ + for f in *.5; do gzip -c $f > $f.gz - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz + run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz" done for f in *.8; do gzip -c $f > $f.gz - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz + run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz" done From 0c8007efa72c36c4b09bea61c2ab9080c105844d Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 12:58:57 -0700 Subject: [PATCH 4/9] Don't set SPARSE when building on a Mac --- Shorewall/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 19fb7a434..133cc3542 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -135,7 +135,7 @@ case $(uname) in [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=wheel MAC=Yes - SPARSE=Yes + [ -z "${PREFIX}" && SPARSE=Yes INSTALLD= ;; *) From 5f4d3cd2dc3732892b5756289b18bb768437f83e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 13:35:21 -0700 Subject: [PATCH 5/9] More fixes for build on a Mac --- Shorewall-lite/install.sh | 8 ++++++-- Shorewall/install.sh | 2 +- Shorewall6-lite/install.sh | 8 ++++++-- Shorewall6/install.sh | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 42dc0cf04..47674aa35 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -131,6 +131,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin # DEBIAN= CYGWIN= +INSTALLD='-D' case $(uname) in CYGWIN*) @@ -142,6 +143,9 @@ case $(uname) in OWNER=$(id -un) GROUP=$(id -gn) ;; + Darwin) + INSTALLD= + ;; *) [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=root @@ -302,13 +306,13 @@ cd manpages for f in *.5; do gzip -c $f > $f.gz - run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz + run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz" done for f in *.8; do gzip -c $f > $f.gz - run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz + run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz" done diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 133cc3542..4de7eb9e4 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -130,12 +130,12 @@ case $(uname) in if [ -z "$PREFIX" ]; then DEST= INIT= + SPARSE=Yes fi [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=wheel MAC=Yes - [ -z "${PREFIX}" && SPARSE=Yes INSTALLD= ;; *) diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index f877fc971..8c6be2edf 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -130,6 +130,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin # Determine where to install the firewall script # DEBIAN= +INSTALLD='-D' case $(uname) in CYGWIN*) @@ -141,6 +142,9 @@ case $(uname) in OWNER=$(id -un) GROUP=$(id -gn) ;; + Darwin) + INSTALLD= + ;; *) [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=root @@ -301,13 +305,13 @@ cd manpages for f in *.5; do gzip -c $f > $f.gz - run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz + run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz" done for f in *.8; do gzip -c $f > $f.gz - run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz + run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz" done diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index cd3a6807b..60fd2ca7f 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -130,12 +130,12 @@ case $(uname) in if [ -z "$PREFIX" ]; then DEST= INIT= + SPARSE=Yes fi [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=wheel MAC=Yes - SPARSE=Yes INSTALLD= ;; *) From caf2f79f6c633daf4101b82f745121556527b74e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 13:42:41 -0700 Subject: [PATCH 6/9] Yet more fixes for build on a Mac --- Shorewall-lite/install.sh | 2 ++ Shorewall6-lite/install.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 47674aa35..7c45f604c 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -304,6 +304,8 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules" cd manpages +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ + for f in *.5; do gzip -c $f > $f.gz run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 8c6be2edf..1cc8fab88 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -303,6 +303,8 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall6-lite/modules" cd manpages +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ + for f in *.5; do gzip -c $f > $f.gz run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz From 50e510702deb6985ec2955b174b503895711a226 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 13:53:00 -0700 Subject: [PATCH 7/9] Yet even more fixes for build on a Mac --- Shorewall-lite/install.sh | 2 +- Shorewall6-lite/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 7c45f604c..03d956333 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -304,7 +304,7 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules" cd manpages -[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}$/usr/share/man/man5/ ${PREFIX}${MANDIR}/man8/ for f in *.5; do gzip -c $f > $f.gz diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 1cc8fab88..d308da92d 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -303,7 +303,7 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall6-lite/modules" cd manpages -[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/ +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/ for f in *.5; do gzip -c $f > $f.gz From 4646920df4da332125ed9173dc7c2a29b88575ee Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 13:55:33 -0700 Subject: [PATCH 8/9] fix typo --- Shorewall-lite/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 03d956333..46143e4e5 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -304,7 +304,7 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules" cd manpages -[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}$/usr/share/man/man5/ ${PREFIX}${MANDIR}/man8/ +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}${MANDIR}/man8/ for f in *.5; do gzip -c $f > $f.gz From a2ad074179decc97a53e0258da2475f3cc8a5968 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 8 May 2010 13:58:54 -0700 Subject: [PATCH 9/9] Measure twice, cut once --- Shorewall-lite/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 46143e4e5..21611283c 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -304,7 +304,7 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules" cd manpages -[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}${MANDIR}/man8/ +[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/ for f in *.5; do gzip -c $f > $f.gz