diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-07-11 17:42:26.621298313 +0000 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-07-11 17:44:09.647292172 +0000 @@ -49,9 +49,9 @@ LOGALLNEW= -LOGFILE=/var/log/messages +LOGFILE=/var/log/shorewall -LOGFORMAT="%s %s " +LOGFORMAT="Shorewall:%s:%s " LOGTAGONLY=No @@ -67,7 +67,7 @@ SMURF_LOG_LEVEL="$LOG_LEVEL" -STARTUP_LOG=/var/log/shorewall-init.log +STARTUP_LOG=/var/log/shorewall-init TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh 2018-07-11 17:47:50.239279024 +0000 @@ -1215,8 +1215,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then - run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT} - echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}" + run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init + echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init" fi # @@ -1254,7 +1254,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" @@ -1273,7 +1273,7 @@ elif mywhich update-rc.d ; then echo "${PRODUCT} will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf update-rc.d ${PRODUCT} enable elif mywhich rc-update ; then @@ -1281,7 +1281,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-5.2.0.5/logrotate --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/logrotate 2018-07-11 17:43:00.277296307 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-init.log { +/var/log/shorewall-init { missingok notifempty create 0600 root root diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-5.2.0.5/uninstall.sh --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/uninstall.sh 2018-07-11 17:47:41.736279531 +0000 @@ -216,7 +216,7 @@ esac done -remove_file ${CONFDIR}/logrotate.d/$PRODUCT +remove_file ${CONFDIR}/logrotate.d/$PRODUCT-init [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf --- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-07-11 17:42:26.621298313 +0000 +++ shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-07-11 17:43:46.477293554 +0000 @@ -48,9 +48,9 @@ LOGALLNEW= -LOGFILE=/var/log/messages +LOGFILE=/var/log/shorewall -LOGFORMAT="%s %s " +LOGFORMAT="Shorewall:%s:%s " LOGLIMIT="s:1/sec:10" @@ -66,7 +66,7 @@ SMURF_LOG_LEVEL="$LOG_LEVEL" -STARTUP_LOG=/var/log/shorewall6-init.log +STARTUP_LOG=/var/log/shorewall6-init TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh --- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh 2018-07-11 17:47:07.879281549 +0000 @@ -1215,8 +1215,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then - run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT} - echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}" + run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init + echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init" fi # @@ -1254,7 +1254,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" @@ -1273,7 +1273,7 @@ elif mywhich update-rc.d ; then echo "${PRODUCT} will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf update-rc.d ${PRODUCT} enable elif mywhich rc-update ; then @@ -1281,7 +1281,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" - touch /var/log/${PRODUCT}-init.log + touch /var/log/${PRODUCT}-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall6-5.2.0.5/logrotate --- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-5.2.0.5/logrotate 2018-07-11 17:43:27.447294688 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall6-init.log { +/var/log/shorewall6-init { missingok notifempty create 0600 root root diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/uninstall.sh --- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-5.2.0.5/uninstall.sh 2018-07-11 17:47:15.348281104 +0000 @@ -216,7 +216,7 @@ esac done -remove_file ${CONFDIR}/logrotate.d/$PRODUCT +remove_file ${CONFDIR}/logrotate.d/$PRODUCT-init [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh --- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh 2018-07-11 17:47:32.928280056 +0000 @@ -459,8 +459,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then - install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644 - echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT" + install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644 + echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init" fi # @@ -510,7 +510,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" @@ -529,7 +529,7 @@ elif mywhich update-rc.d ; then echo "$PRODUCT will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf update-rc.d $PRODUCT enable elif mywhich rc-update ; then @@ -537,7 +537,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/logrotate --- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/logrotate 2018-07-11 17:43:19.397295168 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall6-lite-init.log { +/var/log/shorewall6-lite-init { missingok notifempty create 0600 root root diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/uninstall.sh --- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 +++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/uninstall.sh 2018-07-11 17:47:20.438280800 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT remove_directory ${LIBEXECDIR}/$PRODUCT -remove_file ${CONFDIR}/logrotate.d/$PRODUCT +remove_file ${CONFDIR}/logrotate.d/$PRODUCT-init if [ -n "$SYSCONFDIR" ]; then [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT} diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh --- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh 2018-07-11 17:50:51.169268240 +0000 @@ -328,8 +328,8 @@ # Install logrotate file # if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then - install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644 - echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT" + install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown 0644 + echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown" fi # diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-init-5.2.0.5/logrotate --- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/logrotate 2018-07-11 17:51:06.968267298 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-ifupdown.log { +/var/log/shorewall-ifupdown { missingok notifempty create 0600 root root diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/sysconfig shorewall-5.2.0.5/shorewall-init-5.2.0.5/sysconfig --- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/sysconfig 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/sysconfig 2018-07-11 17:51:19.147266572 +0000 @@ -19,7 +19,7 @@ # # Where Up/Down events get logged # -LOGFILE=/var/log/shorewall-ifupdown.log +LOGFILE=/var/log/shorewall-ifupdown # Startup options - set verbosity to 0 (minimal reporting) OPTIONS="-V0" diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/uninstall.sh --- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/uninstall.sh 2018-07-11 17:50:39.479268937 +0000 @@ -202,7 +202,7 @@ remove_directory ${SHAREDIR}/$PRODUCT remove_directory ${LIBEXECDIR}/$PRODUCT -remove_file ${CONFDIR}/logrotate.d/$PRODUCT +remove_file ${CONFDIR}/logrotate.d/shorewall-ifupdown # # Report Success diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh --- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh 2018-07-11 17:48:09.765277860 +0000 @@ -459,8 +459,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then - install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644 - echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT" + install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644 + echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init" fi # @@ -510,7 +510,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" @@ -529,7 +529,7 @@ elif mywhich update-rc.d ; then echo "$PRODUCT will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf update-rc.d $PRODUCT enable elif mywhich rc-update ; then @@ -537,7 +537,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" - touch /var/log/$PRODUCT-init.log + touch /var/log/$PRODUCT-init perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-lite-5.2.0.5/logrotate --- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/logrotate 2018-07-11 17:43:04.257296070 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-lite-init.log { +/var/log/shorewall-lite-init { missingok notifempty create 0600 root root diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-lite-5.2.0.5/uninstall.sh --- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 +++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/uninstall.sh 2018-07-11 17:47:56.086278676 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT remove_directory ${LIBEXECDIR}/$PRODUCT -remove_file ${CONFDIR}/logrotate.d/$PRODUCT +remove_file ${CONFDIR}/logrotate.d/$PRODUCT-init if [ -n "$SYSCONFDIR" ]; then [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT}