1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-01 22:57:33 +02:00

merge 5.0.1.3586

This commit is contained in:
Vadim Kurland 2011-11-16 10:51:05 -08:00
commit 1c05e238db
8 changed files with 19 additions and 7 deletions

View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3585"
BUILD_NUM="3586"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

View File

@ -1,2 +1,2 @@
#define VERSION "5.0.1.3585"
#define VERSION "5.0.1.3586"
#define GENERATION "5.0"

View File

@ -5,6 +5,11 @@
Setting broadcast address in the network object with netmask /31
to 255.255.255.255 broke rule shadowing algorithm.
2011-11-15 Vadim Kurland <vadim@netcitadel.com>
* CustomServiceDialog.cpp (loadFWObject): fixes #2669 "Cant
inspect custom Service object in Standard objects library".
2011-11-10 Vadim Kurland <vadim@netcitadel.com>
* configlets/linux24/check_utilities: fixes #2664 Update error

View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 5.0.1.3585
%define version 5.0.1.3586
%define release 1
%if "%_vendor" == "MandrakeSoft"

View File

@ -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.1.3585-1
Version: 5.0.1.3586-1
Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 5.0.1.3585
%define version 5.0.1.3586
%define release 1
%if "%_vendor" == "MandrakeSoft"

View File

@ -152,8 +152,8 @@ void CustomServiceDialog::loadFWObject(FWObject *o)
m_dialog->code->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->code);
m_dialog->platform->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->platform);
// do not make "platform" widget disabled when object is read-only
// to let the user flip between platforms to see the configuration. See #2669
m_dialog->protocol->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->protocol);

View File

@ -186,6 +186,13 @@
</p>
</li>
<li>
<p>
fixes #2669 "Cant inspect custom Service object in Standard
objects library".
</p>
</li>
</ul>