Firebird-FHS.patch

   1 --- Firebird-2.5.4.26856-0/src/jrd/gds.cpp.orig 2015-05-29 20:19:05.329013419 +0200
   2 +++ Firebird-2.5.4.26856-0/src/jrd/gds.cpp      2015-05-29 20:33:36.775643514 +0200
   3 @@ -1754,7 +1754,13 @@
   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         iscSafeConcatPath(string, root);
  16  }
  17
  18 --- Firebird-2.5.0.26074-0/src/jrd/os/config_root.h.orig        2010-09-08 10:43:20.000000000 +0200
  19 +++ Firebird-2.5.0.26074-0/src/jrd/os/config_root.h     2010-10-28 08:36:33.139734339 +0200
  20 @@ -91,7 +91,7 @@
  21         {
  22                 GetInstallDir();
  23                 GetRoot();
  24 -               config_file = root_dir + string(CONFIG_FILE);
  25 +               config_file = "/etc/firebird/" + string(CONFIG_FILE);
  26         }
  27
  28         virtual ~ConfigRoot() {}
  29 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
  30 --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp     2007-03-28 06:20:36.000000000 +0200
  31 +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp      2008-08-23 16:16:02.000000000 +0200
  32 @@ -272,7 +272,7 @@
  33                 rs = "can not quit now, use shut -ign";
  34                 break;
  35         case MSG_STARTERR:
  36 -               rs = "check $FIREBIRD/firebird.log file for errors";
  37 +               rs = "check /var/log/firebird.log file for errors";
  38                 break;
  39         case MSG_STARTFAIL:
  40                 rs = "can not start server";