- x32 rebuild
[packages/Firebird.git] / Firebird-FHS.patch
1 --- Firebird-2.5.0.26074-0/src/jrd/gds.cpp.orig 2010-10-28 08:01:51.000000000 +0200
2 +++ Firebird-2.5.0.26074-0/src/jrd/gds.cpp      2010-10-28 08:33:54.483737691 +0200
3 @@ -1751,7 +1751,12 @@
4  
5         GDS_init_prefix();
6  
7 -       strcpy(string, fb_prefix_lock); // safe - no BO
8 +       const char *lockdir = "/var/lib/firebird";
9 +       struct stat sb;
10 +       if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR)
11 +               strcpy(string, lockdir);
12 +       else
13 +               strcpy(string, fb_prefix_lock); // safe - no BO
14  
15         // if someone wants to know prefix for lock files,
16         // sooner of all he wants that directory to exist
17 --- Firebird-2.5.0.26074-0/src/jrd/os/config_root.h.orig        2010-09-08 10:43:20.000000000 +0200
18 +++ Firebird-2.5.0.26074-0/src/jrd/os/config_root.h     2010-10-28 08:36:33.139734339 +0200
19 @@ -91,7 +91,7 @@
20         {
21                 GetInstallDir();
22                 GetRoot();
23 -               config_file = root_dir + string(CONFIG_FILE);
24 +               config_file = "/etc/firebird/" + string(CONFIG_FILE);
25         }
26  
27         virtual ~ConfigRoot() {}
28 diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp
29 --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp     2007-03-28 06:20:36.000000000 +0200
30 +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp      2008-08-23 16:16:02.000000000 +0200
31 @@ -272,7 +272,7 @@
32                 rs = "can not quit now, use shut -ign";
33                 break;
34         case MSG_STARTERR:
35 -               rs = "check $FIREBIRD/firebird.log file for errors";
36 +               rs = "check /var/log/firebird.log file for errors";
37                 break;
38         case MSG_STARTFAIL:
39                 rs = "can not start server";
This page took 0.039023 seconds and 3 git commands to generate.