diff --git a/VERSION b/VERSION index db01ef448..6aecdb221 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="3460" +BUILD_NUM="3461" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 14f8444c7..1fe18f3f9 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3460" +#define VERSION "4.2.0.3461" #define GENERATION "4.2" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 86388b4fd..1a8f2c417 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.3460 +%define version 4.2.0.3461 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index b8c3b9d0d..afe14b57d 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.3460-1 +Version: 4.2.0.3461-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 2e60a8449..e72b20b45 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3460 +%define version 4.2.0.3461 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/Images/network_zone_dialog.png b/src/libgui/Images/network_zone_dialog.png index 9cac1cb04..a3734807d 100644 Binary files a/src/libgui/Images/network_zone_dialog.png and b/src/libgui/Images/network_zone_dialog.png differ diff --git a/src/libgui/newfirewalldialog_q.ui b/src/libgui/newfirewalldialog_q.ui index 195bb76d5..0e4494db2 100644 --- a/src/libgui/newfirewalldialog_q.ui +++ b/src/libgui/newfirewalldialog_q.ui @@ -514,7 +514,7 @@ - In the diagram below, the Ethernet0/1 "inside" interface would need to have its Network Zone set to a group object that containd the network objects for Network "A", Network "B" and Network "C". This means that rules with source addresses in any of these networks will be properly associated with Ethernet0/1. For the "outside" interface you will typically set its Network Zone to "Any" which is all IP networks that aren't defined as Network Zones for any other interfaces. + If you do not set the Network Zone now you can update the Network Zone configuration after the firewall has been created by double-clicking on the network interface of the firewall object and then selecting the desired object from the Network Zone dropdown list. true