From 91702f094d6eeade3d7cd2d8c26e23475767fd95 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille Date: Sun, 24 Apr 2016 19:02:14 +0200 Subject: [PATCH] patches and request Tom, Some patches for the trunk repo(fixes.patch): Patch1: Fix a typo in the path being printed for the standard actions file. Patch2: Will only install the shorewall's manpages if the variable MANDIR is none-empty(I did it only for the sake of completeness)! Patch3: Will only install the shorewall-lite's manpages if the variable MANDIR is none-empty. Patch4: Correct multiple product name's typos in shorewall-init/install.sh. Patch5: Remove ~/.shorewallrc when shorewall-core is uninstalled. And two other patches for the release repo(changelog-1.patch): Patch1: Changed restart to reload for the line: 'Update DHCP article(refresh -> restart). Patch2: Rephrased the line for the newly added ?WARNING and ?INFO directives. Request: Could the date of the compiled firewall script also be displayed when 'shorewall status' is executed? -Matt -------------- Enclosure number 2 ---------------- >From a5ae24bbe9b25aefdbcc4d7c8e5d013a36b03078 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille Date: Sat, 23 Apr 2016 14:44:19 +0200 Subject: [PATCH 1/5] Fix typo in printed path for standard actions file Signed-off-by: Matt Darfeuille Signed-off-by: Tom Eastep --- Shorewall-core/uninstall.sh | 1 + Shorewall-init/install.sh | 4 ++-- Shorewall-lite/install.sh | 2 +- Shorewall/install.sh | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Shorewall-core/uninstall.sh b/Shorewall-core/uninstall.sh index a008fe491..ca915cdc9 100755 --- a/Shorewall-core/uninstall.sh +++ b/Shorewall-core/uninstall.sh @@ -117,6 +117,7 @@ fi echo "Uninstalling Shorewall Core $VERSION" rm -rf ${SHAREDIR}/shorewall +rm -f ~/.shorewallrc echo "Shorewall Core Uninstalled" diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 2a3c78285..2d1a044e3 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -572,9 +572,9 @@ if [ -z "$DESTDIR" ]; then cant_autostart fi elif [ $HOST = openwrt -a -f ${CONFDIR}/rc.common ]; then - /etc/init.d/shorewall-inir enable + /etc/init.d/$PRODUCT enable if /etc/init.d/shorewall-init enabled; then - echo "Shorrewall Init will start automatically at boot" + echo "$Product will start automatically at boot" else cant_autostart fi diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 33ffc65e2..439d4a9f0 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -495,7 +495,7 @@ done # Install the Man Pages # -if [ -d manpages ]; then +if [ -d manpages -a -n "$MANDIR" ]; then cd manpages mkdir -p ${DESTDIR}${MANDIR}/man5/ ${DESTDIR}${MANDIR}/man8/ diff --git a/Shorewall/install.sh b/Shorewall/install.sh index ed454d303..bdd82715c 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -514,7 +514,7 @@ echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/confi # Install the Standard Actions file # install_file actions.std ${DESTDIR}${SHAREDIR}/$PRODUCT/actions.std 0644 -echo "Standard actions file installed as ${DESTDIR}${SHAREDIR}d/$PRODUCT/actions.std" +echo "Standard actions file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/actions.std" cd configfiles @@ -1177,6 +1177,8 @@ fi # Install the Man Pages # +if [ -n "$MANDIR" ]; then + cd manpages [ -n "$INSTALLD" ] || mkdir -p ${DESTDIR}${MANDIR}/man5/ ${DESTDIR}${MANDIR}/man8/ @@ -1196,6 +1198,7 @@ done cd .. echo "Man Pages Installed" +fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT