Bumped to latest beta, remade and unified patches to patch. Removed old version.

(Portage version: 2.1.3.13)

3 files changed, 343 insertions, 12 deletions

diff --git a/dev-db/firebird/files/digest-firebird-1.5.4-r3 b/dev-db/firebird/files/digest-firebird-1.5.4-r3
deleted file mode 100644
index b3e31cc48311..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.4-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637
-RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637
-SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637
-MD5 b3530a500074ab5b2a276e37ecd10ccf firebird-1.5.4-debian-patchset.tar.bz2 22696
-RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 firebird-1.5.4-debian-patchset.tar.bz2 22696
-SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea firebird-1.5.4-debian-patchset.tar.bz2 22696
-MD5 6655190f760217845623a75001b6ddd4 firebird-1.5.4.4910.tar.bz2 5087076
-RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 firebird-1.5.4.4910.tar.bz2 5087076
-SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556 firebird-1.5.4.4910.tar.bz2 5087076
-MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
-RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
-SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
new file mode 100644
index 000000000000..f63a1165d43f
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
@@ -0,0 +1,6 @@
+MD5 e25589c8409f4eb2724e39898ec7ccf5 Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
+RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
+SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
new file mode 100644
index 000000000000..62319ecb08be
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
@@ -0,0 +1,337 @@
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird	2007-10-19 11:20:01.000000000 -0400
+@@ -185,14 +185,14 @@
+ # 
+ 
+ external_libraries:
+-ifeq ($(STD_ICU),false)
+-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
+-endif
+-ifeq ($(STD_EDITLINE),false)
+-ifeq ($(EDITLINE_FLG),Y)
+-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
+-endif
+-endif
++#ifeq ($(STD_ICU),false)
++#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
++#endif
++#ifeq ($(STD_EDITLINE),false)
++#ifeq ($(EDITLINE_FLG),Y)
++#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
++#endif
++#endif
+ 
+ btyacc_binary: $(BTYACC)
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults	2007-10-19 12:31:50.000000000 -0400
+@@ -229,11 +229,11 @@
+ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+-  ifeq ($(STD_EDITLINE), true)
+-	LIBEDITLINE := -leditline
+-  else
+-	LIBEDITLINE := $(LIB)/libeditline.a
+-  endif
++#  ifeq ($(STD_EDITLINE), true)
++	LIBEDITLINE := -ledit
++#  else
++#	LIBEDITLINE := $(LIB)/libeditline.a
++#  endif
+ endif
+ 
+ LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules	2007-10-19 11:30:08.000000000 -0400
+@@ -33,9 +33,9 @@
+ 
+ # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
+ CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
+-ifeq ($(STD_ICU),false)
+-  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
+-endif
++#ifeq ($(STD_ICU),false)
++#  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
++#endif
+ 
+ ifeq ($(IsProdTypeBuild),Y)
+   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
+@@ -69,19 +69,19 @@
+ 
+ .SUFFIXES: .c .e .epp .cpp
+ 
+-.e.c:
++.e.c: $(GPRE_CURRENT)
+ 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
+ 
+ 
+-.epp.cpp:
++.epp.cpp: $(GPRE_CURRENT)
+ 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
+ 
+ 
+-$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
++$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
+ 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
+ 
+ 
+-$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
++$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
+ 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
+ 
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets	2007-10-19 11:28:58.000000000 -0400
+@@ -49,7 +49,7 @@
+ 
+ # gpre_meta needs a special boot build since there is no database.
+ 
+-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
++$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
+ 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
+ 
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
+--- Firebird-2.1.0.16780-Beta2_orig/configure	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/configure	2007-10-19 11:26:19.000000000 -0400
+@@ -3928,13 +3928,13 @@
+ # not need editline in default libs, but need to test for its presence
+ saveLIBS=$LIBS
+ if test "$STD_EDITLINE" = "true"; then
+-  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
+-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
++echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_editline_readline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-leditline  $LIBS"
++LIBS="-ledit  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp	2007-10-19 11:31:25.000000000 -0400
+@@ -28,7 +28,7 @@
+ 
+ typedef Firebird::PathName string;
+ 
+-const char* ALIAS_FILE = "aliases.conf";
++const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
+ 
+ static void replace_dir_sep(string& s)
+ {
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h	2007-10-19 11:35:32.000000000 -0400
+@@ -38,11 +38,11 @@
+ const int EVENT_SEMAPHORES	= 1;
+ 
+ #ifdef NOHOSTNAME
+-static const char* EVENT_FILE	= "isc_event1";
+-static const char* LOCK_FILE	= "isc_lock1.gbl";
+-static const char* INIT_FILE	= "isc_init1";
+-static const char* GUARD_FILE	= "isc_guard1";
+-static const char* MONITOR_FILE	= "isc_monitor1";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isc_event1";
++static const char* LOCK_FILE	= "../../../var/run/firebird/isc_lock1.gbl";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1";
++static const char* MONITOR_FILE	= "../../../var/run/firebird/isc_monitor1";
+ #elif defined(VMS)
+ static const char* EVENT_FILE	= "[000000]isc_event1.%s";
+ static const char* LOCK_FILE	= "[000000]isc_lock1.%s";
+@@ -56,11 +56,11 @@
+ static const char* GUARD_FILE	= "%s.grd";
+ static const char* MONITOR_FILE	= "%s.mon";
+ #else
+-static const char* EVENT_FILE	= "isc_event1.%s";
+-static const char* LOCK_FILE	= "isc_lock1.%s";
+-static const char* INIT_FILE	= "isc_init1.%s";
+-static const char* GUARD_FILE	= "isc_guard1.%s";
+-static const char* MONITOR_FILE	= "isc_monitor1.%s";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isc_event1.%s";
++static const char* LOCK_FILE	= "../../../var/run/firebird/isc_lock1.%s";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1.%s";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1.%s";
++static const char* MONITOR_FILE	= "../../../var/run/firebird/isc_monitor1.%s";
+ #endif
+ 
+ #ifdef sun
+@@ -91,7 +91,7 @@
+ static const char* MSG_FILE		= "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX	= 10;
+-static const char* LOGFILE		= "firebird.log";
++static const char* LOGFILE		= "../../../var/log/firebird/firebird.log";
+ #elif defined(WIN_NT)
+ static const char* WORKFILE		= "c:\\temp\\";
+ static const char* MSG_FILE		= "firebird.msg";
+@@ -130,7 +130,7 @@
+ static const char* MSG_FILE		= "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX	= 10;
+-static const char* LOGFILE		= "firebird.log";
++static const char* LOGFILE		= "../../../var/log/firebird/firebird.log";
+ #endif
+ 
+ #endif /* JRD_FILE_PARAMS_H */
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h	2007-10-19 11:36:14.000000000 -0400
+@@ -57,7 +57,7 @@
+ #ifdef VMS
+ 					"[sysmgr]security2.fdb";
+ #else
+-					"security2.fdb";
++					"../../../etc/firebird/security2.fdb";
+ #endif
+ 
+ 		gds__prefix(path_buffer, USER_INFO_NAME);
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h	2007-10-19 11:37:36.000000000 -0400
+@@ -33,7 +33,7 @@
+ #include "../jrd/os/path_utils.h"
+ #include "../common/utils_proto.h"
+ 
+-static const char* CONFIG_FILE	= "firebird.conf";
++static const char* CONFIG_FILE	= "../../../etc/firebird/firebird.conf";
+ 
+ /**
+ 	Since the original (isc.cpp) code wasn't able to provide powerful and
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp	2007-10-19 11:44:43.000000000 -0400
+@@ -445,38 +445,38 @@
+ static serv_entry services[] =
+ {
+ 
+-	{ isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 },
+-	{ isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 },
+-	{ isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 },
+-	{ isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 },
+-	{ isc_action_max, "backup", "-svc -b", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "create", "-svc -c", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "restore", "-svc -r", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 },
+-	{ isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 },
+-	{ isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++	{ isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 },
++	{ isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 },
++	{ isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 },
++	{ isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 },
++	{ isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 },
++	{ isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 },
++	{ isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ 	{ isc_action_max, "query_server", NULL, NULL, NULL, 0 },
+-	{ isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 },
+-	{ isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++	{ isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 },
++	{ isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ 	{ isc_action_max, "anonymous", NULL, NULL, NULL, 0 },
+ 
+ /* NEW VERSION 2 calls, the name field MUST be different from those names above
+  */
+ 	{ isc_action_max, "service_mgr", NULL, NULL, NULL, 0 },
+-	{ isc_action_svc_backup, "Backup Database", NULL, "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_svc_restore, "Restore Database", NULL, "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_svc_repair, "Repair Database", NULL, "bin/gfix",	MAIN_GFIX, 0 },
+-	{ isc_action_svc_add_user, "Add User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_display_user, "Display User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_properties, "Database Properties", NULL, "bin/gfix",	MAIN_GFIX, 0 },
+-	{ isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print",	TEST_THREAD, 0 },
+-	{ isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat",	MAIN_GSTAT, 0 },
++	{ isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix",	MAIN_GFIX, 0 },
++	{ isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix",	MAIN_GFIX, 0 },
++	{ isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print",	TEST_THREAD, 0 },
++	{ isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat",	MAIN_GSTAT, 0 },
+ 	{ isc_action_svc_get_fb_log, "Get Log File", NULL, NULL,	SVC_read_fb_log, 0 },
+ /* actions with no names are undocumented */
+ 	{ isc_action_svc_set_config, NULL, NULL, NULL,	TEST_THREAD, 0 },
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp	2007-10-19 11:51:22.000000000 -0400
+@@ -1367,7 +1367,7 @@
+ bool CFBDialog::UpdateFirebirdConf(CString option, CString value)
+ {
+ 	CStdioFile FbConfFile, FbConfFileNew;
+-	CString FirebirdConfFilename = m_Root_Path + "firebird.conf";
++	CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf";
+ 	CString FirebirdConfNewname = FirebirdConfFilename + ".new";
+ 	CString FirebirdConfOldname = FirebirdConfFilename + ".old";
+ 	CString FirebirdConfLine = "";
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp	2007-10-19 11:51:56.000000000 -0400
+@@ -41,7 +41,7 @@
+ #endif
+ #include "../common/utils_proto.h"
+ 
+-DATABASE DB = STATIC FILENAME "security2.fdb";
++DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb";
+ 
+ static const char* SYSDBA_USER_NAME	= "SYSDBA";
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp	2007-10-19 11:52:29.000000000 -0400
+@@ -59,7 +59,7 @@
+ const USHORT IGNORE		= 3;
+ const USHORT NORMAL_EXIT= 0;
+ 
+-const char* SUPER_SERVER_BINARY	= "bin/fbserver";
++const char* SUPER_SERVER_BINARY	= "../../../usr/bin/fbserver";
+ 
+ const char* INTERBASE_USER		= "interbase";
+ const char* FIREBIRD_USER		= "firebird";
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h	2007-10-19 11:52:56.000000000 -0400
+@@ -31,7 +31,7 @@
+ static const char* FIREBIRD_USER_NAME	= "firebird";
+ static const char* INTERBASE_USER_NAME	= "interbase";
+ static const char* INTERBASE_USER_SHORT= "interbas";
+-static const char* SERVER_GUARDIAN	= "bin/fbguard";
++static const char* SERVER_GUARDIAN	= "../../../usr/bin/fbguard";
+ 
+ const USHORT MSG_FAC	= 18;
+ const int MSG_LEN		= 128;
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp	2007-10-19 11:53:32.000000000 -0400
+@@ -272,7 +272,7 @@
+ 		rs = "can not quit now, use shut -ign";
+ 		break;
+ 	case MSG_STARTERR:
+-		rs = "check $FIREBIRD/firebird.log file for errors";
++		rs = "check /var/log/firebird/firebird.log file for errors";
+ 		break;
+ 	case MSG_STARTFAIL:
+ 		rs = "can not start server";