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

see #2341

Browse Source 
fixed XML error introduced with FWSM config  import; build 3525
This commit is contained in:
Vadim Kurland
2011-04-13 15:18:09 -07:00
parent 5c07a81c7b
commit 074aae6427
6 changed files with 5 additions and 13 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="3524" BUILD_NUM="3525"
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.3524" #define VERSION "4.2.0.3525"
#define GENERATION "4.2" #define GENERATION "4.2"
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3524 %define version 4.2.0.3525
%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.3524-1 Version: 4.2.0.3525-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.3524 %define version 4.2.0.3525
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp
-8
View File
@@ -188,14 +188,6 @@ void IC_ProgressPage::importerFinished()
if (fw) // fw can be NULL if import was uncussessful if (fw) // fw can be NULL if import was uncussessful
{ {
// importer does not correctly detect fwsm platform and sets platform
// to "pix"
if (platform == "fwsm")
{
fw->setStr("platform", "fwsm");
fw->setStr("hostOS", "fwsm_os");
}
QString fwName = field("firewallName").toString(); QString fwName = field("firewallName").toString();
fw->setName(fwName.toUtf8().constData()); fw->setName(fwName.toUtf8().constData());