diff --git a/VERSION b/VERSION index 2ede4b633..4685d3e69 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="3497" +BUILD_NUM="3498" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 7a7266fcb..eac3f214f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3497" +#define VERSION "4.2.0.3498" #define GENERATION "4.2" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 2c977e811..2af81b547 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.3497 +%define version 4.2.0.3498 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index f721b8f47..45c46faf1 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.3497-1 +Version: 4.2.0.3498-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 d732605a4..2d9f1211b 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3497 +%define version 4.2.0.3498 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/importFirewallConfigurationWizard/IC_PlatformWarningPage.cpp b/src/libgui/importFirewallConfigurationWizard/IC_PlatformWarningPage.cpp index 62da845c6..a333411e5 100644 --- a/src/libgui/importFirewallConfigurationWizard/IC_PlatformWarningPage.cpp +++ b/src/libgui/importFirewallConfigurationWizard/IC_PlatformWarningPage.cpp @@ -88,7 +88,12 @@ void IC_PlatformWarningPage::initializePage() QList pf_conf_re; pf_conf_re << QRegExp("^scrub\\s+\\S+") - << QRegExp("^set\\s+timeout\\s+\\S+"); + << QRegExp("^set\\s+timeout\\s+\\S+") + << QRegExp("^pass\\s+") + << QRegExp("^block\\s+") + << QRegExp("^nat\\s+(?!\\()") + << QRegExp("^rdr\\s+(?!\\()") + << QRegExp("^table\\s+<\\S+>\\s+"); m_dialog->configFileBrowser->clear(); m_dialog->platform->setText(tr("Unknown"));