Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "William Thomson (wltjr)" <wltjr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/firebird/files: firebird-2.1.0.16780_beta2-deps-libs-paths.patch digest-firebird-2.1.0.16780_beta2 digest-firebird-1.5.4-r3
Date: Fri, 19 Oct 2007 18:20:08
Message-Id: E1IiwHo-0001Xu-9U@stork.gentoo.org
1 wltjr 07/10/19 18:09:28
2
3 Added: firebird-2.1.0.16780_beta2-deps-libs-paths.patch
4 digest-firebird-2.1.0.16780_beta2
5 Removed: digest-firebird-1.5.4-r3
6 Log:
7 Bumped to latest beta, remade and unified patches to patch. Removed old version.
8 (Portage version: 2.1.3.13)
9
10 Revision Changes Path
11 1.1 dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch?rev=1.1&content-type=text/plain
15
16 Index: firebird-2.1.0.16780_beta2-deps-libs-paths.patch
17 ===================================================================
18 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
19 --- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-10-19 11:11:36.000000000 -0400
20 +++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird 2007-10-19 11:20:01.000000000 -0400
21 @@ -185,14 +185,14 @@
22 #
23
24 external_libraries:
25 -ifeq ($(STD_ICU),false)
26 - $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
27 -endif
28 -ifeq ($(STD_EDITLINE),false)
29 -ifeq ($(EDITLINE_FLG),Y)
30 - $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
31 -endif
32 -endif
33 +#ifeq ($(STD_ICU),false)
34 +# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
35 +#endif
36 +#ifeq ($(STD_EDITLINE),false)
37 +#ifeq ($(EDITLINE_FLG),Y)
38 +# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
39 +#endif
40 +#endif
41
42 btyacc_binary: $(BTYACC)
43
44 diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults
45 --- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-10-19 11:11:36.000000000 -0400
46 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults 2007-10-19 12:31:50.000000000 -0400
47 @@ -229,11 +229,11 @@
48 LIBFBSTATIC_A = $(LIB)/libfbstatic.a
49
50 ifeq ($(EDITLINE_FLG),Y)
51 - ifeq ($(STD_EDITLINE), true)
52 - LIBEDITLINE := -leditline
53 - else
54 - LIBEDITLINE := $(LIB)/libeditline.a
55 - endif
56 +# ifeq ($(STD_EDITLINE), true)
57 + LIBEDITLINE := -ledit
58 +# else
59 +# LIBEDITLINE := $(LIB)/libeditline.a
60 +# endif
61 endif
62
63 LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
64 diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules
65 --- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-10-19 11:11:36.000000000 -0400
66 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules 2007-10-19 11:30:08.000000000 -0400
67 @@ -33,9 +33,9 @@
68
69 # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
70 CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
71 -ifeq ($(STD_ICU),false)
72 - CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
73 -endif
74 +#ifeq ($(STD_ICU),false)
75 +# CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
76 +#endif
77
78 ifeq ($(IsProdTypeBuild),Y)
79 CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
80 @@ -69,19 +69,19 @@
81
82 .SUFFIXES: .c .e .epp .cpp
83
84 -.e.c:
85 +.e.c: $(GPRE_CURRENT)
86 $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
87
88
89 -.epp.cpp:
90 +.epp.cpp: $(GPRE_CURRENT)
91 $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
92
93
94 -$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp
95 +$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
96 $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
97
98
99 -$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp
100 +$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
101 $(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
102
103
104 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
105 --- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-10-19 11:11:36.000000000 -0400
106 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets 2007-10-19 11:28:58.000000000 -0400
107 @@ -49,7 +49,7 @@
108
109 # gpre_meta needs a special boot build since there is no database.
110
111 -$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp
112 +$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
113 $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
114
115
116 diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
117 --- Firebird-2.1.0.16780-Beta2_orig/configure 2007-10-19 11:11:39.000000000 -0400
118 +++ Firebird-2.1.0.16780-Beta2/configure 2007-10-19 11:26:19.000000000 -0400
119 @@ -3928,13 +3928,13 @@
120 # not need editline in default libs, but need to test for its presence
121 saveLIBS=$LIBS
122 if test "$STD_EDITLINE" = "true"; then
123 - { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
124 -echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
125 + { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
126 +echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
127 if test "${ac_cv_lib_editline_readline+set}" = set; then
128 echo $ECHO_N "(cached) $ECHO_C" >&6
129 else
130 ac_check_lib_save_LIBS=$LIBS
131 -LIBS="-leditline $LIBS"
132 +LIBS="-ledit $LIBS"
133 cat >conftest.$ac_ext <<_ACEOF
134 /* confdefs.h. */
135 _ACEOF
136 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
137 --- Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp 2007-10-19 11:11:39.000000000 -0400
138 +++ Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp 2007-10-19 11:31:25.000000000 -0400
139 @@ -28,7 +28,7 @@
140
141 typedef Firebird::PathName string;
142
143 -const char* ALIAS_FILE = "aliases.conf";
144 +const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
145
146 static void replace_dir_sep(string& s)
147 {
148 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
149 --- Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h 2007-10-19 11:11:39.000000000 -0400
150 +++ Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h 2007-10-19 11:35:32.000000000 -0400
151 @@ -38,11 +38,11 @@
152 const int EVENT_SEMAPHORES = 1;
153
154 #ifdef NOHOSTNAME
155 -static const char* EVENT_FILE = "isc_event1";
156 -static const char* LOCK_FILE = "isc_lock1.gbl";
157 -static const char* INIT_FILE = "isc_init1";
158 -static const char* GUARD_FILE = "isc_guard1";
159 -static const char* MONITOR_FILE = "isc_monitor1";
160 +static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1";
161 +static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.gbl";
162 +static const char* INIT_FILE = "../../../var/run/firebird/isc_init1";
163 +static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1";
164 +static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1";
165 #elif defined(VMS)
166 static const char* EVENT_FILE = "[000000]isc_event1.%s";
167 static const char* LOCK_FILE = "[000000]isc_lock1.%s";
168 @@ -56,11 +56,11 @@
169 static const char* GUARD_FILE = "%s.grd";
170 static const char* MONITOR_FILE = "%s.mon";
171 #else
172 -static const char* EVENT_FILE = "isc_event1.%s";
173 -static const char* LOCK_FILE = "isc_lock1.%s";
174 -static const char* INIT_FILE = "isc_init1.%s";
175 -static const char* GUARD_FILE = "isc_guard1.%s";
176 -static const char* MONITOR_FILE = "isc_monitor1.%s";
177 +static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1.%s";
178 +static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.%s";
179 +static const char* INIT_FILE = "../../../var/run/firebird/isc_init1.%s";
180 +static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1.%s";
181 +static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1.%s";
182 #endif
183
184 #ifdef sun
185 @@ -91,7 +91,7 @@
186 static const char* MSG_FILE = "firebird.msg";
187 static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
188 const int LOCALE_MAX = 10;
189 -static const char* LOGFILE = "firebird.log";
190 +static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
191 #elif defined(WIN_NT)
192 static const char* WORKFILE = "c:\\temp\\";
193 static const char* MSG_FILE = "firebird.msg";
194 @@ -130,7 +130,7 @@
195 static const char* MSG_FILE = "firebird.msg";
196 static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
197 const int LOCALE_MAX = 10;
198 -static const char* LOGFILE = "firebird.log";
199 +static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
200 #endif
201
202 #endif /* JRD_FILE_PARAMS_H */
203 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
204 --- Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h 2007-10-19 11:11:39.000000000 -0400
205 +++ Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h 2007-10-19 11:36:14.000000000 -0400
206 @@ -57,7 +57,7 @@
207 #ifdef VMS
208 "[sysmgr]security2.fdb";
209 #else
210 - "security2.fdb";
211 + "../../../etc/firebird/security2.fdb";
212 #endif
213
214 gds__prefix(path_buffer, USER_INFO_NAME);
215 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
216 --- Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h 2007-10-19 11:11:39.000000000 -0400
217 +++ Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h 2007-10-19 11:37:36.000000000 -0400
218 @@ -33,7 +33,7 @@
219 #include "../jrd/os/path_utils.h"
220 #include "../common/utils_proto.h"
221
222 -static const char* CONFIG_FILE = "firebird.conf";
223 +static const char* CONFIG_FILE = "../../../etc/firebird/firebird.conf";
224
225 /**
226 Since the original (isc.cpp) code wasn't able to provide powerful and
227 diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp
228 --- Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp 2007-10-19 11:11:39.000000000 -0400
229 +++ Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp 2007-10-19 11:44:43.000000000 -0400
230 @@ -445,38 +445,38 @@
231 static serv_entry services[] =
232 {
233
234 - { isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 },
235 - { isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 },
236 - { isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 },
237 - { isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 },
238 - { isc_action_max, "backup", "-svc -b", "bin/gbak", MAIN_GBAK, 0 },
239 - { isc_action_max, "create", "-svc -c", "bin/gbak", MAIN_GBAK, 0 },
240 - { isc_action_max, "restore", "-svc -r", "bin/gbak", MAIN_GBAK, 0 },
241 - { isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 },
242 - { isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 },
243 - { isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 },
244 - { isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 },
245 - { isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 },
246 - { isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 },
247 + { isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 },
248 + { isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 },
249 + { isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 },
250 + { isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 },
251 + { isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
252 + { isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
253 + { isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
254 + { isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 },
255 + { isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 },
256 + { isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 },
257 + { isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 },
258 + { isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 },
259 + { isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
260 { isc_action_max, "query_server", NULL, NULL, NULL, 0 },
261 - { isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 },
262 - { isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 },
263 - { isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 },
264 + { isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 },
265 + { isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 },
266 + { isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
267 { isc_action_max, "anonymous", NULL, NULL, NULL, 0 },
268
269 /* NEW VERSION 2 calls, the name field MUST be different from those names above
270 */
271 { isc_action_max, "service_mgr", NULL, NULL, NULL, 0 },
272 - { isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
273 - { isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
274 - { isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", MAIN_GFIX, 0 },
275 - { isc_action_svc_add_user, "Add User", NULL, "bin/gsec", MAIN_GSEC, 0 },
276 - { isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", MAIN_GSEC, 0 },
277 - { isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", MAIN_GSEC, 0 },
278 - { isc_action_svc_display_user, "Display User", NULL, "bin/gsec", MAIN_GSEC, 0 },
279 - { isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", MAIN_GFIX, 0 },
280 - { isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print", TEST_THREAD, 0 },
281 - { isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat", MAIN_GSTAT, 0 },
282 + { isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
283 + { isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
284 + { isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
285 + { isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
286 + { isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
287 + { isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
288 + { isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
289 + { isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
290 + { isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print", TEST_THREAD, 0 },
291 + { isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat", MAIN_GSTAT, 0 },
292 { isc_action_svc_get_fb_log, "Get Log File", NULL, NULL, SVC_read_fb_log, 0 },
293 /* actions with no names are undocumented */
294 { isc_action_svc_set_config, NULL, NULL, NULL, TEST_THREAD, 0 },
295 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
296 --- Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:11:39.000000000 -0400
297 +++ Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:51:22.000000000 -0400
298 @@ -1367,7 +1367,7 @@
299 bool CFBDialog::UpdateFirebirdConf(CString option, CString value)
300 {
301 CStdioFile FbConfFile, FbConfFileNew;
302 - CString FirebirdConfFilename = m_Root_Path + "firebird.conf";
303 + CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf";
304 CString FirebirdConfNewname = FirebirdConfFilename + ".new";
305 CString FirebirdConfOldname = FirebirdConfFilename + ".old";
306 CString FirebirdConfLine = "";
307 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
308 --- Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp 2007-10-19 11:11:39.000000000 -0400
309 +++ Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp 2007-10-19 11:51:56.000000000 -0400
310 @@ -41,7 +41,7 @@
311 #endif
312 #include "../common/utils_proto.h"
313
314 -DATABASE DB = STATIC FILENAME "security2.fdb";
315 +DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb";
316
317 static const char* SYSDBA_USER_NAME = "SYSDBA";
318
319 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
320 --- Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp 2007-10-19 11:11:39.000000000 -0400
321 +++ Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp 2007-10-19 11:52:29.000000000 -0400
322 @@ -59,7 +59,7 @@
323 const USHORT IGNORE = 3;
324 const USHORT NORMAL_EXIT= 0;
325
326 -const char* SUPER_SERVER_BINARY = "bin/fbserver";
327 +const char* SUPER_SERVER_BINARY = "../../../usr/bin/fbserver";
328
329 const char* INTERBASE_USER = "interbase";
330 const char* FIREBIRD_USER = "firebird";
331 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
332 --- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:11:39.000000000 -0400
333 +++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:52:56.000000000 -0400
334 @@ -31,7 +31,7 @@
335 static const char* FIREBIRD_USER_NAME = "firebird";
336 static const char* INTERBASE_USER_NAME = "interbase";
337 static const char* INTERBASE_USER_SHORT= "interbas";
338 -static const char* SERVER_GUARDIAN = "bin/fbguard";
339 +static const char* SERVER_GUARDIAN = "../../../usr/bin/fbguard";
340
341 const USHORT MSG_FAC = 18;
342 const int MSG_LEN = 128;
343 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
344 --- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:11:39.000000000 -0400
345 +++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:53:32.000000000 -0400
346 @@ -272,7 +272,7 @@
347 rs = "can not quit now, use shut -ign";
348 break;
349 case MSG_STARTERR:
350 - rs = "check $FIREBIRD/firebird.log file for errors";
351 + rs = "check /var/log/firebird/firebird.log file for errors";
352 break;
353 case MSG_STARTFAIL:
354 rs = "can not start server";
355
356
357
358 1.1 dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
359
360 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2?rev=1.1&view=markup
361 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2?rev=1.1&content-type=text/plain
362
363 Index: digest-firebird-2.1.0.16780_beta2
364 ===================================================================
365 MD5 e25589c8409f4eb2724e39898ec7ccf5 Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
366 RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
367 SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
368 MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
369 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
370 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
371
372
373
374 --
375 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups