- updated to 2.5.0

- updated editline,morearchs,FHS,64bit,gcc-icu,opt,rpath patches
- added noroot patch (allow non-root make install)

Changed files:
    Firebird-64bit.patch -> 1.4
    Firebird-FHS.patch -> 1.3
    Firebird-editline.patch -> 1.3
    Firebird-gcc-icu.patch -> 1.2
    Firebird-morearchs.patch -> 1.11
    Firebird-noroot.patch -> 1.1
    Firebird-opt.patch -> 1.2
    Firebird-rpath.patch -> 1.2
    Firebird.spec -> 1.78

diff --git a/Firebird-64bit.patch b/Firebird-64bit.patch
index 0e53d1f5c5ac4f4e61248b3253a8abd38ac68d42..685aa75df2937cdf5afcf0f1cbaa04b65be6a143 100644 (file)
--- a/Firebird-64bit.patch
+++ b/Firebird-64bit.patch
@@ -1,20 +1,20 @@
---- Firebird-2.1.2.18118-0/src/gpre/pas.cpp~   2007-02-11 10:31:45.000000000 +0100
-+++ Firebird-2.1.2.18118-0/src/gpre/pas.cpp    2009-07-02 23:08:50.683040590 +0200
-@@ -1931,7 +1931,7 @@
- 
-       args.pat_database = (DBB) init->nod_arg[3];
+--- Firebird-2.5.0.26074-0/src/gpre/pas.cpp.orig       2010-09-08 10:43:39.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/gpre/pas.cpp    2010-10-28 08:44:04.123740205 +0200
+@@ -1800,7 +1800,7 @@
+       PAT args;
+       args.pat_database = (gpre_dbb*) init->nod_arg[3];

        args.pat_vector1 = status_vector(action);
 -      args.pat_value1 = (int) init->nod_arg[2];
 +      args.pat_value1 = (int) (IPTR)init->nod_arg[2];
        args.pat_value2 = (int) event_list->nod_count;
        args.pat_string1 = GDS_EVENT_WAIT;
        args.pat_string2 = GDS_EVENT_COUNTS;
        args.pat_vector1 = status_vector(action);
 -      args.pat_value1 = (int) init->nod_arg[2];
 +      args.pat_value1 = (int) (IPTR)init->nod_arg[2];
        args.pat_value2 = (int) event_list->nod_count;
        args.pat_string1 = GDS_EVENT_WAIT;
        args.pat_string2 = GDS_EVENT_COUNTS;

-@@ -2007,7 +2007,7 @@
-               event_init = (GPRE_NOD) event_action->act_object;
-               stack_name = (gpre_sym*) event_init->nod_arg[0];
-               if (!strcmp(event_name->sym_string, stack_name->sym_string)) {
+@@ -1872,7 +1872,7 @@
+               gpre_sym* stack_name = (gpre_sym*) event_init->nod_arg[0];
+               if (!strcmp(event_name->sym_string, stack_name->sym_string))
+               {

 -                      ident = (int) event_init->nod_arg[2];
 +                      ident = (int) (IPTR)event_init->nod_arg[2];
 -                      ident = (int) event_init->nod_arg[2];
 +                      ident = (int) (IPTR)event_init->nod_arg[2];

-                       database = (DBB) event_init->nod_arg[3];
+                       database = (gpre_dbb*) event_init->nod_arg[3];

                }
        }
                }
        }

diff --git a/Firebird-FHS.patch b/Firebird-FHS.patch
index cecf3897d94cda91a8a92b29435ae753ffb02a2a..71a14705b857dc5112b2da883c01b9aebe6e5ee2 100644 (file)
--- a/Firebird-FHS.patch
+++ b/Firebird-FHS.patch
@@ -1,71 +1,10 @@
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in
---- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in    2005-08-16 12:03:22.000000000 +0200
-+++ Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in     2008-08-23 15:52:25.000000000 +0200
-@@ -125,7 +125,7 @@
-     aliasName=$1
-     newDB=$2
+--- Firebird-2.5.0.26074-0/src/jrd/gds.cpp.orig        2010-10-28 08:01:51.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/gds.cpp     2010-10-28 08:33:54.483737691 +0200
+@@ -1751,7 +1751,12 @@

  
  

--    AliasFile=$FBRootDir/aliases.conf
-+    AliasFile=/etc/firebird/aliases.conf
+       GDS_init_prefix();

  
  

