- updated to 3.0.3.32900

diff --git a/Firebird-opt.patch b/Firebird-opt.patch
index a68d955f0104a6a1a8f6ae4dacb5f4e241f2505c..a1533416bacc9d2919b79895c0b483edbc339a24 100644 (file)
--- a/Firebird-opt.patch
+++ b/Firebird-opt.patch
@@ -1,25 +1,25 @@
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux.orig      2016-08-31 20:27:07.834426824 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux   2016-08-31 20:30:34.847757793 +0200
+--- Firebird-3.0.3.32900-0/builds/posix/prefix.linux.orig      2018-02-06 10:17:17.200397879 +0100
++++ Firebird-3.0.3.32900-0/builds/posix/prefix.linux   2018-02-06 10:23:07.027756831 +0100
 @@ -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 -std=gnu++03 -fno-delete-null-pointer-checks
 -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
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
  
  PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_amd64.orig        2016-08-31 20:27:07.834426824 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_amd64     2016-08-31 20:38:55.474418743 +0200
+--- Firebird-3.0.3.32900-0/builds/posix/prefix.linux_amd64.orig        2018-02-06 10:17:17.200397879 +0100
++++ Firebird-3.0.3.32900-0/builds/posix/prefix.linux_amd64     2018-02-06 10:26:29.919529687 +0100
 @@ -18,8 +18,8 @@
  #
  # 2 Oct 2002, Nickolay Samofatov - Major cleanup
  
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks
 -OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks
 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer 
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs
  
@@ -55,14 +55,14 @@
 -DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
 +PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
 +DEV_FLAGS=$(COMMON_FLAGS) -Wall -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_generic.orig      2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_generic   2016-08-31 20:52:54.584409169 +0200
+--- Firebird-3.0.3.32900-0/builds/posix/prefix.linux_generic.orig      2018-02-06 10:17:17.200397879 +0100
++++ Firebird-3.0.3.32900-0/builds/posix/prefix.linux_generic   2018-02-06 10:28:29.771946030 +0100
 @@ -18,7 +18,8 @@
  #
  # 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 -std=gnu++03 -fno-delete-null-pointer-checks
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -std=gnu++03 -fno-delete-null-pointer-checks
 +OPTIMIZE_FLAGS=
  
 -PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)

diff --git a/Firebird.spec b/Firebird.spec
index cb1e3367fffa930af06e5bb19263f6c4b6daa472..288d44f3396489d454c70221cfc19f65561ebef9 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -15,12 +15,12 @@ Summary:    Firebird SQL Database Server and Client tools
 Summary(de.UTF-8):     Firebird - relationalen Open-Source- Datenbankmanagementsystems
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
-Version:       3.0.2.32703
+Version:       3.0.3.32900
 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
-# Source0-md5: 1fdc121ab04d2c2772d778e45ecd5689
+Source0:       https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/%{name}-%{version}-0.tar.bz2
+# Source0-md5: 52b00b8d24ee5f996a35b55675c0a3e0
 Source1:       http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/Firebird-3-QuickStart.pdf
 # Source1-md5: 8e029d449e9cb3e1da8213ac6c11ad02
 # distfiles refuses this, would require some audit to allow '('/')' chars
@@ -56,11 +56,11 @@ Patch3:             %{name}-FHS.patch
 Patch4:                %{name}-opt.patch
 Patch5:                %{name}-gcc-icu.patch
 Patch6:                %{name}-libpath.patch
-Patch7:                Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
 Patch8:                Provide-sized-global-delete-operators-when-compiled.patch
 Patch9:                parallel-build.patch
 Patch10:       no-copy-from-icu.patch
 Patch11:       config.patch
+Patch12:       chown.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.67
 BuildRequires: automake
@@ -194,11 +194,11 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
@@ -354,7 +354,7 @@ fi
 %exclude %{ibdir}/bin/gpre
 %exclude %{ibdir}/bin/fbguard
 %{ibdir}/help
-%dir %attr(770,root,firebird) %{ibdir}/intl
+%dir %{ibdir}/intl
 %attr(755,root,root) %{ibdir}/intl/fbintl
 # should it be moved to %{_sysconfdir} and marked as config?
 %{ibdir}/intl/fbintl.conf

diff --git a/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch b/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
deleted file mode 100644 (file)
index 981b09b..0000000
--- a/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: asfernandes <asfernandes@users.sourceforge.net>
-Date: Sat, 5 Mar 2016 03:39:36 +0000
-Subject: Make the generated code compatible with gcc 6 in C++-14 mode.
- (cherry picked from commit 3618aa2171674babf79ef935aa049c40a3db1321)
-Patch-mainline: 
-Git-commit: 3618aa2171674babf79ef935aa049c40a3db1321
-References: bsc#964466 CORE-5099
-
----
- src/gpre/c_cxx.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
-index df175dca9465..bafce8f282bf 100644
---- a/src/gpre/c_cxx.cpp
-+++ b/src/gpre/c_cxx.cpp
-@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
-               printa(0, "static %sshort\n   isc_%dl = %d;",
-                          (request->req_flags & REQ_extend_dpb) ? "" : CONST_STR,
-                          request->req_ident, request->req_length);
--              printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, request->req_ident);
-+              printa(0, "static %sunsigned char\n   isc_%d [] = {", CONST_STR, request->req_ident);
- 
-               const TEXT* string_type = "blr";
-               if (gpreGlob.sw_raw)
--- 
-2.8.2
-
-

diff --git a/chown.patch b/chown.patch
new file mode 100644 (file)
index 0000000..ed3312c
--- /dev/null
+++ b/chown.patch
@@ -0,0 +1,11 @@
+--- Firebird-3.0.2.32703-0/src/common/os/posix/os_utils.cpp.orig       2017-03-21 10:11:35.000000000 +0100
++++ Firebird-3.0.2.32703-0/src/common/os/posix/os_utils.cpp    2017-04-10 11:47:34.434975291 +0200
+@@ -123,7 +123,7 @@
+       void changeFileRights(const char* pathname, const mode_t mode)
+       {
+               uid_t uid = geteuid() == 0 ? get_user_id(FIREBIRD) : -1;
+-              gid_t gid = get_user_group_id(FIREBIRD);
++              gid_t gid = geteuid() == 0 ? get_user_group_id(FIREBIRD) : -1;
+               while (chown(pathname, uid, gid) < 0 && SYSCALL_INTERRUPTED(errno))
+                       ;
+