diff --git a/VERSION b/VERSION index 540f4a2a8..064fc4512 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="3518" +BUILD_NUM="3519" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index c42b0fabb..bfefe7f54 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3518" +#define VERSION "4.2.0.3519" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index f667b978a..7c2b9bbb9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2011-04-07 vadim + + * res/os/fwsm_os.xml: updated filesystem path on FWSM where + fwbuilder built-in installer should place generated configuration + when it is installed using scp. Currently using path "flash:". + 2011-04-05 vadim * pix.g (static_command_common_last_parameters): see #2314 "Import diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index fa13be114..73f6fe52c 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.3518 +%define version 4.2.0.3519 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 59b5208e0..36e965c93 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.3518-1 +Version: 4.2.0.3519-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 6528edf39..41a4ba42b 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3518 +%define version 4.2.0.3519 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/FirewallInstaller.cpp b/src/libgui/FirewallInstaller.cpp index 0804a304d..d65b4b250 100644 --- a/src/libgui/FirewallInstaller.cpp +++ b/src/libgui/FirewallInstaller.cpp @@ -389,6 +389,12 @@ void FirewallInstaller::packSCPArgs(const QString &local_name, const QString &remote_name, QStringList &args) { + if (fwbdebug) + qDebug() << "packSCPArgs" + << "local_name=" << local_name + << "remote_name=" << remote_name; + + QString file_with_path = getFullPath(local_name); QString scp = st->getSCPPath(); @@ -500,6 +506,9 @@ void FirewallInstaller::packSCPArgs(const QString &local_name, .arg(fwcompiler::CompilerDriver::escapeFileName(remote_name)); args.push_back(target); + + if (fwbdebug) + qDebug() << "args=" << args; } /* diff --git a/src/res/os/fwsm_os.xml b/src/res/os/fwsm_os.xml index 6702e5def..969b29396 100644 --- a/src/res/os/fwsm_os.xml +++ b/src/res/os/fwsm_os.xml @@ -11,6 +11,12 @@ false + + + flash: + flash: + +