- 
-     checkNameStartsWithSlash $newDB
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp       2006-05-19 17:16:45.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp        2008-08-23 17:58:51.000000000 +0200
-@@ -45,8 +45,7 @@
- 
- bool ResolveDatabaseAlias(const string& alias, string& database)
- {
--      string alias_filename;
--      Firebird::Prefix(alias_filename, ALIAS_FILE);
-+      string alias_filename = "/etc/firebird/aliases.conf";
-       ConfigFile aliasConfig(false);
-       aliasConfig.setConfigFilePath(alias_filename);
- 
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp Firebird-2.1.1.17910-0/src/jrd/gds.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp    2008-08-23 13:50:58.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/gds.cpp     2008-08-23 18:02:40.000000000 +0200
-@@ -1090,7 +1090,7 @@
-       while (true) {
-               if (trace_file_handle == INVALID_HANDLE_VALUE) {
-                       TEXT name[MAXPATHLEN];
--                      gds__prefix(name, LOGFILE);
-+                      sprintf(name, "/var/log/%s", LOGFILE);
-                       // We do not care to close this file. 
-                       // It will be closed automatically when our process terminates.
-                       trace_file_handle = CreateFile(name, GENERIC_WRITE, 
-@@ -1116,7 +1116,7 @@
-       TEXT name[MAXPATHLEN];
- 
-       // Note: signal-safe code
--      gds__prefix(name, LOGFILE);
-+      sprintf(name, "/var/log/%s", LOGFILE);
-       int file = open(name, O_CREAT | O_APPEND | O_WRONLY, 0660);
-       if (file == -1)
-               return;
-@@ -1227,7 +1227,7 @@
-       now = time((time_t *)0);
- #endif
- 
--      gds__prefix(name, LOGFILE);
-+      sprintf(name, "/var/log/%s", LOGFILE);
- 
- #ifdef WIN_NT
-       WaitForSingleObject(trace_mutex_handle, INFINITE);
-@@ -1283,7 +1283,7 @@
-       now = time((time_t *)0);
- #endif
- 
--      gds__prefix(name, LOGFILE);
-+      sprintf(name, "/var/log/%s", LOGFILE);
- 
-       const int oldmask = umask(0111);
- #ifdef WIN_NT
-@@ -1844,8 +1844,13 @@
-       fb_utils::snprintf(buf, MAXPATHLEN, root, fbEmbeddedRoot);
-       root = buf;
- #endif
+-      strcpy(string, fb_prefix_lock); // safe - no BO

 +      const char *lockdir = "/var/lib/firebird";
 +      struct stat sb;
 +      if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR)
 +      const char *lockdir = "/var/lib/firebird";
 +      struct stat sb;
 +      if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR)


@@ -73,45 +12,19 @@ diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp Firebird-2.1.1.
 +      else
 +              strcpy(string, fb_prefix_lock); // safe - no BO
  
 +      else
 +              strcpy(string, fb_prefix_lock); // safe - no BO
  

--      strcpy(string, fb_prefix_lock); // safe - no BO
-       safe_concat_path(string, root);
- }
- #endif
---- Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h.orig      2008-04-03 19:00:51.000000000 +0200
-+++ Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h   2009-09-19 05:52:40.000000000 +0200
-@@ -60,7 +60,7 @@
-                                       "security2.fdb";
- #endif
- 
--              gds__prefix(path_buffer, USER_INFO_NAME);
-+              gds__prefix_lock(path_buffer, USER_INFO_NAME);
-       }
- 
-       static void initialize();
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h Firebird-2.1.1.17910-0/src/jrd/os/config_root.h
---- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h   2007-04-05 14:47:15.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/os/config_root.h    2008-08-23 16:09:04.000000000 +0200
-@@ -83,7 +83,7 @@
+       // if someone wants to know prefix for lock files,
+       // sooner of all he wants that directory to exist
+--- Firebird-2.5.0.26074-0/src/jrd/os/config_root.h.orig       2010-09-08 10:43:20.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/os/config_root.h    2010-10-28 08:36:33.139734339 +0200
+@@ -91,7 +91,7 @@

        {
        {

+               GetInstallDir();

                GetRoot();
                GetRoot();

-               install_dir = root_dir;

 -              config_file = root_dir + string(CONFIG_FILE);
 +              config_file = "/etc/firebird/" + string(CONFIG_FILE);
        }
  
 -              config_file = root_dir + string(CONFIG_FILE);
 +              config_file = "/etc/firebird/" + string(CONFIG_FILE);
        }
  

