new upstream release 3.0.1.32609

4 files changed, 75 insertions, 47 deletions

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
new file mode 100644
index 0000000..981b09b
--- /dev/null
+++ b/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
@@ -0,0 +1,29 @@
+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/Provide-sized-global-delete-operators-when-compiled.patch b/Provide-sized-global-delete-operators-when-compiled.patch
new file mode 100644
index 0000000..1302d1d
--- /dev/null
+++ b/Provide-sized-global-delete-operators-when-compiled.patch
@@ -0,0 +1,36 @@
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Mon, 25 Apr 2016 08:55:36 +0200
+Subject: Provide sized global delete operators when compiled in C++14 mode
+Patch-mainline: submitted
+Git-commit: 038f9fbf559e56032e4cb49eb7ce4c3ead23fda9
+References: bsc#964466 CORE-5099
+
+---
+ src/common/classes/alloc.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
+index b1026ce2aac4..fda5bfebb0cc 100644
+--- a/src/common/classes/alloc.h
++++ b/src/common/classes/alloc.h
+@@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS
+ 	MemoryPool::globalFree(mem);
+ }
+ 
++#if __cplusplus >= 201402L
++inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw()
++{
++	MemoryPool::globalFree(mem);
++}
++inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw()
++{
++	MemoryPool::globalFree(mem);
++}
++#endif
+ #ifdef DEBUG_GDS_ALLOC
+ 
+ #ifdef __clang__
+-- 
+2.8.2
+
+
diff --git a/allow-creating-buildRoot-as-non-root-user.patch b/allow-creating-buildRoot-as-non-root-user.patch
deleted file mode 100644
index c03ea41..0000000
--- a/allow-creating-buildRoot-as-non-root-user.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 87f1db15ab56ab5d6f9b459fa93b6f86b5213f63 Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Tue, 12 Jun 2012 14:05:11 +0200
-Subject: [PATCH 1/7] allow creating buildRoot as non-root user
-
-Do not use chown in "make buildRoot" so that it doesn't require
-to be run as root.
----
- builds/install/arch-specific/linux/makeInstallImage.sh.in | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in
-index 612e88e..03928a1 100644
---- a/builds/install/arch-specific/linux/makeInstallImage.sh.in
-+++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in
-@@ -28,10 +28,15 @@
- # 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
-+#if [ "`whoami`" != "root" ]; then
-+#	echo 'You must be root to build package'
-+#	exit 1
-+#fi
-+
-+function chown
-+{
-+  :
-+}
- 
- # Making an assumption that this program is being run in the gen directory
- BuildRootDir=..
--- 
-1.8.4.5
-
-
-
diff --git a/firebird.spec b/firebird.spec
index bc2bd1e..ed408af 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,4 +1,4 @@
-%global         upversion 3.0.0.32483
+%global         upversion 3.0.1.32609
 %global         pkgversion Firebird-%{upversion}-0
 
 %global         major 3.0
@@ -21,14 +21,14 @@ Source3:        firebird.conf
 Source4:        fb_config
 
 # from OpenSuse
-Patch101:       allow-creating-buildRoot-as-non-root-user.patch
-Patch102:       add-pkgconfig-files.patch
+Patch101:       add-pkgconfig-files.patch
+Patch102:       Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
+Patch103:       Provide-sized-global-delete-operators-when-compiled.patch
 
 # from Debian to be sent upstream
 Patch201:       obsolete-syslogd.target.patch
 Patch202:       honour-buildflags.patch
 Patch203:       no-copy-from-icu.patch
-Patch204:       parallel-build.patch
 Patch205:       cloop-honour-build-flags.patch
 
 # from upstream
@@ -201,10 +201,10 @@ in production systems, under a variety of names, since 1981.
 %setup -q -n %{pkgversion}
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 %patch201 -p1
 %patch202 -p1
 %patch203 -p1
-%patch204 -p1
 %patch205 -p1
 
 
@@ -334,8 +334,8 @@ fi
 %dir %{_localstatedir}/lib/%{name}/data
 %dir %{_localstatedir}/lib/%{name}/system
 %attr(0600,firebird,firebird) %config(noreplace) %{_localstatedir}/lib/%{name}/secdb/security3.fdb
-%attr(0600,firebird,firebird) %{_localstatedir}/lib/%{name}/system/help.fdb
-%attr(0600,firebird,firebird) %{_localstatedir}/lib/%{name}/system/firebird.msg
+%attr(0644,firebird,firebird) %{_localstatedir}/lib/%{name}/system/help.fdb
+%attr(0644,firebird,firebird) %{_localstatedir}/lib/%{name}/system/firebird.msg
 %ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
 %ghost %attr(0644,%{name},%{name}) %{_var}/run/%{name}/fb_guard
 %attr(0644,root,root) %{_tmpfilesdir}/firebird.conf 
@@ -397,6 +397,9 @@ fi
 
 
 %changelog
+* Fri Sep 30 2016 Philippe Makowski <makowski@fedoraproject.org> - 3.0.1.32609-1
+- new upstream release
+
 * Fri Apr 15 2016 Philippe Makowski <makowski@fedoraproject.org> - 3.0.0.32483-1
 - new upstream release