From b9e1cb9a64f2620b0fdb7d2edc1351821a67aaac Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 20 Feb 2009 05:09:12 +0000 Subject: [PATCH] fixed bug 2618686 --- build_num | 2 +- qmake.inc | 36 +++++++++++++++++------------------ src/gui/FirewallInstaller.cpp | 8 +++++--- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/build_num b/build_num index 62943c55d..f3b27411c 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 764 +#define BUILD_NUM 765 diff --git a/qmake.inc b/qmake.inc index 286838457..b5f9be37b 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/fwbuilder/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 +MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ + ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/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/fwbuilder/fwb3-branch-v3/install_root + PREFIX = /home/vadim/src/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - ICONSDIR = + ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/ - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 - LIBS_FWCOMPILER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp - LIBS_FWBUILDER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -Wl,-Bsymbolic-functions -pthread -lfwcompiler -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp + LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -Wl,-Bsymbolic-functions -pthread -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 - datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/ + doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 + datadir.path = /home/vadim/src/fwb3-branch-v3/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/fwbuilder/fwb3-branch-v3/install_root/share//applications/ + res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4 + res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/os/ + res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/platform/ + res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/help/ + res_desktop.path = /home/vadim/src/fwb3-branch-v3/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 @@ -74,7 +74,7 @@ unix { } macx { - PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root + PREFIX = /home/vadim/src/fwb3-branch-v3/install_root } win32 { diff --git a/src/gui/FirewallInstaller.cpp b/src/gui/FirewallInstaller.cpp index fc6ae7640..5ca7878f3 100644 --- a/src/gui/FirewallInstaller.cpp +++ b/src/gui/FirewallInstaller.cpp @@ -137,6 +137,8 @@ void FirewallInstaller::packSCPArgs(const QString &file_name, args.push_back(file_with_path); + QString mgmt_addr = cnf->maddr; + // bug #2618686 "built-in installer can not handle ipv6 management // address". If cnf->maddr is ipv6 address, it needs to be placed in // [ ] for scp (otherwise scp interprets ':' as a separator between @@ -157,7 +159,7 @@ void FirewallInstaller::packSCPArgs(const QString &file_name, // InetAddr throws exception if it is given ipv4 address. // Only add [ ] if this is legitimate ipv6 address (not '::') if (!addr.isAny()) - cnf->maddr = '[' + cnf->maddr + ']'; + mgmt_addr = '[' + cnf->maddr + ']'; } catch(FWException &ex) { // Assume cnf->maddr is ipv4 or host name @@ -166,9 +168,9 @@ void FirewallInstaller::packSCPArgs(const QString &file_name, if (!cnf->user.isEmpty()) - args.push_back(cnf->user + "@" + cnf->maddr + ":" + cnf->fwdir); + args.push_back(cnf->user + "@" + mgmt_addr + ":" + cnf->fwdir); else - args.push_back(cnf->maddr + ":" + cnf->fwdir); + args.push_back(mgmt_addr + ":" + cnf->fwdir); } /*