- 
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp Firebird-2.1.1.17910-0/src/jrd/svc.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp    2008-05-27 11:27:40.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/svc.cpp     2008-08-23 18:01:19.000000000 +0200
-@@ -2037,7 +2037,7 @@
- #endif
- 
-       TEXT name[MAXPATHLEN];
--      gds__prefix(name, LOGFILE);
-+      sprintf(name, "/var/log/%s", LOGFILE);
-       FILE* file = fopen(name, "r");
-       if (file != NULL) {
- #ifdef SERVICE_THREAD
+       virtual ~ConfigRoot() {}

 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
 --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp    2007-03-28 06:20:36.000000000 +0200
 +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp     2008-08-23 16:16:02.000000000 +0200
 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
 --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp    2007-03-28 06:20:36.000000000 +0200
 +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp     2008-08-23 16:16:02.000000000 +0200

diff --git a/Firebird-editline.patch b/Firebird-editline.patch
index e4cd27e7489f0021526d32fc6c8ab8ba851b547c..6078bb3211507b2d5735d17d342b5596812f46f0 100644 (file)
--- a/Firebird-editline.patch
+++ b/Firebird-editline.patch
@@ -1,16 +1,7 @@
---- Firebird-2.1.1.17910-0/configure.in.orig   2008-05-27 11:26:28.000000000 +0200
-+++ Firebird-2.1.1.17910-0/configure.in        2008-07-18 22:28:11.790034707 +0200
-@@ -399,7 +399,7 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
--  AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
-+  AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
- fi
- LIBS=$saveLIBS
- 
-@@ -566,10 +566,10 @@
- dnl AC_CHECK_LIB(c, main)
+--- Firebird-2.5.0.26074-0/configure.in.orig   2010-09-08 10:44:05.000000000 +0200
++++ Firebird-2.5.0.26074-0/configure.in        2010-10-27 22:32:38.567739367 +0200
+@@ -652,10 +652,10 @@
+ AC_SEARCH_LIBS(dlopen, dl)

  AC_CHECK_LIB(m, main)
  if test "$EDITLINE_FLG" = "Y"; then
 +      AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
  AC_CHECK_LIB(m, main)
  if test "$EDITLINE_FLG" = "Y"; then
 +      AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \


@@ -18,17 +9,6 @@
                AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
                        AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
 -                              AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
                AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
                        AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
 -                              AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \

-                                       AC_MSG_ERROR(termcap support not found)))))  
+                                       AC_MSG_ERROR(termcap support not found)))))

        AC_SUBST(TERMLIB)
        XE_APPEND(-l$TERMLIB, LIBS)
        AC_SUBST(TERMLIB)
        XE_APPEND(-l$TERMLIB, LIBS)

---- Firebird-2.1.1.17910-0/builds/posix/make.defaults.orig     2008-07-18 21:24:32.538046000 +0200
-+++ Firebird-2.1.1.17910-0/builds/posix/make.defaults  2008-07-18 22:29:07.222040573 +0200
-@@ -230,7 +230,7 @@
- 
- ifeq ($(EDITLINE_FLG),Y)
-   ifeq ($(STD_EDITLINE), true)
--      LIBEDITLINE := -leditline
-+      LIBEDITLINE := -ledit
-   else
-       LIBEDITLINE := $(LIB)/libeditline.a
-   endif

diff --git a/Firebird-gcc-icu.patch b/Firebird-gcc-icu.patch
index 09327d8c7fa024a32fcce421051848231702b185..808a51c4a8c5fb139cc78817543ce9ac1cbb8627 100644 (file)
--- a/Firebird-gcc-icu.patch
+++ b/Firebird-gcc-icu.patch
@@ -14,19 +14,3 @@ diff -u -p -r1.71 alloc.h
  
  #ifdef _MSC_VER
  #define THROW_BAD_ALLOC
  
  #ifdef _MSC_VER
  #define THROW_BAD_ALLOC

-@@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
-       );
- }
- 
--inline void* operator new(size_t, void* ptr) throw() 
--{
--      return ptr;
--}
--inline void* operator new[](size_t, void* ptr) throw() 
--{
--      return ptr;
--}
--
- inline void operator delete(void* mem) throw()
- {
-       Firebird::MemoryPool::globalFree(mem);

diff --git a/Firebird-morearchs.patch b/Firebird-morearchs.patch
index 0068d4c8038cdb4764326088271ef4a9ff79f2dd..d4a8134ef7dae2053aa14399c3eb5da0198bf6a0 100644 (file)
--- a/Firebird-morearchs.patch
+++ b/Firebird-morearchs.patch
@@ -1,80 +1,69 @@
---- Firebird-2.1.1.17910-0/src/jrd/common.h.orig       2008-05-27 11:27:23.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/common.h    2008-07-18 22:37:29.266040573 +0200
-@@ -151,6 +151,11 @@
+--- Firebird-2.5.0.26074-0/src/jrd/common.h.orig       2010-09-08 10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/common.h    2010-10-28 07:51:57.395734339 +0200
+@@ -158,6 +158,11 @@

  #define RISC_ALIGNMENT
  #endif // IA64
  
 +#ifdef __alpha__
  #define RISC_ALIGNMENT
  #endif // IA64
  
 +#ifdef __alpha__

-+#define IMPLEMENTATION  isc_info_db_impl_linux_alpha  /* 77 */
++#define IMPLEMENTATION  isc_info_db_impl_linux_alpha  /* 82 */

 +#define RISC_ALIGNMENT
 +#endif
 +
 +#define RISC_ALIGNMENT
 +#endif
 +

- #define MEMMOVE(from, to, length)             memmove ((void *)to, (void *)from, (size_t) length)
- #define MOVE_FAST(from, to, length)       memcpy (to, from, (int) (length))
- #define MOVE_FASTER(from, to, length)     memcpy (to, from, (int) (length))
---- Firebird-2.1.1.17910-0/src/jrd/inf_pub.h.orig      2008-05-27 11:27:30.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/inf_pub.h   2008-07-18 22:40:03.810034707 +0200
-@@ -205,6 +205,7 @@ enum  info_db_implementations
+ #ifndef USE_POSIX_THREADS
+ // force pthread detection on Linux for distros that do not provide
+ // POSIX thread compatability
+--- Firebird-2.5.0.26074-0/src/jrd/inf_pub.h.orig      2010-09-08 10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/inf_pub.h   2010-10-28 07:52:00.183734339 +0200
+@@ -213,6 +213,7 @@

  
  

-       isc_info_db_impl_linux_arm = 75,
-       isc_info_db_impl_linux_ia64 = 76,
-+      isc_info_db_impl_linux_alpha = 77,
+       isc_info_db_impl_linux_sh = 80,
+       isc_info_db_impl_linux_sheb = 81,
++      isc_info_db_impl_linux_alpha = 82,

  
        isc_info_db_impl_last_value   // Leave this LAST!
  };
  
        isc_info_db_impl_last_value   // Leave this LAST!
  };

