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 1 ---------------- >From 942d6d5aea55fbe40927c9dcdc083bad4cb496f9 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sat, 23 Apr 2016 12:23:38 +0200 Subject: [PATCH 1/2] Change restart to reload 'Update DHCP article' Signed-off-by: Matt Darfeuille <[email protected]> --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 344c34b..1fa0687 100644 --- a/changelog.txt +++ b/changelog.txt @@ -28,7 +28,7 @@ Changes in 5.0.8 RC 1 3) Correct many issues with save/restore of ipsets. -4) Update DHCP article (refresh -> restart) +4) Update DHCP article (refresh -> reload) 5) Correct start command's handling of AUTOMAKE. -- 2.6.2 >From bf76093b27a52a5448029690beaff8737ad7f1e2 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sat, 23 Apr 2016 12:40:02 +0200 Subject: [PATCH 2/2] Reword ?WARNING and ?INFO directives Signed-off-by: Matt Darfeuille <[email protected]> --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 1fa0687..af28d8e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -16,7 +16,7 @@ Changes in 5.0.8 RC 2 8) Add an ESTABLISHED,RELATED rule for o => docker0 -9) ?WARNING and ?INFO +9) Add ?WARNING and ?INFO directives 10) Warning on optional provider in the DUPLICATE column -- 2.6.2 -------------- Enclosure number 2 ---------------- >From a5ae24bbe9b25aefdbcc4d7c8e5d013a36b03078 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> 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 <[email protected]> --- Shorewall/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index ed454d3..a030432 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 -- 2.6.2 >From 9a6872a67f9bee115e850359ced15c0dbb230fed Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sat, 23 Apr 2016 17:48:17 +0200 Subject: [PATCH 2/5] Shorewall: Install manpages if MANDIR is not empty Signed-off-by: Matt Darfeuille <[email protected]> --- Shorewall/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index a030432..bdd8271 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -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 -- 2.6.2 >From 1ff2e8c9d2aa49cdb9888cf9867493de166758e5 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sun, 24 Apr 2016 11:59:24 +0200 Subject: [PATCH 3/5] Lite: Install manpages if MANDIR is not empty Signed-off-by: Matt Darfeuille <[email protected]> --- 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 33ffc65..439d4a9 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/ -- 2.6.2 >From 277c1de83f402362b0b577b92cf35ca333b33662 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sun, 24 Apr 2016 12:26:37 +0200 Subject: [PATCH 4/5] Init: Fix typos by using product name vars Signed-off-by: Matt Darfeuille <[email protected]> --- Shorewall-init/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 2a3c782..2d1a044 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 -- 2.6.2 >From 65a8bfeb4b261e60834a8498dae150d05d63b676 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Sun, 24 Apr 2016 12:59:59 +0200 Subject: [PATCH 5/5] Core: Remove ~/.shorewallrc file Signed-off-by: Matt Darfeuille <[email protected]> --- Shorewall-core/uninstall.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Shorewall-core/uninstall.sh b/Shorewall-core/uninstall.sh index a008fe4..ca915cd 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" -- 2.6.2 ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
