diff --git a/0001-Port-to-RISC-V-64-bit-riscv64.patch b/0001-Port-to-RISC-V-64-bit-riscv64.patch deleted file mode 100644 index 6fcc1fc644ef34d01d803c617430543d069007b9..0000000000000000000000000000000000000000 --- a/0001-Port-to-RISC-V-64-bit-riscv64.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -urN Firebird-3.0.3.32900-0.old/builds/posix/prefix.linux_riscv64 Firebird-3.0.3.32900-0/builds/posix/prefix.linux_riscv64 ---- Firebird-3.0.3.32900-0.old/builds/posix/prefix.linux_riscv64 1970-01-01 01:00:00.000000000 +0100 -+++ Firebird-3.0.3.32900-0/builds/posix/prefix.linux_riscv64 2018-03-19 08:56:57.254118156 +0000 -@@ -0,0 +1,26 @@ -+# The contents of this file are subject to the Interbase Public -+# License Version 1.0 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy -+# of the License at http://www.Inprise.com/IPL.html -+# -+# Software distributed under the License is distributed on an -+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express -+# or implied. See the License for the specific language governing -+# rights and limitations under the License. -+# -+# The Original Code was created by Inprise Corporation -+# and its predecessors. Portions created by Inprise Corporation are -+# Copyright (C) Inprise Corporation. -+# -+# All Rights Reserved. -+# Contributor(s): ______________________________________. -+# Start of file prefix.linux: $(VERSION) $(PLATFORM) -+# -+# Richard W.M. Jones, Red Hat Inc. -+ -+WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs -+ -+PROD_FLAGS=-O3 -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -+DEV_FLAGS=-ggdb -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 $(WARN_FLAGS) -+ -+CXXFLAGS := $(CXXFLAGS) -std=c++11 -diff -urN Firebird-3.0.3.32900-0.old/configure.ac Firebird-3.0.3.32900-0/configure.ac ---- Firebird-3.0.3.32900-0.old/configure.ac 2018-03-19 08:56:23.222156918 +0000 -+++ Firebird-3.0.3.32900-0/configure.ac 2018-03-19 08:56:57.254118156 +0000 -@@ -251,6 +251,18 @@ - libdir=/usr/lib64 - ;; - -+ riscv64*-*-linux*) -+ MAKEFILE_PREFIX=linux_riscv64 -+ INSTALL_PREFIX=linux -+ PLATFORM=LINUX -+ AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) -+ EDITLINE_FLG=Y -+ SHRLIB_EXT=so -+ STD_EDITLINE=true -+ STD_ICU=true -+ libdir=/usr/lib64 -+ ;; -+ - powerpc64le-*-linux*) - MAKEFILE_PREFIX=linux_powerpc64el - INSTALL_PREFIX=linux -diff -urN Firebird-3.0.3.32900-0.old/src/common/classes/DbImplementation.cpp Firebird-3.0.3.32900-0/src/common/classes/DbImplementation.cpp ---- Firebird-3.0.3.32900-0.old/src/common/classes/DbImplementation.cpp 2018-02-02 11:00:35.000000000 +0000 -+++ Firebird-3.0.3.32900-0/src/common/classes/DbImplementation.cpp 2018-03-19 08:56:57.254118156 +0000 -@@ -49,6 +49,7 @@ - static const UCHAR CpuArm64 = 15; - static const UCHAR CpuPowerPc64el = 16; - static const UCHAR CpuM68k = 17; -+static const UCHAR CpuRiscV64 = 18; - - static const UCHAR OsWindows = 0; - static const UCHAR OsLinux = 1; -@@ -89,7 +90,8 @@ - "Alpha", - "ARM64", - "PowerPC64el", -- "M68k" -+ "M68k", -+ "RiscV64" - }; - - const char* operatingSystem[] = { -@@ -116,22 +118,22 @@ - // This table lists pre-fb3 implementation codes - const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELEM(operatingSystem)] = - { --// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el --/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* Linux */ 60, 66, 65, 69, 86, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, 85, --/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, --/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, --/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -+// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el RiscV64 -+/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* Linux */ 60, 66, 65, 69, 86, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, 85, 88, -+/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, -+/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - - const UCHAR backEndianess[FB_NELEM(hardware)] = - { --// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el M68k -- 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1 -+// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el M68k RiscV64 -+ 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, - }; - - } // anonymous namespace -diff -urN Firebird-3.0.3.32900-0.old/src/common/common.h Firebird-3.0.3.32900-0/src/common/common.h ---- Firebird-3.0.3.32900-0.old/src/common/common.h 2018-03-19 08:56:23.377156741 +0000 -+++ Firebird-3.0.3.32900-0/src/common/common.h 2018-03-19 08:56:57.255118154 +0000 -@@ -135,6 +135,10 @@ - #define FB_CPU CpuArm64 - #endif /* ARM64 */ - -+#ifdef RISCV64 -+#define FB_CPU CpuRiscV64 -+#endif /* RISCV64 */ -+ - #ifdef sparc - #define FB_CPU CpuUltraSparc - #define RISC_ALIGNMENT -diff -urN Firebird-3.0.3.32900-0.old/src/jrd/inf_pub.h Firebird-3.0.3.32900-0/src/jrd/inf_pub.h ---- Firebird-3.0.3.32900-0.old/src/jrd/inf_pub.h 2018-02-02 11:00:36.000000000 +0000 -+++ Firebird-3.0.3.32900-0/src/jrd/inf_pub.h 2018-03-19 08:56:57.255118154 +0000 -@@ -245,7 +245,7 @@ - isc_info_db_impl_linux_ppc64el = 85, - isc_info_db_impl_linux_ppc64 = 86, - isc_info_db_impl_linux_m68k = 87, -- -+ isc_info_db_impl_linux_riscv64 = 88, - - isc_info_db_impl_last_value // Leave this LAST! - }; diff --git a/1000-firebird-uos-add-loongarch64-support.patch b/1000-firebird-uos-add-loongarch64-support.patch deleted file mode 100644 index 47368dede9660e3ef1a78086cae7bf2fa15dc8c6..0000000000000000000000000000000000000000 --- a/1000-firebird-uos-add-loongarch64-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 538cd3c6565935dde41fae2201470811659be93b Mon Sep 17 00:00:00 2001 -From: mahailiang -Date: Sat, 30 Apr 2022 10:47:15 +0800 -Subject: [PATCH] add loongarch64 support - ---- - src/common/classes/DbImplementation.cpp | 1 + - src/common/common.h | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/common/classes/DbImplementation.cpp b/src/common/classes/DbImplementation.cpp -index 7376b9b..cab703a 100644 ---- a/src/common/classes/DbImplementation.cpp -+++ b/src/common/classes/DbImplementation.cpp -@@ -50,6 +50,7 @@ static const UCHAR CpuArm64 = 15; - static const UCHAR CpuPowerPc64el = 16; - static const UCHAR CpuM68k = 17; - static const UCHAR CpuRiscV64 = 18; -+static const UCHAR CpuLoongarch64 = 19; - - static const UCHAR OsWindows = 0; - static const UCHAR OsLinux = 1; -diff --git a/src/common/common.h b/src/common/common.h -index 365b97e..9822032 100644 ---- a/src/common/common.h -+++ b/src/common/common.h -@@ -144,6 +144,10 @@ - #define RISC_ALIGNMENT - #endif /* sparc */ - -+#ifdef _LOONGARCH_ARCH -+#define FB_CPU CpuLoongarch64 -+#endif /* loongarch64 */ -+ - #ifdef MIPSEL - #define FB_CPU CpuMipsel - #endif /* mipsel */ -@@ -915,7 +919,7 @@ void GDS_breakpoint(int); - // ASF: Currently, all little-endian are FB_SWAP_DOUBLE and big-endian aren't. - // AP: Define it for your hardware correctly in case your CPU do not follow mentioned rule. - // The follwoing lines are kept for reference only. --//#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(_LOONGARCH_ARCH) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64) - //#define FB_SWAP_DOUBLE 1 - //#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__) - //#define FB_SWAP_DOUBLE 0 --- -2.27.0 - diff --git a/Firebird-3.0.4.33054-0.tar.bz2 b/Firebird-3.0.4.33054-0.tar.bz2 deleted file mode 100644 index 9295d3bced1bd6e52d4bb00dacb7a96c25fe041b..0000000000000000000000000000000000000000 Binary files a/Firebird-3.0.4.33054-0.tar.bz2 and /dev/null differ diff --git a/Firebird-4.0.0.2496-0.tar.xz b/Firebird-4.0.0.2496-0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f63b909ac95764cebd9a0272a2c9940186e49cb5 Binary files /dev/null and b/Firebird-4.0.0.2496-0.tar.xz differ diff --git a/Provide-sized-global-delete-operators-when-compiled.patch b/Provide-sized-global-delete-operators-when-compiled.patch deleted file mode 100644 index 1302d1dafe7b1134651593add53e4ed71c0f147e..0000000000000000000000000000000000000000 --- a/Provide-sized-global-delete-operators-when-compiled.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Michal Kubecek -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/README.Fedora b/README.Fedora index ae1f2a8a3baab3ca2028b18cdf890b6ab9f08d5b..071b351f5b0bd998300d982b5b65407f541ac9cc 100644 --- a/README.Fedora +++ b/README.Fedora @@ -1,72 +1,17 @@ -Restarts -======== +Differences between upstream and the Fedora package +=================================================== -Service restarts after RPM package upgrades have been disabled on purpose. -This is to avoid a situation where an update is performed from within a -session running on xrdp, which can then cause dnf to only perform part of the -transaction and leave the system in a state that requires further manual -intervention, including removal of duplicate packages etc. +* In /usr/bin you have isql-fb for Firebird isql. + We can't name it isql to avoid conflict with isql from UNIX-ODBC. + In /usr/bin you have also gstat-fb for Firebird gstat. + We can't name it gstat to avoid conflict with gstat from Ganglia-gmond. -So, it will be up to the user/admin to restart xrdp service after any RPM -package upgrade. This is in line with what other GUI systems like Xorg and -Wayland do. +* By default, Firebird is set as superserver mode. + Please read the Firebird doc if you want to change the mode. -xorgxrdp -======== +* According to Fedora packaging rules, firebird service is not started + automatically. You need to start it, as root : + systemctl start firebird.service + If you want to have firebird started at each boot, as root : + systemctl enable firebird.service -Note that xorgxrdp is not installed and configured by default. Each build -depends on specific binary version of Xorg, which tends to create very strict -installation dependencies that can be an inconvenience in EPEL. - -SELinux -======= - -Please note that you may need to install xrdp-selinux package in order to get -the required SELinux policy that will allow xrdp and associated processes to -run successfully if SELinux is enabled. On versions of Fedora and RHEL that -support weak dependencies, xrdp-selinux will be a recommended package. - -WARNING: The policy module contains a rule that permits unconfined_service_t -processes to transition into unconfined_t. If xrdp is not the only service -that runs as unconfined_service_t on your system, this policy will allow any -other such service to transition as well. - -Default configuration in /etc/pam.d/xrdp-sesman uses password-auth for auth, -account, password and session. This may result in an incorrect context for -the processes in the session. Please adjust this file to match your desktop -environment. An example for Gnome desktop is given in the file. - -TigerVNC >= 1.8.0 -================= - -TigerVNC 1.8.0 enables clipboard support by default (i.e. no need to run -vncconfig), which may cause disconnections in xrdp. To avoid the issue, these -can be added to [Xvnc] stanza in /etc/xrdp/sesman.ini: - -param=-AcceptCutText=0 -param=-SendCutText=0 -param=-SendPrimary=0 -param=-SetPrimary=0 - -Of course, cut and paste support will not work with these set. - -Runlevel -======== - -If the system is configured to boot into graphical target, you may experience -problems with xrdp Gnome sessions. In order to avoid this, put the system into -multi user target. Like this: - -systemctl set-default multi-user.target - -Then reboot. - -VSOCK -======== -An example of a how to set up xrdp with VSOCK can be found here: - -https://bugzilla.redhat.com/show_bug.cgi?id=1787953#c22 - -Please note that polkit rules for active sessions, allowing access to colord -and repository updates are already shipped, but in a current, JavaScript -format. diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 903e4e052b90591772dc05f13cee97d9fb98fdbb..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# firebird - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index f244a13f1ac6eb4eabfd82f87299fa96454577d0..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# firebird - -#### 介绍 -{**以下是 Gitee 平台说明，您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/add-pkgconfig-files.patch b/add-pkgconfig-files.patch index d8ea48ca5db2ea3e40da88cc5277f416394cd896..981afe20a8c9c34ba7e9b2a9ed1d6e4e573e2309 100644 --- a/add-pkgconfig-files.patch +++ b/add-pkgconfig-files.patch @@ -1,16 +1,6 @@ -From: Michal Kubecek -Date: Tue, 12 Jun 2012 14:32:44 +0200 -Subject: add pkgconfig files - ---- - builds/install/arch-specific/linux/misc/fbclient.pc.in | 10 ++++++++++ - configure.ac | 1 + - 2 files changed, 11 insertions(+) - create mode 100644 builds/install/arch-specific/linux/misc/fbclient.pc.in - diff --git a/builds/install/arch-specific/linux/misc/fbclient.pc.in b/builds/install/arch-specific/linux/misc/fbclient.pc.in new file mode 100644 -index 000000000000..d49fdc5821c5 +index 0000000..d49fdc5 --- /dev/null +++ b/builds/install/arch-specific/linux/misc/fbclient.pc.in @@ -0,0 +1,10 @@ @@ -25,18 +15,14 @@ index 000000000000..d49fdc5821c5 +Cflags: -I${includedir}/firebird +Libs: -L${libdir} -lfbclient diff --git a/configure.ac b/configure.ac -index 717f5eccc53d..60b3aaa5b08b 100644 +index 0a3de36..922c778 100644 --- a/configure.ac +++ b/configure.ac -@@ -1200,6 +1200,7 @@ case "$PLATFORM" in +@@ -1307,6 +1307,7 @@ case "$PLATFORM" in gen/install/misc/firebird.init.d.gentoo:builds/install/arch-specific/linux/firebird.init.d.gentoo.in gen/install/misc/firebird.init.d.slackware:builds/install/arch-specific/linux/firebird.init.d.slackware.in gen/install/misc/rc.config.firebird:builds/install/arch-specific/linux/rc.config.firebird.in + gen/install/misc/fbclient.pc:builds/install/arch-specific/linux/misc/fbclient.pc.in gen/Release/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/linuxLibrary.sh.in - gen/install/misc/firebird-classic@.service:builds/install/arch-specific/linux/firebird-classic.service.in - gen/install/misc/firebird-classic.socket:builds/install/arch-specific/linux/firebird-classic.socket.in --- -2.3.4 - - + gen/install/misc/firebird.service:builds/install/arch-specific/linux/firebird.service.in + ], diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch index 1f556e0fcb908d35f60326e0c4674a3f932827ac..b854300a70fe820df5bfbff21f0159a69cdc23bc 100644 --- a/cloop-honour-build-flags.patch +++ b/cloop-honour-build-flags.patch @@ -1,19 +1,17 @@ -Description: make cloop build honor compiler/linker flags from the environment -Author: Damyan Ivanov -Forwarded: no - +diff --git a/extern/cloop/Makefile b/extern/cloop/Makefile +index 08516c2..1573dc2 100644 --- a/extern/cloop/Makefile +++ b/extern/cloop/Makefile @@ -6,7 +6,7 @@ TARGET := release - CC := gcc - CXX := g++ + CC := $(CC) + CXX := $(CXX) -LD := $(CXX) +LD := $(CXX) $(LDFLAGS) SRC_DIR := src BUILD_DIR := build -@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$ +@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp)) OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) @@ -24,4 +22,17 @@ Forwarded: no +CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) FPC_FLAGS := -Mdelphi - ifeq ($(TARGET),release) + ifeq ($(shell uname),FreeBSD) +diff --git a/extern/btyacc/Makefile b/extern/btyacc/Makefile +index f432965..52d8443 100644 +--- a/extern/btyacc/Makefile ++++ b/extern/btyacc/Makefile +@@ -12,7 +12,7 @@ HDRS = defs.h mstring.h + # across all of our supported compilers/platforms. + + # Vanilla CFLAGS +-CFLAGS= ++CFLAGS=-fPIE + + # No LDFLAGS + #LDFLAGS= diff --git a/firebird.conf b/firebird.conf deleted file mode 100644 index fc6e40703a698fe77a41f0d254013165252daa47..0000000000000000000000000000000000000000 --- a/firebird.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/firebird 0775 firebird firebird - diff --git a/firebird.service b/firebird.service new file mode 100644 index 0000000000000000000000000000000000000000..bd488709dd1ce4b3452d89d7e67ff8d2348f0c6c --- /dev/null +++ b/firebird.service @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server +After=network.target +Conflicts=firebird-classic.socket + +[Service] +User=firebird +Group=firebird +ExecStart=/usr/sbin/fbguard -forever +StandardError=syslog +RuntimeDirectory=firebird +RuntimeDirectoryMode=0775 + +[Install] +WantedBy=multi-user.target diff --git a/firebird.spec b/firebird.spec index 9d48862d7d6182ceab6c2467be90e207fb6e585f..41557b1558f291aefe7a230a995cbc4fc4364ad2 100644 --- a/firebird.spec +++ b/firebird.spec @@ -1,58 +1,56 @@ -%define anolis_release 3 -#uos -%global upversion 3.0.4.33054 +%global upversion 4.0.0.2496 %global pkgversion Firebird-%{upversion}-0 -%global major 3.0 +%global major 4.0 %global _hardened_build 1 +# firebird is mis-compiled when LTO is enabled. A root +# cause analysis has not yet been completed. Reported upstream. +# Disable LTO for now +%global _lto_cflags %nil Name: firebird Version: %{upversion} -Release: 2.3.%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: SQL relational database management system License: Interbase URL: http://www.firebirdsql.org/ -Source0: https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/%{pkgversion}.tar.bz2 +Source0: https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/%{pkgversion}.tar.xz Source1: firebird-logrotate Source2: README.Fedora -Source3: firebird.conf +Source3: firebird.service Source4: fb_config # from OpenSuse Patch101: add-pkgconfig-files.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 Patch205: cloop-honour-build-flags.patch # from upstream -# Support for riscv64, sent upstream: -# http://tracker.firebirdsql.org/browse/CORE-5779 -Patch401: 0001-Port-to-RISC-V-64-bit-riscv64.patch - -#add by uos -Patch1000: 1000-firebird-uos-add-loongarch64-support.patch -#endif - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtommath-devel -BuildRequires: libtool -BuildRequires: ncurses-devel -BuildRequires: libicu-devel -BuildRequires: libedit-devel -BuildRequires: gcc-c++ -BuildRequires: libstdc++-static -BuildRequires: systemd-units -BuildRequires: chrpath -BuildRequires: zlib-devel -BuildRequires: procmail +# Firebird 4 have build issues (bz 1969393) +ExcludeArch: s390x + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtommath-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: libicu-devel +BuildRequires: libedit-devel +BuildRequires: gcc-c++ +BuildRequires: libstdc++-static +BuildRequires: systemd-units +BuildRequires: chrpath +BuildRequires: zlib-devel +BuildRequires: procmail +BuildRequires: make +BuildRequires: libtomcrypt-devel +BuildRequires: unzip +BuildRequires: sed Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel @@ -66,18 +64,18 @@ Requires: libfbclient2 = %{version}-%{release} Requires: libib-util = %{version}-%{release} Requires: %{name}-utils = %{version}-%{release} -Obsoletes: firebird-arch < 3.0 -Obsoletes: firebird-filesystem < 3.0 -Obsoletes: firebird-classic-common < 3.0 -Obsoletes: firebird-classic < 3.0 -Obsoletes: firebird-superclassic < 3.0 -Obsoletes: firebird-superserver < 3.0 -Conflicts: firebird-arch < 3.0 -Conflicts: firebird-filesystem < 3.0 -Conflicts: firebird-classic-common < 3.0 -Conflicts: firebird-classic < 3.0 -Conflicts: firebird-superclassic < 3.0 -Conflicts: firebird-superserver < 3.0 +Obsoletes: firebird-arch < 4.0 +Obsoletes: firebird-filesystem < 4.0 +Obsoletes: firebird-classic-common < 4.0 +Obsoletes: firebird-classic < 4.0 +Obsoletes: firebird-superclassic < 4.0 +Obsoletes: firebird-superserver < 4.0 +Conflicts: firebird-arch < 4.0 +Conflicts: firebird-filesystem < 4.0 +Conflicts: firebird-classic-common < 4.0 +Conflicts: firebird-classic < 4.0 +Conflicts: firebird-superclassic < 4.0 +Conflicts: firebird-superserver < 4.0 %description @@ -120,9 +118,9 @@ in production systems, under a variety of names, since 1981. %package -n libfbclient2 Summary: Firebird SQL server client library -Obsoletes: firebird-libfbclient < 3.0 -Conflicts: firebird-libfbclient < 3.0 -Obsoletes: firebird-libfbembed < 3.0 +Obsoletes: firebird-libfbclient < 4.0 +Conflicts: firebird-libfbclient < 4.0 +Obsoletes: firebird-libfbembed < 4.0 %description -n libfbclient2 Shared client library for Firebird SQL server. @@ -197,46 +195,39 @@ in production systems, under a variety of names, since 1981. %prep %setup -q -n %{pkgversion} %patch101 -p1 -%patch103 -p1 -%patch201 -p1 -%patch202 -p1 %patch203 -p1 %patch205 -p1 -%patch401 -p1 -%patch1000 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="${CFLAGS} -fno-delete-null-pointer-checks" -export CXXFLAGS="${CFLAGS} -fno-delete-null-pointer-checks --std=c++14" NOCONFIGURE=1 ./autogen.sh -%configure --prefix=%{_prefix} \ - --disable-binreloc \ - --disable-rpath \ +%configure --disable-rpath --prefix=%{_prefix} \ --with-system-editline \ --with-fbbin=%{_bindir} --with-fbsbin=%{_sbindir} \ --with-fbconf=%{_sysconfdir}/%{name} \ - --with-fblib=%{_libdir} --with-fbinclude=%{_includedir}/%{name} \ + --with-fblib=%{_libdir} --with-fbinclude=%{_includedir} \ --with-fbdoc=%{_defaultdocdir}/%{name} \ - --with-fbudf=%{_libdir}/%{name}/udf \ --with-fbsample=%{_defaultdocdir}/%{name}/sample \ - --with-fbsample-db=%{_localstatedir}/lib/%{name}/data/ \ - --with-fbhelp=%{_localstatedir}/lib/%{name}/system/ \ + --with-fbsample-db=%{_localstatedir}/lib/%{name}/data \ + --with-fbhelp=%{_localstatedir}/lib/%{name}/system \ --with-fbintl=%{_libdir}/%{name}/intl \ --with-fbmisc=%{_datadir}/%{name}/misc \ - --with-fbsecure-db=%{_localstatedir}/lib/%{name}/secdb/ \ - --with-fbmsg=%{_localstatedir}/lib/%{name}/system/ \ + --with-fbsecure-db=%{_localstatedir}/lib/%{name}/secdb \ + --with-fbmsg=%{_localstatedir}/lib/%{name}/system \ --with-fblog=%{_localstatedir}/log/%{name} \ - --with-fbglock=%{_var}/run/%{name} \ - --with-fbplugins=%{_libdir}/%{name}/plugins + --with-fbglock=/run/%{name} \ + --with-fbplugins=%{_libdir}/%{name}/plugins \ + --with-fbtzdata=%{_localstatedir}/lib/%{name}/tzdata make %{?_smp_mflags} cd gen -make -f Makefile.install buildRoot +sed -i '/linkFiles "/d' ./install/makeInstallImage.sh +./install/makeInstallImage.sh chmod -R u+w buildroot%{_docdir}/%{name} %install -chmod u+rw,a+rx gen/buildroot/usr/include/firebird/firebird/impl +chmod u+rw,a+rx gen/buildroot/%{_includedir}/firebird/impl cp -r gen/buildroot/* ${RPM_BUILD_ROOT}/ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/ @@ -245,37 +236,33 @@ cd ${RPM_BUILD_ROOT} rm -vf .%{_sbindir}/*.sh mv -v .%{_sbindir}/fb_config .%{_libdir}/ install -p -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/fb_config -rm -vf .%{_includedir}/%{name}/perf.h +rm -vf .%{_includedir}/perf.h rm -vf .%{_libdir}/libicu*.so -rm -vf .%{_includedir}/*.h chmod -R u+w .%{_docdir}/%{name} -rm -vf .%{_datadir}/%{name}/misc/firebird.init.* -rm -vf .%{_datadir}/%{name}/misc/firebird.xinetd -rm -vf .%{_datadir}/%{name}/misc/rc.config.firebird -mv -v .%{_sysconfdir}/%{name}/README .%{_sysconfdir}/%{name}/WhatsNew \ +mv -v .%{_datadir}/%{name}/misc/upgrade/udf/* .%{_docdir}/%{name}/ +rm -rvf .%{_datadir}/%{name}/misc +mv -v .%{_sysconfdir}/%{name}/README.md .%{_sysconfdir}/%{name}/CHANGELOG.md \ .%{_docdir}/%{name}/ mv -v .%{_sysconfdir}/%{name}/IDPLicense.txt .%{_docdir}/%{name}/ mv -v .%{_sysconfdir}/%{name}/IPLicense.txt .%{_docdir}/%{name}/ install -p -m 0644 -D %{SOURCE2} .%{_docdir}/%{name}/README.Fedora mv -v .%{_bindir}/gstat .%{_bindir}/gstat-fb mv -v .%{_bindir}/isql .%{_bindir}/isql-fb +rm -rvf .%{_defaultdocdir}/%{name}/sample/prebuilt mkdir -p .%{_localstatedir}/log/%{name} mkdir -p .%{_sysconfdir}/logrotate.d echo 1 > .%{_localstatedir}/log/%{name}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log@g" %{SOURCE1} > .%{_sysconfdir}/logrotate.d/%{name} -mkdir -p .%{_tmpfilesdir} -cp %{SOURCE3} .%{_tmpfilesdir}/ - mkdir -p .%{_unitdir} -cp .%{_datadir}/%{name}/misc/%{name}-superserver.service .%{_unitdir}/%{name}-superserver.service +cp -f %{SOURCE3} .%{_unitdir}/%{name}.service %pre # Create the firebird group if it doesn't exist -getent group %{name} || /usr/sbin/groupadd -r %{name} -getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/nologin -r %{name} +getent group %{name} > /dev/null || /usr/sbin/groupadd -r %{name} +getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /sbin/nologin -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services @@ -287,16 +274,15 @@ fi %post -/bin/systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf -%systemd_post firebird-superserver.service +%systemd_post firebird.service %postun -%systemd_postun_with_restart firebird-superserver.service +%systemd_postun_with_restart firebird.service %preun -%systemd_preun firebird-superserver.service +%systemd_preun firebird.service %files @@ -312,32 +298,32 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/fbtrace.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins.conf +%config(noreplace) %{_sysconfdir}/%{name}/replication.conf %dir %{_libdir}/%{name} %dir %{_datadir}/%{name} %{_libdir}/%{name}/intl %{_libdir}/%{name}/plugins -%{_libdir}/%{name}/udf -%{_datadir}/%{name}/misc %dir %{_localstatedir}/lib/%{name} %dir %attr(0700,%{name},%{name}) %{_localstatedir}/lib/%{name}/secdb %dir %attr(0700,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/system -%attr(0600,firebird,firebird) %config(noreplace) %{_localstatedir}/lib/%{name}/secdb/security3.fdb +%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/tzdata +%attr(0600,firebird,firebird) %config(noreplace) %{_localstatedir}/lib/%{name}/secdb/security4.fdb %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 +%attr(0644,firebird,firebird) %{_localstatedir}/lib/%{name}/tzdata/*.res +%ghost %dir %attr(0775,%{name},%{name}) /run/%{name} +%ghost %attr(0644,%{name},%{name}) /run/%{name}/fb_guard %dir %{_localstatedir}/log/%{name} %config(noreplace) %attr(0664,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} -%defattr(0755,root,root,0755) -%{_unitdir}/%{name}-superserver.service +%attr(0644,root,root) %{_unitdir}/%{name}.service %files devel +%{_includedir}/*.h %{_includedir}/%{name} %{_libdir}/fb_config %{_sbindir}/fb_config @@ -382,135 +368,53 @@ fi %changelog -* Tue Nov 07 2023 yangxianzhao - 3.0.4.33054-2.3.3 -- rebuild for qt - -* Mon Oct 09 2023 wangce - 3.0.4.33054-2.3.2 -- Fix build error - -* Mon Aug 28 2023 yangxianzhao - 3.0.4.33054-2.3.1 -- Specification spec file - -* Sat Apr 30 2022 mahailiang - 3.0.4.33054-2.3 -- arch: add loongarch64 support - -* Tue Feb 09 2021 Xue haolin - 3.0.4.33054-2.2 -- Rebuild - -* Tue Dec 08 2020 MengFanSheng - 3.0.4.33054-2.01 -- rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 3.0.4.33054-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 22 2018 Philippe Makowski - 3.0.4.33054-1 -- new upstream release - -* Fri Jul 13 2018 Fedora Release Engineering - 3.0.3.32900-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Mar 18 2018 Richard W.M. Jones - 3.0.3.32900-2 -- Add support for riscv64. - -* Tue Feb 20 2018 Philippe Makowski - 3.0.3.32900-1 -- new upstream release. -- Drop obsolete ldconfig scriptlets. -- Fix tmpfiles path - -* Tue Feb 13 2018 Remi Collet - 3.0.2.32703-5 -- add shebang in fb_config, fix #1544837 - -* Wed Feb 07 2018 Fedora Release Engineering - 3.0.2.32703-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 3.0.2.32703-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.0.2.32703-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Mar 27 2017 Philippe Makowski - 3.0.2.32703-1 -- new upstream release +* Tue Jun 08 2021 Philippe Makowski - 4.0.0.2496-1 +- Update to 4.0.0 (#1963311) -* Tue Feb 21 2017 Philippe Makowski - 3.0.1.32609-5 -- security fix (#1425333) +* Fri Oct 23 2020 Philippe Makowski - 3.0.7.33374-1 +- new upstream release fix #1887991 -* Fri Feb 10 2017 Fedora Release Engineering - 3.0.1.32609-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 15 2016 Philippe Makowski - 3.0.1.32609-3 -- add requires on libfbclient2-devel for firebird-devel #1394750 - -* Mon Oct 31 2016 Philippe Makowski - 3.0.1.32609-2 -- obsolete firebird-libfbembed #1388648 +* Wed Jul 08 2020 Philippe Makowski - 3.0.6.33328-1 +- new upstream release fix #1850675 -* Wed Oct 12 2016 Philippe Makowski - 3.0.1.32609-1 +* Mon Jan 20 2020 Philippe Makowski - 3.0.5.33220-1 +- new upstream release fix #1786885 + +* Wed Sep 18 2019 Philippe Makowski - 3.0.4.33054-1 - new upstream release -* Fri Apr 15 2016 David Tardon - 2.5.5.26952.0-7 -- rebuild for ICU 57.1 +* Thu Aug 22 2019 Philippe Makowski 2.5.9.27139.0-1 +- update to 2.5.9 (End of Series) -* Wed Mar 30 2016 Philippe Makowski - 2.5.5.26952.0-6 -- use _tmpfilesdir macro +* Fri Aug 31 2018 Philippe Makowski 2.5.8.27089.0-1 +- update to 2.5.8 -* Wed Mar 09 2016 Philippe Makowski - 2.5.5.26952.0-5 -- Resolves: rbhz#1307503 building with gcc6 +* Tue Feb 21 2017 Philippe Makowski 2.5.7.27050.0-1 +- update to 2.5.7 +- security fix (#1425332) -* Sat Feb 20 2016 David Tardon - 2.5.5.26952.0-4 -- Resolves: rbhz#1309223 restore /usr/sbin/fb_config +* Thu Dec 29 2016 Philippe Makowski 2.5.6.27020.0-1 +- update to 2.5.6 -* Fri Feb 05 2016 Philippe Makowski - 2.5.5.26952.0-3 +* Fri Feb 05 2016 Philippe Makowski - 2.5.5.26952.0-2 - move fb_config (#1297506) -- fixe CVE-2016-1569 (#1297447 #1297450 #1297451) - -* Wed Feb 03 2016 Fedora Release Engineering - 2.5.5.26952.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +- fix CVE-2016-1569 (#1297447 #1297450 #1297451) * Thu Nov 19 2015 Philippe Makowski 2.5.5.26952.0-1 - update to 2.5.5 -* Wed Oct 28 2015 David Tardon - 2.5.4.26856.0-4 -- rebuild for ICU 56.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.5.4.26856.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 2.5.4.26856.0-2 -- Rebuilt for GCC 5 C++11 ABI change - * Thu Apr 2 2015 Philippe Makowski 2.5.4.26856.0-1 -- update to 2.5.4 +- update to 2.5.4 -* Mon Jan 26 2015 David Tardon - 2.5.3.26778.0-6 -- rebuild for ICU 54.1 - -* Sun Dec 7 2014 Philippe Makowski 2.5.3.26778.0-5 +* Sun Dec 7 2014 Philippe Makowski 2.5.3.26778.0-2 - security fix firebird CORE-4630 -* Thu Oct 30 2014 Philippe Makowski 2.5.3.26778.0-4 -- Remove lib64 rpaths (#1154706) - -* Tue Aug 26 2014 David Tardon - 2.5.3.26778.0-3 -- rebuild for ICU 53.1 - -* Sat Aug 16 2014 Fedora Release Engineering - 2.5.3.26778.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - * Sat Jul 26 2014 Philippe Makowski - 2.5.3.26778.0-1 - update from upstream 2.5.3 - update arm64 patch -* Sat Jun 07 2014 Fedora Release Engineering - 2.5.2.26539.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 12 2014 Rex Dieter 2.5.2.26539.0-10 -- rebuild (libicu) - -* Sat Dec 07 2013 Philippe Makowski 2.5.2.26539.0-9 -- fix FTBFS if "-Werror=format-security" flag is used (bug #1037062) - -* Thu Aug 08 2013 Philippe Makowski 2.5.2.26539.0-8 -- add BR libatomic_ops-static (bug #993439) +* Tue Jan 21 2014 Philippe Makowski 2.5.2.26539.0-8 +- add missing BR on libstdc++-static * Tue Jul 23 2013 Philippe Makowski 2.5.2.26539.0-7 - make fb_config executable (bug #985335) @@ -566,7 +470,7 @@ fi * Fri Apr 22 2011 Philippe Makowski 2.5.0.26074.0-8 - added patch from upstream to fix rh #697313 -* Mon Mar 07 2011 Caolán McNamara - 2.5.0.26074.0-7 +* Mon Mar 07 2011 Caolรกn McNamara - 2.5.0.26074.0-7 - rebuild for icu 4.6 * Tue Feb 08 2011 Fedora Release Engineering - 2.5.0.26074.0-6 @@ -582,7 +486,7 @@ fi * Wed Dec 22 2010 Philippe Makowski 2.5.0.26074.0-3 - Fix wrong assign file for classic and classic common -* Thu Dec 16 2010 Dan Horák 2.5.0.26074.0-2 +* Thu Dec 16 2010 Dan Horรกk 2.5.0.26074.0-2 - sync the s390(x) utilities list with other arches - add libatomic_ops-devel as BR: on non-x86 arches @@ -592,7 +496,7 @@ fi * Mon Nov 22 2010 Philippe Makowski 2.5.0.26074.0-0 - build with last upstream -* Tue Jun 29 2010 Dan Horák 2.1.3.18185.0-9 +* Tue Jun 29 2010 Dan Horรกk 2.1.3.18185.0-9 - update the s390(x) patch to match upstream * Fri Jun 04 2010 Philippe Makowski 2.1.3.18185.0-8 @@ -603,11 +507,11 @@ fi - Fix rh #563461 with backport mainstream patch CORE-2928 -* Fri Apr 02 2010 Caolán McNamara 2.1.3.18185.0-6 +* Fri Apr 02 2010 Caolรกn McNamara 2.1.3.18185.0-6 - rebuild for icu 4.4 * Sat Sep 05 2009 Karsten Hopp 2.1.3.18185.0-5 -- fix build on s390x for F-12 mass rebuild (Dan Horák) +- fix build on s390x for F-12 mass rebuild (Dan Horรกk) * Tue Aug 11 2009 Philippe Makowski 2.1.3.18185.0-4 - build it against system edit lib @@ -621,7 +525,7 @@ fi * Thu Jul 30 2009 Philippe Makowski 2.1.3.18185.0-1 - Update to 2.1.3.18185 - Fix rh #514463 -- Remove doc patch +- Remove doc patch - Apply backport initscript patch * Sat Jul 11 2009 Philippe Makowski 2.1.2.18118.0-11 @@ -667,7 +571,7 @@ fi * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring - + * Sat Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors @@ -699,3 +603,4 @@ fi * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec + diff --git a/honour-buildflags.patch b/honour-buildflags.patch deleted file mode 100644 index 221241d18ec19766d24ae39cc4be543a53655a99..0000000000000000000000000000000000000000 --- a/honour-buildflags.patch +++ /dev/null @@ -1,78 +0,0 @@ -Description: improved support for build flags - The first change makes linking makeHeader use the same CPP/CXX/LD flags as the - rest of the sources. - The second change stops btyacc/Makefile from ignoring CFLAGS from the - environment. - The third change stops overriding CXXFLAGS - The result is using hardening flags from the environment when compiling and - linking. -Author: Damyan Ivanov - ---- a/builds/posix/Makefile.in -+++ b/builds/posix/Makefile.in -@@ -623,7 +623,7 @@ MAKE_HEADER_Src = $(addprefix $(SRC_ROOT - MAKE_HEADER_Bin = ./makeHeader - - $(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles) -- $(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src) -+ $(STATICEXE_LINK) $(EXE_LINK_OPTIONS) $(LINK_OPTS) $(CPPFLAGS) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src) - $(CP) $^ . - $(MAKE_HEADER_Bin) $@ - $(RM) -f ibase.h ---- a/extern/btyacc/Makefile -+++ b/extern/btyacc/Makefile -@@ -42,7 +42,7 @@ OTHERS = README README.BYACC \ - all: $(PROGRAM) - - $(PROGRAM): $(OBJS) $(LIBS) -- $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) - - clean:; rm -f $(OBJS) - ---- a/builds/posix/make.defaults -+++ b/builds/posix/make.defaults -@@ -166,8 +166,8 @@ LD = @CXX@ - - LIB_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) - STATICLIB_LINK = $(AR) crus --EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) --STATICEXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) -+EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(LDFLAGS) -+STATICEXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(LDFLAGS) - - LINK_LIBS = @LIBS@ - STATICLINK_LIBS = @LIBS@ ---- a/builds/posix/prefix.linux -+++ b/builds/posix/prefix.linux -@@ -19,7 +19,7 @@ - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - - COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks --CXXFLAGS=-std=gnu++03 -+CXXFLAGS+=-std=gnu++03 - OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing - ---- a/builds/posix/prefix.linux_amd64 -+++ b/builds/posix/prefix.linux_amd64 -@@ -19,7 +19,7 @@ - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - - COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks --CXXFLAGS=-std=gnu++03 -+CXXFLAGS+=-std=gnu++03 - OPTIMIZE_FLAGS=-O3 -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 - ---- a/builds/posix/prefix.linux_generic -+++ b/builds/posix/prefix.linux_generic -@@ -19,7 +19,7 @@ - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - - COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fno-delete-null-pointer-checks --CXXFLAGS=-std=gnu++03 -+CXXFLAGS+=-std=gnu++03 - - PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS) - DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor diff --git a/no-copy-from-icu.patch b/no-copy-from-icu.patch index ca26688ae95b357a9e2bc4d14227093357e2babf..7f84e0b06add2334e07de81520ef568d00ffb5f5 100644 --- a/no-copy-from-icu.patch +++ b/no-copy-from-icu.patch @@ -1,9 +1,21 @@ -Description: Link isql with ICU instead of embedding part of it in the source -Author: Damyan Ivanov - +diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in +index bb4ceb1..87e75a2 100644 +--- a/builds/posix/Makefile.in ++++ b/builds/posix/Makefile.in +@@ -534,7 +534,7 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB) + isql: $(ISQL) + + $(ISQL): $(ISQL_Objects) $(COMMON_LIB) +- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) ++ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(ICU_LIBS) $(call LINK_DARWIN_RPATH,..) + + nbackup: $(NBACKUP) + +diff --git a/src/isql/isql.epp b/src/isql/isql.epp +index 79da1f7..4554252 100644 --- a/src/isql/isql.epp +++ b/src/isql/isql.epp -@@ -168,34 +168,6 @@ const char* UNKNOWN = "*unknown*"; +@@ -173,34 +173,6 @@ const char* UNKNOWN = "*unknown*"; namespace IcuUtil { @@ -38,15 +50,3 @@ Author: Damyan Ivanov // Return the number of characters of a string. static unsigned charLength(SSHORT charset, unsigned len, const char* str) { ---- a/builds/posix/Makefile.in -+++ b/builds/posix/Makefile.in -@@ -476,7 +476,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB - isql: $(ISQL) - - $(ISQL): $(ISQL_Objects) $(COMMON_LIB) -- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) -+ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) \ -+ $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS) - - nbackup: $(NBACKUP) - diff --git a/obsolete-syslogd.target.patch b/obsolete-syslogd.target.patch deleted file mode 100644 index a08276c76e9652b1e8b8522c23bfa767ac51a98c..0000000000000000000000000000000000000000 --- a/obsolete-syslogd.target.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: remove reference to obsolete syslog.target - Syslog is socket-activated, so no need to declare a dependency on it -Author: Damyan Ivanov - ---- a/builds/install/arch-specific/linux/firebird-superserver.service.in -+++ b/builds/install/arch-specific/linux/firebird-superserver.service.in -@@ -1,6 +1,6 @@ - [Unit] - Description=Firebird Database Server ( SuperServer ) --After=syslog.target network.target -+After=network.target - Conflicts=firebird-classic.socket - - [Service]