diff --git a/doc/ChangeLog b/doc/ChangeLog index e1d1d3ed2..8331e6763 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,23 @@ +2008-03-09 vadim + + * pf.cpp: fixed bug #1899914: "Script to apply the new rules." It + is enough to execute "pfctl -f file.conf" to load PF policy. There + is no need to purge filter and nat rules first, then reload it. + + * RCS.cpp (RCSEnvFix::RCSEnvFix): fixed bug #1908351: "rcs does + not save log message and file remains locked" + + * Compiler.cpp (emptyGroupsInRE::countChildren): (libfwbuilder) + fixed bug #1905718: "Group of DNS Name objects considered empty" + +2008-03-05 vadim + + * VERSION: started v2.1.18 + + * src/cisco_lib, src/iosacl, src/pix: Code for policy compilers + for Cisco IOS ACL and PIX has been released under + GPL and merged into the main fwbuilder tree. + 2008-02-18 vadim * CircularQueue.hpp (antlr): fixed crash of the policy importer on diff --git a/doc/ReleaseNotes_template.html b/doc/ReleaseNotes_template.html index 3aed9956d..991dd6c84 100644 --- a/doc/ReleaseNotes_template.html +++ b/doc/ReleaseNotes_template.html @@ -2,12 +2,11 @@ - -

Firewall Builder Release Notes

+

Firewall Builder Release Notes


-

Version 2.0.1

+

Version 2.0.1


Released MM/DD/YY diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp index 3b38c7ad0..45bec20a6 100644 --- a/src/gui/FWWindow.cpp +++ b/src/gui/FWWindow.cpp @@ -6,7 +6,7 @@ Author: Vadim Kurland vadim@fwbuilder.org - $Id: FWWindow.cpp,v 1.220 2007/07/07 05:39:33 vkurland Exp $ + $Id: FWWindow.cpp,v 1.221 2008/03/10 03:42:20 vkurland Exp $ This program is free software which we release under the GNU General Public License. You may redistribute and/or modify this program under the terms diff --git a/src/gui/ProjectPanel.cpp b/src/gui/ProjectPanel.cpp index ce8cc40c7..7a67f89c5 100644 --- a/src/gui/ProjectPanel.cpp +++ b/src/gui/ProjectPanel.cpp @@ -2244,8 +2244,9 @@ bool ProjectPanel::checkin(bool unlock) if (systemFile || rcs==NULL || !rcs->isCheckedOut() || rcs->isTemp()) return true; - if (rcs->isDiff()) // if the file hasn't changed, do not need to ask for the comment + if (rcs->isDiff()) { + // if the file hasn't changed, do not need to ask for the comment if ( ! st->getRCSLogState()) { RCSFileSaveDialog_q fsd; diff --git a/src/gui/RCS.cpp b/src/gui/RCS.cpp index 95a6845b5..4a23a5278 100644 --- a/src/gui/RCS.cpp +++ b/src/gui/RCS.cpp @@ -6,7 +6,7 @@ Author: Vadim Kurland vadim@fwbuilder.org - $Id: RCS.cpp,v 1.63 2008/02/07 05:20:59 vkurland Exp $ + $Id: RCS.cpp,v 1.64 2008/03/10 03:42:20 vkurland Exp $ This program is free software which we release under the GNU General Public License. You may redistribute and/or modify this program under the terms @@ -221,8 +221,10 @@ RCSEnvFix::RCSEnvFix() env.push_back( QString("USER=")+uname); env.push_back( QString("LOGNAME=")+uname); - env.push_back( QString("TMP=") + getenv("TMP")); - env.push_back( QString("TEMP=") + getenv("TEMP")); + if (getenv("TMP")!=NULL) + env.push_back( QString("TMP=") + getenv("TMP")); + if (getenv("TEMP")!=NULL) + env.push_back( QString("TEMP=") + getenv("TEMP")); } QStringList* RCSEnvFix::getEnv() diff --git a/src/pf/pf.cpp b/src/pf/pf.cpp index 39f178877..6a1bc42fd 100644 --- a/src/pf/pf.cpp +++ b/src/pf/pf.cpp @@ -794,16 +794,6 @@ _("Dynamic interface %s should not have an IP address object attached to it. Thi fw_file << endl; - - - - fw_file << endl - << "$PFCTL -d " << endl - << "$PFCTL -F nat" << endl - << "$PFCTL -F rules" << endl - << "$PFCTL -F Sources" << endl - << "$PFCTL -F Tables" << endl; - if (prolog_place == "fw_file") printProlog(fw_file, pre_hook); @@ -823,10 +813,6 @@ _("Dynamic interface %s should not have an IP address object attached to it. Thi << " || exit 1" << endl; - fw_file << "$PFCTL -e" - << " || exit 1" - << endl; - fw_file << endl; fw_file << "#" << endl; fw_file << "# Epilog script" << endl;