- updated to 2.5.4.26856

- updated FHS,opt patches

diff --git a/Firebird-FHS.patch b/Firebird-FHS.patch
index 71a14705b857dc5112b2da883c01b9aebe6e5ee2..e00078cc0fdae0e11364438485b03f20458f8bda 100644 (file)
--- a/Firebird-FHS.patch
+++ b/Firebird-FHS.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- Firebird-2.5.4.26856-0/src/jrd/gds.cpp.orig        2015-05-29 20:19:05.329013419 +0200
++++ Firebird-2.5.4.26856-0/src/jrd/gds.cpp     2015-05-29 20:33:36.775643514 +0200
+@@ -1754,7 +1754,13 @@

  
        GDS_init_prefix();
  
  
        GDS_init_prefix();
  


@@ -11,9 +11,10 @@
 +              strcpy(string, lockdir);
 +      else
 +              strcpy(string, fb_prefix_lock); // safe - no BO
 +              strcpy(string, lockdir);
 +      else
 +              strcpy(string, fb_prefix_lock); // safe - no BO

++
+       iscSafeConcatPath(string, root);
+ }

  
  

-       // 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 @@
 --- 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 @@

diff --git a/Firebird-opt.patch b/Firebird-opt.patch
index f0b29eb3260148b5c7666305c16bbc0f6f2026fa..664329abb4008f7a947fb16c2127ee4a3afdabf2 100644 (file)
--- a/Firebird-opt.patch
+++ b/Firebird-opt.patch
@@ -42,14 +42,14 @@
  
  OS_ServerFiles=inet_server.cpp
  
  
  OS_ServerFiles=inet_server.cpp
  

---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_generic.orig      2007-05-03 13:24:50.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_generic   2010-08-29 10:50:59.358822457 +0200
+--- Firebird-2.5.4.26856-0/builds/posix/prefix.linux_generic.orig      2015-05-29 20:34:21.678974963 +0200
++++ Firebird-2.5.4.26856-0/builds/posix/prefix.linux_generic   2015-05-29 20:50:50.918933450 +0200

 @@ -18,10 +18,11 @@
  #
  # 2 Oct 2002, Nickolay Samofatov - Major cleanup
  
 @@ -18,10 +18,11 @@
  #
  # 2 Oct 2002, Nickolay Samofatov - Major cleanup
  

--COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
+-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fsigned-char
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fsigned-char

 +OPTIMIZE_FLAGS=
  
 -PROD_FLAGS=-ggdb -O3 -DNDEBUG $(COMMON_FLAGS)
 +OPTIMIZE_FLAGS=
  
 -PROD_FLAGS=-ggdb -O3 -DNDEBUG $(COMMON_FLAGS)

diff --git a/Firebird.spec b/Firebird.spec
index e4a88e0bab401f53fbc905e4baf28e97c20afafa..ea9fda505b1e5a6b117f9d409e9e8ff3a0aa27b2 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -13,12 +13,12 @@ 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.5.2.26540
-Release:       5
+Version:       2.5.4.26856
+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: 21154d2004e025c8a3666625b0357bb5
+# Source0-md5: 7a17ec9889424b98baa29e001a054434

 Source1:       http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
 # Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
 # distfiles refuses this, would require some audit to allow '('/')' chars
 Source1:       http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
 # Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
 # distfiles refuses this, would require some audit to allow '('/')' chars