New version 3.0.10
This commit is contained in:
Funda Wang
parent
2ce906ad7b
commit
6a9d3ab0ed
BIN
Firebird-3.0.10.33601-0.tar.bz2
Normal file
BIN
Firebird-3.0.10.33601-0.tar.bz2
Normal file
Binary file not shown.
Binary file not shown.
@ -1,63 +0,0 @@
|
||||
From a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab Mon Sep 17 00:00:00 2001
|
||||
From: AlexPeshkoff <alexander.peshkoff@gmail.com>
|
||||
Date: Sat, 10 Feb 2018 19:43:26 +0300
|
||||
Subject: [PATCH] Make it build with icu60
|
||||
|
||||
---
|
||||
src/common/common.h | 3 +++
|
||||
src/common/unicode_util.h | 4 ++++
|
||||
src/intl/cs_icu.cpp | 1 -
|
||||
src/intl/cv_icu.cpp | 1 -
|
||||
4 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/common/common.h b/src/common/common.h
|
||||
index 2cf877a804..58abaaf695 100644
|
||||
--- a/src/common/common.h
|
||||
+++ b/src/common/common.h
|
||||
@@ -997,4 +997,7 @@ namespace Firebird {
|
||||
static IMessageMetadata* const DELAYED_OUT_FORMAT = reinterpret_cast<IMessageMetadata*>(1);
|
||||
}
|
||||
|
||||
+#undef UCHAR_TYPE
|
||||
+#define UCHAR_TYPE uint16_t
|
||||
+
|
||||
#endif /* COMMON_COMMON_H */
|
||||
diff --git a/src/common/unicode_util.h b/src/common/unicode_util.h
|
||||
index 001d3d8283..03d48f9419 100644
|
||||
--- a/src/common/unicode_util.h
|
||||
+++ b/src/common/unicode_util.h
|
||||
@@ -31,6 +31,10 @@
|
||||
#include "../common/IntlUtil.h"
|
||||
#include "../common/os/mod_loader.h"
|
||||
#include "../common/classes/fb_string.h"
|
||||
+
|
||||
+#undef U_SHOW_CPLUSPLUS_API
|
||||
+#define U_SHOW_CPLUSPLUS_API 0
|
||||
+
|
||||
#include <unicode/ucnv.h>
|
||||
|
||||
struct UCollator;
|
||||
diff --git a/src/intl/cs_icu.cpp b/src/intl/cs_icu.cpp
|
||||
index 76f15a2e68..bc3b48b44f 100644
|
||||
--- a/src/intl/cs_icu.cpp
|
||||
+++ b/src/intl/cs_icu.cpp
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "../intl/ldcommon.h"
|
||||
#include "cs_icu.h"
|
||||
#include "cv_icu.h"
|
||||
-#include <unicode/ucnv.h>
|
||||
#include "../common/unicode_util.h"
|
||||
|
||||
|
||||
diff --git a/src/intl/cv_icu.cpp b/src/intl/cv_icu.cpp
|
||||
index b1ac01fce5..82262d9b4d 100644
|
||||
--- a/src/intl/cv_icu.cpp
|
||||
+++ b/src/intl/cv_icu.cpp
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "../intl/ldcommon.h"
|
||||
#include "ld_proto.h"
|
||||
#include "cv_icu.h"
|
||||
-#include <unicode/ucnv.h>
|
||||
#include "../common/unicode_util.h"
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ Forwarded: no
|
||||
+++ b/extern/cloop/Makefile
|
||||
@@ -6,7 +6,7 @@ TARGET := release
|
||||
|
||||
CC := gcc
|
||||
CXX := g++
|
||||
CC := $(CC)
|
||||
CXX := $(CXX)
|
||||
-LD := $(CXX)
|
||||
+LD := $(CXX) $(LDFLAGS)
|
||||
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
%global ver 3.0.10
|
||||
%global rev 33601
|
||||
|
||||
Name: firebird
|
||||
Version: 3.0.3.32900
|
||||
Release: 10
|
||||
Version: %{ver}.%{rev}
|
||||
Release: 1
|
||||
Summary: SQL relational database management system
|
||||
License: Interbase
|
||||
URL: http://www.firebirdsql.org/
|
||||
|
||||
Source0: https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/Firebird-3.0.3.32900-0.tar.bz2
|
||||
Source0: https://github.com/FirebirdSQL/firebird/releases/download/v%{ver}/Firebird-%{ver}.%{rev}-0.tar.bz2
|
||||
Source1: firebird-logrotate
|
||||
Source2: firebird.conf
|
||||
Source3: fb_config
|
||||
@ -16,9 +19,7 @@ Patch0002: obsolete-syslogd.target.patch
|
||||
Patch0003: honour-buildflags.patch
|
||||
Patch0004: no-copy-from-icu.patch
|
||||
Patch0005: cloop-honour-build-flags.patch
|
||||
Patch0006: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch
|
||||
Patch0007: 0001-Port-to-RISC-V-64-bit-riscv64.patch
|
||||
Patch0008: fix-failed-to-parse-pid-from-pid-file.patch
|
||||
|
||||
BuildRequires: autoconf automake libtommath-devel libtool ncurses-devel libicu-devel
|
||||
BuildRequires: libedit-devel gcc-c++ libstdc++-static systemd-units chrpath zlib-devel procmail
|
||||
@ -65,7 +66,7 @@ Obsoletes: firebird-doc < %{version}-%{release}
|
||||
Documentation for Firebird SQL server.
|
||||
|
||||
%prep
|
||||
%autosetup -n Firebird-3.0.3.32900-0 -p1
|
||||
%autosetup -n Firebird-%{ver}.%{rev}-0 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
@ -204,6 +205,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf
|
||||
%exclude %{_docdir}/firebird/IPLicense.txt
|
||||
|
||||
%changelog
|
||||
* Thu Sep 1 2022 Funda Wang <fundawang@yeah.net> - 3.0.10.33601-1
|
||||
* New version 3.0.10
|
||||
|
||||
* Tue Aug 30 2022 dillon chen<dillon.chen@gmail.com> - 3.0.3.32900-10
|
||||
- put correct source as /usr/sbin/fb_config
|
||||
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From 16b7c7ddb797a83863ec472f0db611c6c5777073 Mon Sep 17 00:00:00 2001
|
||||
From: starlet-dx <15929766099@163.com>
|
||||
Date: Mon, 7 Mar 2022 16:24:03 +0800
|
||||
Subject: [PATCH 1/1] fix failed to parse pid from pid file
|
||||
|
||||
---
|
||||
.../install/arch-specific/linux/firebird-superserver.service.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/builds/install/arch-specific/linux/firebird-superserver.service.in b/builds/install/arch-specific/linux/firebird-superserver.service.in
|
||||
index fa9fbef..7501868 100644
|
||||
--- a/builds/install/arch-specific/linux/firebird-superserver.service.in
|
||||
+++ b/builds/install/arch-specific/linux/firebird-superserver.service.in
|
||||
@@ -9,6 +9,7 @@ Group=firebird
|
||||
Type=forking
|
||||
PIDFile=/var/run/firebird/default.pid
|
||||
ExecStart=@FB_SBINDIR@/fbguard -pidfile /var/run/firebird/default.pid -daemon -forever
|
||||
+ExecStartPost=/usr/bin/sleep 0.1
|
||||
StandardError=syslog
|
||||
|
||||
[Install]
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@ -1,43 +1,6 @@
|
||||
Description: Link isql with ICU instead of embedding part of it in the source
|
||||
Author: Damyan Ivanov <dmn@debian.org>
|
||||
|
||||
--- a/src/isql/isql.epp
|
||||
+++ b/src/isql/isql.epp
|
||||
@@ -173,34 +173,6 @@ const char* UNKNOWN = "*unknown*";
|
||||
|
||||
namespace IcuUtil
|
||||
{
|
||||
- // Duplicate from ICU to not need to link ISQL with it. It's used by U8_NEXT_UNSAFE.
|
||||
- static const uint8_t utf8_countTrailBytes[256] = {
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-
|
||||
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
-
|
||||
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
||||
- 3, 3, 3, 3, 3,
|
||||
- 3, 3, 3, /* illegal in Unicode */
|
||||
- 4, 4, 4, 4, /* illegal in Unicode */
|
||||
- 5, 5, /* illegal in Unicode */
|
||||
- 0, 0 /* illegal bytes 0xfe and 0xff */
|
||||
- };
|
||||
-
|
||||
// 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
|
||||
@@ -425,7 +425,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user