---- Firebird-2.1.1.17910-0/src/jrd/pag.cpp.orig        2008-05-27 11:27:37.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/pag.cpp     2008-07-18 22:42:52.586039735 +0200
-@@ -158,9 +158,10 @@ static const int CLASS_DARWIN_X64 = 31; 
- static const int CLASS_LINUX_ARM = 33;    // LINUX/ARM
- static const int CLASS_LINUX_IA64 = 34;    // LINUX/IA64
- static const int CLASS_DARWIN_PPC64 = 35; // Darwin/PowerPC64
-+static const int CLASS_LINUX_ALPHA = 36;    // LINUX/ALPHA
+--- Firebird-2.5.0.26074-0/src/jrd/pag.cpp.orig        2010-09-08 10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/pag.cpp     2010-10-28 07:58:22.771734339 +0200
+@@ -160,9 +160,10 @@
+ static const int CLASS_LINUX_S390 = 37;               // LINUX/s390
+ static const int CLASS_LINUX_SH = 38;         // LINUX/SH (little-endian)
+ static const int CLASS_LINUX_SHEB = 39;               // LINUX/SH (big-endian)
++static const int CLASS_LINUX_ALPHA = 40;      // LINUX/Alpha

  
  static const int CLASS_MAX10 = CLASS_LINUX_AMD64;     // This should not be changed, no new ports with ODS10
  
  static const int CLASS_MAX10 = CLASS_LINUX_AMD64;     // This should not be changed, no new ports with ODS10

--static const int CLASS_MAX = CLASS_DARWIN_PPC64;
+-static const int CLASS_MAX = CLASS_LINUX_SHEB;

 +static const int CLASS_MAX = CLASS_LINUX_ALPHA;
  
  // ARCHITECTURE COMPATIBILITY CLASSES
  
 +static const int CLASS_MAX = CLASS_LINUX_ALPHA;
  
  // ARCHITECTURE COMPATIBILITY CLASSES
  

-@@ -250,7 +251,8 @@ static ArchitectureType archMatrix[CLASS
-       archLittleEndian, // CLASS_SOLARIS_AMD64
-       archLittleEndian, // CLASS_LINUX_ARM
-       archLittleEndian, // CLASS_LINUX_IA64
--      archBigEndian     // CLASS_DARWIN_PPC64
-+      archBigEndian,    // CLASS_DARWIN_PPC64
+@@ -259,7 +260,8 @@
+       archBigEndian,    // CLASS_LINUX_S390X
+       archBigEndian,    // CLASS_LINUX_S390
+       archLittleEndian, // CLASS_LINUX_SH
+-      archBigEndian     // CLASS_LINUX_SHEB
++      archBigEndian,    // CLASS_LINUX_SHEB

 +      archLittleEndian  // CLASS_LINUX_ALPHA
  };
  
 +      archLittleEndian  // CLASS_LINUX_ALPHA
  };
  

- #ifdef sun
-@@ -308,6 +310,8 @@ const SSHORT CLASS         = CLASS_LINUX_MIPSEL
- const SSHORT CLASS            = CLASS_LINUX_MIPS;
- #elif defined(IA64)
- const SSHORT CLASS            = CLASS_LINUX_IA64;
+ #ifdef __sun
+@@ -319,6 +321,8 @@
+ const SSHORT CLASS            = CLASS_LINUX_SH;
+ #elif defined(SHEB)
+ const SSHORT CLASS            = CLASS_LINUX_SHEB;

 +#elif defined(__alpha__)
 +const SSHORT CLASS            = CLASS_LINUX_ALPHA;
  #else
  #error no support on other hardware for Linux
  #endif
 +#elif defined(__alpha__)
 +const SSHORT CLASS            = CLASS_LINUX_ALPHA;
  #else
  #error no support on other hardware for Linux
  #endif

