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

@@ -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"
 

VERSION.h

@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3484"
+#define VERSION      "4.2.0.3485"
 #define GENERATION   "4.2"

doc/ChangeLog

@@ -1,5 +1,14 @@
 2011-02-22  Vadim Kurland  <vadim@netcitadel.com>
 
+	* 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

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"

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

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"

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() {

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
   }

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
   }

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() {

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
   }

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() {

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
   }

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() {