mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-05-01 22:57:33 +02:00
fixed problem in Inet6AddrMask related to the latest change for /31 subnets; fixed unit tests; build 3588
This commit is contained in:
parent
6f1c574633
commit
28dba00586
2
VERSION
2
VERSION
@ -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="3587"
|
||||
BUILD_NUM="3588"
|
||||
|
||||
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
#define VERSION "5.0.1.3587"
|
||||
#define VERSION "5.0.1.3588"
|
||||
#define GENERATION "5.0"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
|
||||
%define name fwbuilder
|
||||
%define version 5.0.1.3587
|
||||
%define version 5.0.1.3588
|
||||
%define release 1
|
||||
|
||||
%if "%_vendor" == "MandrakeSoft"
|
||||
|
||||
@ -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.3587-1
|
||||
Version: 5.0.1.3588-1
|
||||
Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
|
||||
Description: Firewall Builder GUI and policy compilers
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
%define name fwbuilder
|
||||
%define version 5.0.1.3587
|
||||
%define version 5.0.1.3588
|
||||
%define release 1
|
||||
|
||||
%if "%_vendor" == "MandrakeSoft"
|
||||
|
||||
@ -75,6 +75,7 @@ Inet6AddrMask::Inet6AddrMask(const string &s) throw(FWException) :
|
||||
|
||||
broadcast_address = new InetAddr();
|
||||
network_address = new InetAddr();
|
||||
last_host = new InetAddr();
|
||||
setNetworkAndBroadcastAddress();
|
||||
}
|
||||
|
||||
@ -85,6 +86,7 @@ Inet6AddrMask::Inet6AddrMask(const InetAddr &a, const InetAddr &n) :
|
||||
netmask = new InetAddr(AF_INET6, n.getLength());
|
||||
broadcast_address = new InetAddr();
|
||||
network_address = new InetAddr();
|
||||
last_host = new InetAddr();
|
||||
setNetworkAndBroadcastAddress();
|
||||
}
|
||||
|
||||
|
||||
@ -156,11 +156,13 @@ void GeneratedScriptTest::CheckUtilitiesTest()
|
||||
QStringList utils;
|
||||
|
||||
QStringList test1_utils;
|
||||
test1_utils << "find_program which";
|
||||
test1_utils << "find_program $IPTABLES";
|
||||
test1_utils << "find_program $MODPROBE";
|
||||
test1_utils << "find_program $IP";
|
||||
|
||||
QStringList test2_utils;
|
||||
test2_utils << "find_program which";
|
||||
test2_utils << "find_program $IPTABLES";
|
||||
test2_utils << "find_program $IPTABLES_RESTORE";
|
||||
test2_utils << "find_program $MODPROBE";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user