---- Firebird-2.1.1.17910-0/src/remote/xdr.cpp.orig     2008-05-27 11:27:51.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/remote/xdr.cpp  2008-07-18 22:43:33.910037221 +0200
-@@ -42,7 +42,7 @@
- // select abs2(2.0 / 3.0) from rdb$database;
- // It will return big strange value in case of invalid define
- // ASF: Currently, all little-endian are SWAP_DOUBLE and big-endian aren't.
--#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64)
-+#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64) || defined(__alpha__)
- #define               SWAP_DOUBLE
- #elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__)
- #undef                SWAP_DOUBLE
---- Firebird-2.1.1.17910-0/src/jrd/utl.cpp.orig        2008-05-27 11:27:40.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/utl.cpp     2008-07-18 22:44:17.890038059 +0200
-@@ -243,7 +243,8 @@ static const TEXT* const impl_implementa
-     "Firebird/sun/amd64",     /* 74 */        
-     "Firebird/linux ARM",     /* 75 */
-     "Firebird/linux IA64",    /* 76 */
--      "Firebird/Darwin/PowerPC64"     /* 77 */
-+      "Firebird/Darwin/PowerPC64",    /* 77 */
-+    "Firebird/linux ALPHA"    /* 78 */
+--- Firebird-2.5.0.26074-0/src/jrd/utl.cpp.orig        2010-09-08 10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/utl.cpp     2010-10-28 07:57:59.231736853 +0200
+@@ -225,7 +225,8 @@
+       "Firebird/linux s390x",                 // 78
+       "Firebird/linux s390",                  // 79
+       "Firebird/linux SH",                    // 80
+-      "Firebird/linux SHEB"                   // 81
++      "Firebird/linux SHEB",                  // 81
++      "Firebird/linux Alpha"                  // 82

  };
  
  
  };
  
  

