From fff5775c3943308c03541d779e8b33526b87acb4 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 7 Jul 2011 11:31:09 -0700 Subject: [PATCH] new build 3558 --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 8 ++++++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 65dc28a1b..aa36e16ef 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="3557" +BUILD_NUM="3558" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 29e63cd86..8d8498f7d 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "5.0.0.3557" +#define VERSION "5.0.0.3558" #define GENERATION "5.0" diff --git a/doc/ChangeLog b/doc/ChangeLog index 4cf6a226a..a1f2a3957 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2011-07-07 Vadim Kurland + + * PF import: check if a macro used somewhere in the file to be + imported is actually defined and abort if not + + * PF import: see #2551 making sure rules that have route-to option + get the call to setRoute() in the importer + 2011-07-06 Vadim Kurland * applied two patches by Vadim Zhukov persgray@gmail.com to diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 02536c3dd..a82e0826b 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 5.0.0.3557 +%define version 5.0.0.3558 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 585b32549..bc330bf1c 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: 5.0.0.3557-1 +Version: 5.0.0.3558-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 24c32dda9..18e8f7922 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 5.0.0.3557 +%define version 5.0.0.3558 %define release 1 %if "%_vendor" == "MandrakeSoft"