From d14a984f8531be416b7efe2014ff085383c06c94 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Wed, 4 May 2011 15:23:46 -0700 Subject: [PATCH 1/2] * FWObjectDatabase_18.xslt: XSLT transformation to upgrade data files from DTD v18 to DTD v19. This transformation finds "PolicyRule" elements with missing "Itf" child elements and fixes them by adding such element with a reference pointint to "any". Fixes #2383 * fwbuilder.dtd.in: Element "Itf" (an interface) of "PolicyRule" should be required. DTD version increment. --- VERSION | 4 +- VERSION.h | 2 +- doc/ChangeLog | 11 +++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/libfwbuilder/etc/fwbuilder.dtd | 4 +- src/libfwbuilder/etc/fwbuilder.dtd.in | 2 +- .../migration/FWObjectDatabase_18.xslt | 77 +++++++++++++++++++ src/libfwbuilder/migration/migration.pro | 1 + src/res/objects_init.xml | 2 +- src/res/templates.xml | 2 +- 12 files changed, 100 insertions(+), 11 deletions(-) create mode 100644 src/libfwbuilder/migration/FWObjectDatabase_18.xslt diff --git a/VERSION b/VERSION index 9aa35924a..f8d411e68 100644 --- a/VERSION +++ b/VERSION @@ -7,13 +7,13 @@ FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3536" +BUILD_NUM="3537" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION" # Data format version -FWBUILDER_XML_VERSION=18 +FWBUILDER_XML_VERSION=19 diff --git a/VERSION.h b/VERSION.h index f09d63c6b..225e7ef60 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.1.3536" +#define VERSION "4.2.1.3537" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 3f5a48034..163dca7a0 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,14 @@ +2011-05-04 Vadim Kurland + + * FWObjectDatabase_18.xslt: XSLT transformation to upgrade data + files from DTD v18 to DTD v19. This transformation finds + "PolicyRule" elements with missing "Itf" child elements and fixes + them by adding such element with a reference pointint to "any". + Fixes #2383 + + * fwbuilder.dtd.in: Element "Itf" (an interface) of "PolicyRule" + should be required. DTD version increment. + 2011-05-03 vadim * newFirewallDialog.cpp (finishClicked): see #2380 "Firewall diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 204f78e01..ed87a85c2 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.1.3536 +%define version 4.2.1.3537 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 53db3ade2..d8f1e52a5 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.1.3536-1 +Version: 4.2.1.3537-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 2429dc0e2..f889f6565 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.1.3536 +%define version 4.2.1.3537 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libfwbuilder/etc/fwbuilder.dtd b/src/libfwbuilder/etc/fwbuilder.dtd index 97bcff7b0..6e89cbf67 100644 --- a/src/libfwbuilder/etc/fwbuilder.dtd +++ b/src/libfwbuilder/etc/fwbuilder.dtd @@ -79,7 +79,7 @@ @@ -255,7 +255,7 @@ own compiler) we do not define content model for this element. > - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + sysid0 + + + + + + + + + + + + + + + + + + + 19 + + root + + + + + + + diff --git a/src/libfwbuilder/migration/migration.pro b/src/libfwbuilder/migration/migration.pro index cb317f0f5..829945a29 100644 --- a/src/libfwbuilder/migration/migration.pro +++ b/src/libfwbuilder/migration/migration.pro @@ -92,5 +92,6 @@ target.files = FWObjectDatabase_0.8.7.xslt \ FWObjectDatabase_15.xslt \ FWObjectDatabase_16.xslt \ FWObjectDatabase_17.xslt \ + FWObjectDatabase_18.xslt \ diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml index bb668299e..6e4f94df5 100644 --- a/src/res/objects_init.xml +++ b/src/res/objects_init.xml @@ -1,6 +1,6 @@ - + diff --git a/src/res/templates.xml b/src/res/templates.xml index 8899a690b..64c6af93c 100644 --- a/src/res/templates.xml +++ b/src/res/templates.xml @@ -1,6 +1,6 @@ - + From 71f5faab3d583eca1caef8ea3a2cc85c4ad8d40a Mon Sep 17 00:00:00 2001 From: Theron Tock Date: Wed, 4 May 2011 16:09:56 -0700 Subject: [PATCH 2/2] Fixes #2379. It seems Qt gives wrong value for "visible" arg in visibilityChanged on Mac. So we use the isVisible() function instead. --- src/libgui/ProjectPanel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libgui/ProjectPanel.cpp b/src/libgui/ProjectPanel.cpp index b281b7239..53d1478fe 100644 --- a/src/libgui/ProjectPanel.cpp +++ b/src/libgui/ProjectPanel.cpp @@ -1383,7 +1383,8 @@ void ProjectPanel::visibilityChangedForTreePanel(bool f) << "isWindow()=" << m_panel->treeDockWidget->isWindow() << "mdiWindow->isMaximized()=" << mdiWindow->isMaximized(); - adjustDockWidths(!f || m_panel->treeDockWidget->isFloating()); + adjustDockWidths(!m_panel->treeDockWidget->isVisible() || + m_panel->treeDockWidget->isFloating()); #if 0 if (m_panel->treeDockWidget->isVisible() &&