diff --git a/Firebird-noroot.patch b/Firebird-noroot.patch
new file mode 100644 (file)
index 0000000..a5a4473
--- /dev/null
+++ b/Firebird-noroot.patch
@@ -0,0 +1,135 @@
+--- Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig 2010-09-08 10:41:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in      2010-10-28 20:58:38.779734339 +0200
+@@ -28,11 +28,6 @@
+ # This script builds an image of the installed system into 
+ # the gen/buildroot directory.
+ 
+-if [ "`whoami`" != "root" ]; then
+-      echo 'You must be root to build package'
+-      exit 1
+-fi
+-
+ # Making an assumption that this program is being run in the gen directory
+ BuildRootDir=..
+ BuiltFBDir=./firebird  # Where the just build fb exists.
+@@ -113,7 +108,6 @@
+       for d in $Dirs; do
+               Dir=${TargetDir}${d}
+               mkdir -p $Dir
+-              chown root:root $Dir
+               chmod 0755 $Dir
+       done
+ }
+@@ -158,7 +152,6 @@
+     cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql 
+     cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli 
+ 
+-      chown root:root ${TargetDir}@FB_BINDIR@/*
+       chmod 0755 ${TargetDir}@FB_BINDIR@/*
+ 
+       #sbin
+@@ -177,7 +170,6 @@
+     cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
+     cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
+ 
+-      chown root:root ${TargetDir}@FB_SBINDIR@/*
+       chmod 0755 ${TargetDir}@FB_SBINDIR@/*
+       chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
+ 
+@@ -201,19 +193,16 @@
+ 
+           for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type d -print`
+           do
+-                      chown root:root $i
+               chmod 0555 $i
+           done
+           for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type f -print`
+           do
+-                      chown root:root $i
+               chmod 0444 $i
+           done
+ 
+               makeDirs @FB_SAMPLEDBDIR@
+               cp $BuiltFBDir/examples/empbuild/*.fdb ${TargetDir}@FB_SAMPLEDBDIR@
+ 
+-              chown root:root ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
+               chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
+     fi
+ 
+@@ -221,13 +210,11 @@
+     copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@
+     cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@
+ 
+-      chown root:root ${TargetDir}@FB_HELPDIR@/*.fdb
+       chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb
+       
+       #message file
+     cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@
+ 
+-      chown root:root ${TargetDir}@FB_MSGDIR@/*.msg
+       chmod 0444 ${TargetDir}@FB_MSGDIR@/*.msg
+ 
+       #secureDB (access rights will be set at install time)
+@@ -236,7 +223,6 @@
+       #.h files
+     cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@
+ 
+-      chown root:root ${TargetDir}@FB_INCDIR@/*.h
+       chmod 0444 ${TargetDir}@FB_INCDIR@/*.h
+ 
+       #lib
+@@ -245,20 +231,17 @@
+     cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so
+     copyIfExists $BuiltFBDir/lib/libicu*.so* ${TargetDir}@FB_LIBDIR@
+ 
+-      chown root:root ${TargetDir}@FB_LIBDIR@/*.so*
+       chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so*
+ 
+       #plugins
+       cp -df $BuiltFBDir/plugins/* ${TargetDir}@FB_PLUGDIR@
+ 
+-      chown root:root ${TargetDir}@FB_PLUGDIR@/*.so*
+       chmod 0755 ${TargetDir}@FB_PLUGDIR@/*.so*
+ 
+       #intl
+     cp $BuiltFBDir/intl/libfbintl.so ${TargetDir}@FB_INTLDIR@/fbintl
+     cp $BuildRootDir/gen/install/misc/fbintl.conf ${TargetDir}@FB_INTLDIR@
+ 
+-      chown root:root ${TargetDir}@FB_INTLDIR@/fbintl*
+       chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl
+       chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf
+ 
+@@ -271,7 +254,6 @@
+     cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@
+     cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@
+ 
+-      chown root:root ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql
+       chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so
+       chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql
+           
+@@ -282,9 +264,7 @@
+     cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew
+     cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README
+     
+-      chown -R root:root ${TargetDir}@FB_MISCDIR@
+       for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do
+-              chown root:root $i
+               if [ -d $i ]; then
+                       chmod 0755 $i
+               else
+@@ -301,7 +281,6 @@
+       cp $BuildRootDir/gen/install/misc/firebird.init.d.*                     ${TargetDir}@FB_MISCDIR@
+       cp $BuildRootDir/gen/install/misc/rc.config.firebird            ${TargetDir}@FB_MISCDIR@
+ 
+-      chown -R root:root ${TargetDir}@FB_MISCDIR@
+       chmod -R go-rwx ${TargetDir}@FB_MISCDIR@
+ 
+       #conf
+@@ -309,7 +288,6 @@
+     cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@
+     cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@
+ 
+-      chown root:root ${TargetDir}@FB_CONFDIR@/*.conf
+       chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf
+ 
+ # Create links from @libdir@ to install area.

diff --git a/Firebird-opt.patch b/Firebird-opt.patch
index 67bc25881bf19762cbaa0091b11be88e59423a71..a2e0d883b82bce86381e94a700785a048979f231 100644 (file)
--- a/Firebird-opt.patch
+++ b/Firebird-opt.patch
@@ -1,11 +1,11 @@
---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux.orig      2007-05-03 13:24:50.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux   2010-08-29 10:48:00.738823295 +0200
-@@ -21,8 +21,8 @@
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
+--- Firebird-2.5.0.26074-0/builds/posix/prefix.linux.orig      2010-09-08 10:41:23.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux   2010-10-28 08:55:49.323734339 +0200
+@@ -18,8 +18,8 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup

  
 -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
  
 -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0

--OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
+-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer

 +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable


@@ -101,21 +101,21 @@
  
  OS_ServerFiles=inet_server.cpp
  
  
  OS_ServerFiles=inet_server.cpp
  

---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc.orig      2007-05-03 13:24:50.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc   2010-08-29 11:01:16.790816591 +0200
+--- Firebird-2.5.0.26074-0/builds/posix/prefix.linux_powerpc.orig      2010-09-08 10:41:23.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_powerpc   2010-10-28 09:02:24.423734339 +0200

 @@ -18,9 +18,12 @@
  #
  # 2 Oct 2002, Nickolay Samofatov - Major cleanup
  
 -PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc
 @@ -18,9 +18,12 @@
  #
  # 2 Oct 2002, Nickolay Samofatov - Major cleanup
  
 -PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc

--DEV_FLAGS=-ggdb -O0 -DVIO_DEBUG -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC
+-DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC

 -#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC
 +COMMON_FLAGS=@CFLAGS@ -DLINUX -DPowerPC -DPPC -fsigned-char -pipe -MMD -fPIC -fmessage-length=0
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer
 +WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 +
 +PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
 -#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC
 +COMMON_FLAGS=@CFLAGS@ -DLINUX -DPowerPC -DPPC -fsigned-char -pipe -MMD -fPIC -fmessage-length=0
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer
 +WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 +
 +PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)

-+DEV_FLAGS=-DVIO_DEBUG -p $(COMMON_FLAGS) $(WARN_FLAGS)
++DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)

  
  OS_ServerFiles=inet_server.cpp
  
  
  OS_ServerFiles=inet_server.cpp
  

diff --git a/Firebird-rpath.patch b/Firebird-rpath.patch
index 536aecd306ddd2f1652b50e9996cd11e655cb363..8e13a04a2000e9f0d92078aadd6436b9d02a626f 100644 (file)
--- a/Firebird-rpath.patch
+++ b/Firebird-rpath.patch
@@ -1,86 +1,11 @@
---- Firebird-2.1.3.18185-0/builds/posix/make.defaults.orig     2010-08-29 11:10:54.542824134 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/make.defaults  2010-08-29 12:30:20.570823295 +0200
-@@ -254,7 +254,7 @@
- ifneq ($(IsProdTypeBuild),Y)
-   UNDEF_FLAGS = $(UNDEF_PLATFORM)
- endif
--LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/intl  
-+LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS)
- LIB_LINK_OPTIONS = $(LDFLAGS) $(UNDEF_FLAGS) -shared
- 
- LIB_LINK_RPATH = -Wl,-rpath,
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib.orig        2007-08-14 13:06:35.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib     2010-08-29 13:57:29.034820781 +0200
-@@ -82,7 +82,7 @@ ifeq ($(PLATFORM),DARWIN)
- -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
-       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+      -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
- # ib_util
- # this is plain-C library, therefore CLIENTLIB_LINK 
-@@ -96,7 +96,7 @@ ifeq ($(PLATFORM),DARWIN)
- -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
-       $(CLIENTLIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(IbUtilLibraryName) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+      -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
- 
- include $(ROOT)/gen/make.shared.targets
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient.orig   2007-08-14 13:06:35.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient        2010-08-29 13:58:09.594823295 +0200
-@@ -116,7 +116,7 @@ $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SO
- -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
-       $(CLIENTLIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
--$(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
-+      $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) \
- -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
- 
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed.orig    2007-06-11 16:21:17.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed 2010-08-29 13:58:32.394816591 +0200
-@@ -68,7 +68,7 @@ $(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SON
- -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
- else
-       $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
-+      -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
- endif
- $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
-       (cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf.orig   2007-03-11 04:52:15.000000000 +0100
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf        2010-08-29 19:06:58.122816591 +0200
-@@ -74,7 +74,7 @@
- -lm -o $@ $^
- else
-       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -lm -o $@ $^
-+      -lm -o $@ $^
- endif
- 
- 
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf.orig  2007-03-09 11:32:47.000000000 +0100
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf       2010-08-29 19:06:42.678823295 +0200
-@@ -88,7 +88,7 @@
- -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
-       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+      -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
- 
- 
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl.orig  2007-05-11 08:40:19.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl       2010-08-29 19:04:33.874816591 +0200
-@@ -89,7 +89,7 @@
- -o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+--- Firebird-2.5.0.26074-0/builds/posix/make.defaults.orig     2010-10-28 09:05:38.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/make.defaults  2010-10-28 09:17:10.475739367 +0200
+@@ -259,7 +259,7 @@

  else
  else

-       $(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)libintl.$(SHRLIB_EXT).1 \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+      -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$$$ORIGIN/../$(1)')

  endif
  endif

- 
- include $(ROOT)/gen/make.shared.targets
+-LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
++LIB_PATH_OPTS =
+ LIB_LINK_SONAME= -Wl,-soname,$(1)
+ LIB_LINK_MAPFILE= -Wl,--version-script,
+ FBEMBED_LINK= -L$(LIB) -lfbembed

diff --git a/Firebird.spec b/Firebird.spec
index 4c8b0f3011930e7cc8141a55e1f070e7ad88089e..3cbcee7799346d904ef17b89b3c231951d52e89c 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -13,14 +13,14 @@ Summary(de.UTF-8):  Firebird - relationalen Open-Source- Datenbankmanagementsyste
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?

-Version:       2.1.3.18185
-Release:       3
+Version:       2.5.0.26074
+Release:       1

 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
 Source0:       http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2
 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
 Source0:       http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2

-# Source0-md5: ec42bd5c85dc2f65baef185228bcc5ca
-Source1:       http://www.firebirdsql.org/pdfmanual/%{name}-2.1-QuickStart.pdf
-# Source1-md5: 46bb1af4b94e8c8acee1d6ef2055b2d3
+# Source0-md5: 780f162ee71f087fc277adf09f966529
+Source1:       http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
+# Source1-md5: a7776f1eae45ba0b2543c203cd5271ae

 # distfiles refuses this, would require some audit to allow '('/')' chars
 #Source2:      http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
 ## Source2-md5:        9eb90583c200bdd7292a80ecc1df1178
 # distfiles refuses this, would require some audit to allow '('/')' chars
 #Source2:      http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
 ## Source2-md5:        9eb90583c200bdd7292a80ecc1df1178


@@ -51,10 +51,12 @@ Patch6:             %{name}-gcc-icu.patch
 Patch7:                %{name}-btyacc-segv.patch
 Patch8:                %{name}-opt.patch
 Patch9:                %{name}-rpath.patch
 Patch7:                %{name}-btyacc-segv.patch
 Patch8:                %{name}-opt.patch
 Patch9:                %{name}-rpath.patch

+Patch10:       %{name}-noroot.patch

 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
 BuildRequires: bison
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
 BuildRequires: bison

+BuildRequires: libatomic_ops

 BuildRequires: libedit-devel
 BuildRequires: libicu-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libedit-devel
 BuildRequires: libicu-devel
 BuildRequires: libstdc++-devel


@@ -171,11 +173,7 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1

-
-%{__sed} -i 's,@prefix@,%{_prefix},' builds/install/misc/fb_config.in
-
-# force rebuild
-rm -f src/dsql/parse.cpp
+%patch10 -p1

 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs


@@ -191,6 +189,10 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
 
 %configure \
        --with-editline \
 
 %configure \
        --with-editline \

+       --with-fbconf=%{_sysconfdir}/firebird \
+       --with-fblib=%{_libdir} \
+       --with-fblog=/var/log \
+       --with-fbsecure-db=/var/lib/firebird \

        --with-gnu-ld \
        --with-gpre-pascal \
        --with-system-editline \
        --with-gnu-ld \
        --with-gpre-pascal \
        --with-system-editline \


@@ -215,15 +217,16 @@ install -d $RPM_BUILD_ROOT/var/{log,lib/firebird} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}

-install gen/firebird/lib/libfbembed.so* $RPM_BUILD_ROOT%{_libdir}

 touch $RPM_BUILD_ROOT/var/log/firebird.log
 
 touch $RPM_BUILD_ROOT/var/log/firebird.log
 

-cd gen/buildroot/%{ibdir}
-install security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
-install *.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+cd gen/buildroot
+install var/lib/firebird/security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
+install etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+cp -df usr/lib/*.so* $RPM_BUILD_ROOT%{_libdir}
+cd .%{ibdir}

 install include/* $RPM_BUILD_ROOT%{_includedir}
 install include/* $RPM_BUILD_ROOT%{_includedir}

-cp -af UDF bin help intl firebird.msg $RPM_BUILD_ROOT%{ibdir}
-cp -df lib/* $RPM_BUILD_ROOT%{_libdir}
+cp -af UDF bin help intl plugins firebird.msg de_DE.msg fr_FR.msg $RPM_BUILD_ROOT%{ibdir}
+chmod 755 examples examples/{api,dyn,include,stat,udf} # allow further cleaning

 cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # or libfbembed?
 cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # or libfbembed?


@@ -232,8 +235,8 @@ ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so
 
 ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
 
 
 ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
 

-for f in bin/{fb_lock_print,gbak,gdef,gds_drop,gfix,gpre,gsec,gsplit,gstat,nbackup}; do
-       ln -sf %{ibdir}/$f $RPM_BUILD_ROOT%{_bindir}/$ff
+for f in bin/{fb_lock_print,gbak,gdef,gfix,gpre,gsec,gsplit,gstat,nbackup}; do
+       ln -sf %{ibdir}/$f $RPM_BUILD_ROOT%{_bindir}/${f#bin/}

 done
 
 %if %{with ss}
 done
 
 %if %{with ss}


@@ -286,9 +289,17 @@ fi
 %defattr(644,root,root,755)
 %doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
 %dir %{_sysconfdir}/firebird
 %defattr(644,root,root,755)
 %doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
 %dir %{_sysconfdir}/firebird

-%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/*.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/aliases.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/fbtrace.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/firebird.conf

 %attr(755,root,root) %{_bindir}/fb_lock_print
 %attr(755,root,root) %{_bindir}/fb_lock_print

-%attr(755,root,root) %{_bindir}/g*
+%attr(755,root,root) %{_bindir}/gbak
+%attr(755,root,root) %{_bindir}/gdef
+%attr(755,root,root) %{_bindir}/gfix
+%attr(755,root,root) %{_bindir}/gpre
+%attr(755,root,root) %{_bindir}/gsec
+%attr(755,root,root) %{_bindir}/gsplit
+%attr(755,root,root) %{_bindir}/gstat

 %attr(755,root,root) %{_bindir}/nbackup
 %attr(755,root,root) %{_libdir}/libib_util.so
 %attr(755,root,root) %{ibdir}/UDF
 %attr(755,root,root) %{_bindir}/nbackup
 %attr(755,root,root) %{_libdir}/libib_util.so
 %attr(755,root,root) %{ibdir}/UDF


@@ -299,7 +310,11 @@ fi
 %attr(755,root,root) %{ibdir}/intl/fbintl
 # should it be moved to %{_sysconfdir} and marked as config?
 %{ibdir}/intl/fbintl.conf
 %attr(755,root,root) %{ibdir}/intl/fbintl
 # should it be moved to %{_sysconfdir} and marked as config?
 %{ibdir}/intl/fbintl.conf

+%dir %{ibdir}/plugins
+%attr(755,root,root) %{ibdir}/plugins/libfbtrace.so

 %{ibdir}/firebird.msg
 %{ibdir}/firebird.msg

+%lang(de) %{ibdir}/de_DE.msg
+%lang(fr) %{ibdir}/fr_FR.msg

 %dir %attr(770,root,firebird) /var/lib/firebird
 %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security2.fdb
 %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log
 %dir %attr(770,root,firebird) /var/lib/firebird
 %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security2.fdb
 %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log


@@ -321,7 +336,7 @@ fi
 %attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfbclient.so.2
 %attr(755,root,root) %{_libdir}/libfbembed.so.*.*.*
 %attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfbclient.so.2
 %attr(755,root,root) %{_libdir}/libfbembed.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.2.1
+%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.2.5

 
 # InterBase/old Firebird compatibility symlinks
 %attr(755,root,root) %{_libdir}/libgds.so.0
 
 # InterBase/old Firebird compatibility symlinks
 %attr(755,root,root) %{_libdir}/libgds.so.0