onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

updated activation path for FWSM; build 3519

Browse Source
This commit is contained in:
Vadim Kurland
2011-04-07 10:20:20 -07:00
parent fdd5db5ded
commit e541d4b1a1
8 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3518" BUILD_NUM="3519"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
VERSION.h
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "4.2.0.3518" #define VERSION "4.2.0.3519"
#define GENERATION "4.2" #define GENERATION "4.2"
doc/ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2011-04-07 vadim <vadim@netcitadel.com>
* 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 <vadim@netcitadel.com> 2011-04-05 vadim <vadim@netcitadel.com>
* pix.g (static_command_common_last_parameters): see #2314 "Import * pix.g (static_command_common_last_parameters): see #2314 "Import
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3518 %define version 4.2.0.3519
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
packaging/fwbuilder.control
+1 -1
View File
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org 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 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers
packaging/fwbuilder.spec
+1 -1
View File
@@ -1,6 +1,6 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3518 %define version 4.2.0.3519
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
src/libgui/FirewallInstaller.cpp
+9
View File
@@ -389,6 +389,12 @@ void FirewallInstaller::packSCPArgs(const QString &local_name,
const QString &remote_name, const QString &remote_name,
QStringList &args) QStringList &args)
{ {
if (fwbdebug)
qDebug() << "packSCPArgs"
<< "local_name=" << local_name
<< "remote_name=" << remote_name;
QString file_with_path = getFullPath(local_name); QString file_with_path = getFullPath(local_name);
QString scp = st->getSCPPath(); QString scp = st->getSCPPath();
@@ -500,6 +506,9 @@ void FirewallInstaller::packSCPArgs(const QString &local_name,
.arg(fwcompiler::CompilerDriver::escapeFileName(remote_name)); .arg(fwcompiler::CompilerDriver::escapeFileName(remote_name));
args.push_back(target); args.push_back(target);
if (fwbdebug)
qDebug() << "args=" << args;
} }
/* /*
src/res/os/fwsm_os.xml
+6
View File
@@ -11,6 +11,12 @@
<user_can_change_install_dir>false</user_can_change_install_dir> <user_can_change_install_dir>false</user_can_change_install_dir>
<default> <default>
</default> </default>
<activation>
<fwdir>flash:</fwdir>
<fwdir_test>flash:</fwdir_test>
</activation>
</options> </options>
<capabilities> <capabilities>