diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index b7bc99f5d..0ab84ff4e 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,9 @@ +Changes in Shorewall 4.4.20.1 + +1) Corrected FSF address. + +2) Don't modify configfiles/shorewall.conf & configfiles/shorewall6.conf. + Changes in Shorewall 4.4.20 Final 1) Set /proc/sys/net/bridge/bridge_nf_call_ip6?tables. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 26a89933e..1b4c7496e 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -339,9 +339,6 @@ fi # run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/usr/share/shorewall/configfiles -perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall/configfiles:/usr/share/shorewall|;' ${DESTDIR}/usr/share/shorewall/configfiles/shorewall.conf -perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall-lite-init.log|;' ${DESTDIR}/usr/share/shorewall/configfiles/shorewall.conf - if [ ! -f ${DESTDIR}/etc/shorewall/shorewall.conf ]; then run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/etc/shorewall diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 10c474c0e..ea4870f91 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 4 . 20 + S H O R E W A L L 4 . 4 . 20 . 1 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -13,6 +13,22 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.4.20.1 + +1) The address of the Free Software Foundation has been corrected in + the License files. + +2) The shorewall[6].conf file installed in + /usr/share/shorewall[6]/configfiles is no longer modified for use + with Shorewall[6]-lite. When creating a new configuration for a + remote forewall, two lines need to be modified in the copy + + CONFIG_PATH=/usr/share/shorewall (or shorewall6) + STARTUP_LOG=/var/log/shorewall-lite-init.log + (or shorewall6-lite-init.log) + +4.4.20 + 1) Previously, when a device number was explicitly specified in /etc/shorewall/tcdevices, all unused numbers less than the one specified were unavailable for allocation to following entries that diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 70ba23732..87175957f 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -319,9 +319,6 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf -perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall6/configfiles:/usr/share/shorewall6|;' ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf -perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf - if [ ! -f ${DESTDIR}/etc/shorewall6/shorewall6.conf ]; then run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/etc/shorewall6/shorewall6.conf diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml index 1a55d0b85..510329e2f 100644 --- a/docs/CompiledPrograms.xml +++ b/docs/CompiledPrograms.xml @@ -129,6 +129,23 @@ + + After copying, you may need to change two setting in the copy + of shorewall.conf: + + + + CONFIG_PATH=/usr/share/shorewall + + + + STARTUP_LOG=/var/log/shorewall-lite-init.log + + + + Older versions of Shorewall included copies of shorewall.conf + with these settings already modified. This practice was discontinued + in Shorewall 4.4.20.1.