From 6af301c6c434f9b7ae2f9a634aed8c77f264bc7d Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 24 Nov 2008 23:49:39 +0000 Subject: [PATCH] * Build fixes for FreeBSD. * Added GUI elements for krcmd and ekshell options for ipfilter Thanks to Cy.Schubert@komquats.com for the patch! --- build_num | 2 +- doc/ChangeLog | 5 +++++ qmake.inc | 32 ++++++++++++++++---------------- src/gui/Help.h | 1 + src/gui/ipfAdvancedDialog.cpp | 2 ++ src/gui/ipfadvanceddialog_q.ui | 26 ++++++++++++++++++++------ 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/build_num b/build_num index d4e180d18..6a3319968 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 667 +#define BUILD_NUM 668 diff --git a/doc/ChangeLog b/doc/ChangeLog index b4cd21f53..32bf77077 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2008-11-24 Vadim Kurland + * Build fixes for FreeBSD. + + * Added GUI elements for krcmd and ekshell options for ipfilter + Thanks to Cy.Schubert@komquats.com for the patch! + * Using QT4 stylesheet to improve layout of TCP Service, UDP Service and group object dialogs when program is used with KDE theme Oxygen. diff --git a/qmake.inc b/qmake.inc index aaf2999d2..e8fadb4e5 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.2 +MANDIR = /usr/home/vadim/src/fwb3/install_root/man/ +DOCDIR = /usr/home/vadim/src/fwb3/install_root/share/doc/fwbuilder-3.0.2 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /usr/home/vadim/src/fwb3/source/fwbuilder/src/ + ANTLR_LIBS = /usr/home/vadim/src/fwb3/source/fwbuilder/src/antlr/libantlr.a FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,38 +30,38 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root + PREFIX = /usr/home/vadim/src/fwb3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = ICONSDIR = - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /usr/home/vadim/src/fwb3/install_root/include/ /usr/home/vadim/src/fwb3/install_root/include/fwb-3 /usr/local/include /usr/local/include/libxml2 - LIBS_FWCOMPILER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp - LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWCOMPILER = -L/usr/home/vadim/src/fwb3/install_root/lib -L/usr/local/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -liconv -lm + LIBS_FWBUILDER = -L/usr/home/vadim/src/fwb3/install_root/lib -L/usr/local/lib -lfwbuilder -lxslt -lxml2 -lz -liconv -lm target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.2 - datadir.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/ + doc.path = /usr/home/vadim/src/fwb3/install_root/share/doc/fwbuilder-3.0.2 + datadir.path = /usr/home/vadim/src/fwb3/install_root/share/ # win32:target.path = $$PREFIX/ # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ - res.path = ../Resources - res_os.path = ../Resources/os/ - res_platform.path = ../Resources/platform/ - res_help.path = ../Resources/help/ - res_desktop.path = /Users/vadim/src/fwb3-branch-v3/install_root/share//applications/ + res.path = /usr/home/vadim/src/fwb3/install_root/share/fwbuilder-3.0.2 + res_os.path = /usr/home/vadim/src/fwb3/install_root/share/fwbuilder-3.0.2/os/ + res_platform.path = /usr/home/vadim/src/fwb3/install_root/share/fwbuilder-3.0.2/platform/ + res_help.path = /usr/home/vadim/src/fwb3/install_root/share/fwbuilder-3.0.2/help/ + res_desktop.path = /usr/home/vadim/src/fwb3/install_root/share//applications/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll + LIBS += $$LIBS_FWBUILDER -lutil PKGLOCALEDIR = $$res.path/locale diff --git a/src/gui/Help.h b/src/gui/Help.h index ef840ad8a..452bdcc52 100644 --- a/src/gui/Help.h +++ b/src/gui/Help.h @@ -30,6 +30,7 @@ #include "../../config.h" #include "SimpleTextView.h" +#include class Help : public SimpleTextView diff --git a/src/gui/ipfAdvancedDialog.cpp b/src/gui/ipfAdvancedDialog.cpp index 304c918c2..954026945 100644 --- a/src/gui/ipfAdvancedDialog.cpp +++ b/src/gui/ipfAdvancedDialog.cpp @@ -97,6 +97,8 @@ ipfAdvancedDialog::ipfAdvancedDialog(QWidget *parent,FWObject *o) data.registerOption( m_dialog->ipf_nat_irc_proxy,fwopt, "ipf_nat_irc_proxy"); data.registerOption( m_dialog->ipf_nat_ftp_proxy,fwopt, "ipf_nat_ftp_proxy"); data.registerOption( m_dialog->ipf_nat_rcmd_proxy,fwopt, "ipf_nat_rcmd_proxy"); + data.registerOption( m_dialog->ipf_nat_krcmd_proxy,fwopt, "ipf_nat_krcmd_proxy"); + data.registerOption( m_dialog->ipf_nat_ekshell_proxy,fwopt, "ipf_nat_ekshell_proxy"); data.registerOption( m_dialog->ipf_fw_dir,fwopt, "firewall_dir" ); data.registerOption( m_dialog->ipf_user,fwopt, "admUser" ); data.registerOption( m_dialog->altAddress, fwopt, "altAddress"); diff --git a/src/gui/ipfadvanceddialog_q.ui b/src/gui/ipfadvanceddialog_q.ui index aa62b77fe..424884700 100644 --- a/src/gui/ipfadvanceddialog_q.ui +++ b/src/gui/ipfadvanceddialog_q.ui @@ -97,21 +97,21 @@ - + Use raudio proxy in NAT rules - + Use h323 proxy in NAT rules - + Use ipsec proxy in NAT rules @@ -148,7 +148,21 @@ - + + + + Use Kerberos rcmd proxy in NAT rules + + + + + + + Use Kerberos ekshell proxy in NAT rules + + + + Qt::Vertical @@ -164,14 +178,14 @@ - + Use PPTP proxy in NAT rules - + Use IRC proxy in NAT rules for DCC