From 85dad674bfede962dc258267dd897b6f0e228a56 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 22 Feb 2011 15:26:06 -0800 Subject: [PATCH] new build 3485 * configlets/linux24/shell_functions: see #2130 "unnecessary output when iptables script runs on the firewall". Ever since I switched to using "command" to verify that various system utilities generated script needs are present and can be used, the scirpt produced extra lines in the log printing full path and names to /usr/bin/logger, /sbin/ip etc. These lines are unnecessary and should not be there. This problem was introduced some time during the work on 4.2.0 --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 9 +++++++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/res/configlets/bsd/shell_functions | 2 +- src/res/configlets/dd-wrt-jffs/check_utilities | 2 +- src/res/configlets/dd-wrt-nvram/check_utilities | 2 +- src/res/configlets/ipcop/shell_functions | 2 +- src/res/configlets/linux24/check_utilities | 2 +- src/res/configlets/linux24/shell_functions | 2 +- src/res/configlets/openwrt/check_utilities | 2 +- src/res/configlets/sveasoft/shell_functions | 2 +- 14 files changed, 22 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 1631c0889..3532d0874 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3484" +BUILD_NUM="3485" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 2875f9a07..430382630 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3484" +#define VERSION "4.2.0.3485" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index aa8de23f3..52c0db4cc 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,14 @@ 2011-02-22 Vadim Kurland + * configlets/linux24/shell_functions: see #2130 "unnecessary + output when iptables script runs on the firewall". Ever since I + switched to using "command" to verify that various system + utilities generated script needs are present and can be used, the + scirpt produced extra lines in the log printing full path and + names to /usr/bin/logger, /sbin/ip etc. These lines are + unnecessary and should not be there. This problem was introduced + some time during the work on 4.2.0 + * instOptionsDialog.cpp (instOptionsDialog): fixes #2129 'deprecate "test install" function'. We have decided to deprecate test install because it is rather heavy-handed on Linux and PIX diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index a9156a8c1..91588aa82 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3484 +%define version 4.2.0.3485 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index b4ad0f817..27191b4c7 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3484-1 +Version: 4.2.0.3485-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index d4665b722..d5579c5be 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3484 +%define version 4.2.0.3485 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/res/configlets/bsd/shell_functions b/src/res/configlets/bsd/shell_functions index b421caefd..e856fb1d7 100644 --- a/src/res/configlets/bsd/shell_functions +++ b/src/res/configlets/bsd/shell_functions @@ -13,7 +13,7 @@ log() { echo "$1" - command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" + command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" } diff_intf() { diff --git a/src/res/configlets/dd-wrt-jffs/check_utilities b/src/res/configlets/dd-wrt-jffs/check_utilities index ddbd83268..8c33bf494 100644 --- a/src/res/configlets/dd-wrt-jffs/check_utilities +++ b/src/res/configlets/dd-wrt-jffs/check_utilities @@ -37,7 +37,7 @@ find_program() { PGM=$1 - command -v $PGM &>/dev/null || { + command -v $PGM >/dev/null 2>&1 || { echo "$PGM not found" exit 1 } diff --git a/src/res/configlets/dd-wrt-nvram/check_utilities b/src/res/configlets/dd-wrt-nvram/check_utilities index b527a5c9a..1b5ea107f 100644 --- a/src/res/configlets/dd-wrt-nvram/check_utilities +++ b/src/res/configlets/dd-wrt-nvram/check_utilities @@ -38,7 +38,7 @@ find_program() { PGM=$1 - command -v $PGM &>/dev/null || { + command -v $PGM >/dev/null 2>&1 || { echo "$PGM not found" exit 1 } diff --git a/src/res/configlets/ipcop/shell_functions b/src/res/configlets/ipcop/shell_functions index 243f13283..eadddaec9 100644 --- a/src/res/configlets/ipcop/shell_functions +++ b/src/res/configlets/ipcop/shell_functions @@ -13,7 +13,7 @@ log() { echo "$1" - command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" + command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" } check_file() { diff --git a/src/res/configlets/linux24/check_utilities b/src/res/configlets/linux24/check_utilities index a0cc52aaa..e498bb722 100644 --- a/src/res/configlets/linux24/check_utilities +++ b/src/res/configlets/linux24/check_utilities @@ -38,7 +38,7 @@ find_program() { PGM=$1 - command -v $PGM &>/dev/null || { + command -v $PGM >/dev/null 2>&1 || { echo "$PGM not found" exit 1 } diff --git a/src/res/configlets/linux24/shell_functions b/src/res/configlets/linux24/shell_functions index 7170a9df6..a55fe0006 100644 --- a/src/res/configlets/linux24/shell_functions +++ b/src/res/configlets/linux24/shell_functions @@ -2,7 +2,7 @@ log() { echo "$1" - command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" + command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" } getInterfaceVarName() { diff --git a/src/res/configlets/openwrt/check_utilities b/src/res/configlets/openwrt/check_utilities index b1762b570..319a2f908 100644 --- a/src/res/configlets/openwrt/check_utilities +++ b/src/res/configlets/openwrt/check_utilities @@ -22,7 +22,7 @@ find_program() { PGM=$1 - command -v $PGM &>/dev/null || { + command -v $PGM >/dev/null 2>&1 || { echo "$PGM not found" exit 1 } diff --git a/src/res/configlets/sveasoft/shell_functions b/src/res/configlets/sveasoft/shell_functions index c15cf8d0d..e624cb359 100644 --- a/src/res/configlets/sveasoft/shell_functions +++ b/src/res/configlets/sveasoft/shell_functions @@ -13,7 +13,7 @@ log() { echo "$1" - command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" + command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" } check_file() {