onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 00:19:55 +02:00
Code Issues Releases Wiki Activity

* Build fixes for FreeBSD.

Browse Source 
* Added GUI elements for krcmd and ekshell options for ipfilter
        Thanks to Cy.Schubert@komquats.com for the patch!
This commit is contained in:
Vadim Kurland
2008-11-24 23:49:39 +00:00
parent eaaffd2ee9
commit 6af301c6c4
6 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 667
#define BUILD_NUM 668
doc/ChangeLog
+5
View File
@@ -1,5 +1,10 @@
2008-11-24 Vadim Kurland <vadim@vk.crocodile.org>
* 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.
qmake.inc
+16 -16
View File
@@ -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
src/gui/Help.h
+1
View File
@@ -30,6 +30,7 @@
#include "../../config.h"
#include "SimpleTextView.h"
#include <QFile>
class Help : public SimpleTextView
src/gui/ipfAdvancedDialog.cpp
+2
View File
@@ -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");
src/gui/ipfadvanceddialog_q.ui
+20 -6
View File
@@ -97,21 +97,21 @@
</property>
</spacer>
</item>
<item row="4" column="1" >
<item row="6" column="1" >
<widget class="QCheckBox" name="ipf_nat_raudio_proxy" >
<property name="text" >
<string>Use raudio proxy in NAT rules</string>
</property>
</widget>
</item>
<item row="5" column="1" >
<item row="7" column="1" >
<widget class="QCheckBox" name="ipf_nat_h323_proxy" >
<property name="text" >
<string>Use h323 proxy in NAT rules</string>
</property>
</widget>
</item>
<item row="6" column="1" >
<item row="8" column="1" >
<widget class="QCheckBox" name="ipf_nat_ipsec_proxy" >
<property name="text" >
<string>Use ipsec proxy in NAT rules</string>
@@ -148,7 +148,21 @@
</property>
</widget>
</item>
<item row="9" column="1" >
<item row="4" column="1" >
<widget class="QCheckBox" name="ipf_nat_krcmd_proxy" >
<property name="text" >
<string>Use Kerberos rcmd proxy in NAT rules</string>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QCheckBox" name="ipf_nat_ekshell_proxy" >
<property name="text" >
<string>Use Kerberos ekshell proxy in NAT rules</string>
</property>
</widget>
</item>
<item row="11" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -164,14 +178,14 @@
</property>
</spacer>
</item>
<item row="7" column="1" >
<item row="9" column="1" >
<widget class="QCheckBox" name="ipf_nat_pptp_proxy" >
<property name="text" >
<string>Use PPTP proxy in NAT rules</string>
</property>
</widget>
</item>
<item row="8" column="1" >
<item row="10" column="1" >
<widget class="QCheckBox" name="ipf_nat_irc_proxy" >
<property name="text" >
<string>Use IRC proxy in NAT rules for DCC</string>