Firebird 5.x

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.gitignore

@@ -1,6 +1,21 @@
 Firebird-2.1.3.18185-0.RC2.tar.bz2
 /Firebird-2.5.0.26074-0.tar.bz2
+/Firebird-2.5.1.26349-0.tar.bz2
 /Firebird-2.5.1.26351-0.tar.bz2
+/Firebird-2.5.2.26539-0.tar.bz2
 /Firebird-2.5.3.26778-0.tar.bz2
+/Firebird-2.5.4.26856-0.tar.bz2
 /Firebird-2.5.5.26952-0.tar.bz2
-/Firebird-2.5.7.27050-0.tar.bz2
+/Firebird-3.0.1.32609-0.tar.bz2
+/Firebird-3.0.2.32703-0.tar.bz2
+/Firebird-3.0.3.32900-0.tar.bz2
+/Firebird-3.0.4.33054-0.tar.bz2
+/Firebird-3.0.5.33220-0.tar.bz2
+/Firebird-3.0.6.33328-0.tar.bz2
+/Firebird-3.0.7.33374-0.tar.bz2
+/Firebird-4.0.0.2496-0.tar.xz
+/Firebird-4.0.2.2816-0.tar.xz
+/Firebird-4.0.3.2975-0.tar.xz
+/Firebird-4.0.4.3010-0.tar.xz
+/Firebird-4.0.6.3221-0.tar.xz
+/Firebird-5.0.3.1683-0-source.tar.xz

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
+
+

README.Fedora

@@ -1,38 +1,17 @@
 Differences between upstream and the Fedora package
 ===================================================
 
-* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
-  In /usr/bin you have also isql-fb symlinked to Firebird isql.
-  We can't name it isql to avoid conflict with isql from UNIX-ODBC
-  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
-  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
+* 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.
+
+* By default, Firebird is set as superserver mode.
+  Please read the Firebird doc if you want to change the mode.
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 
-  for SuperServer :  
-    service firebird start
-  for Classic :  
-    chkconfig firebird on
-  If you wanted to have firebird Superserver started at each boot, as root :
-  chkconfig --level 345 firebird on
-
-* Fedora packages do not use, nor contain the pre-supplied sources for
-  libicu. Fedora packages are used instead.
-
-* POSSIBLE INCOMPATIBILITY
-  In incides on text-based columns (CHAR/VARCHAR), Firebird uses ICU to get
-  binary-comparable sequences (collations). These collations may be different
-  in different ICU versions.
-
-  In Firebird 2.1 upstream always uses the bundled ICU library. Firebird packages
-  use the Firebird-packaged libicu*. Unfortunately, this may lead to
-  incompatibilities in the binary index representation (on disk) between
-  databases created by Fedora-packaged Firebird, and upstream.
-
-  This can also lead to incompatibilities when the Firebird packages are
-  re-built using different version of the system-wide ICU library
-
-  One way to fix this is to backup and restore all databases created with ICU
-  version different from the one currently installed on the system. Another is
-  to re-generate all indices that contain a text-based columns.
+    systemctl start firebird.service
+  If you want to have firebird started at each boot, as root :
+    systemctl enable firebird.service 
 

add-pkgconfig-files.patch

@@ -0,0 +1,26 @@
+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 0000000..d49fdc5
+--- /dev/null
++++ b/builds/install/arch-specific/linux/misc/fbclient.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@FB_LIBDIR@
++includedir=@FB_INCDIR@
++
++Name: fbclient
++Description: Firebird client library
++Version: @FIREBIRD_VERSION@
++Cflags: -I${includedir}/firebird
++Libs: -L${libdir} -lfbclient
+--- Firebird-5.0.3.1683-0-source/configure.ac~	2025-07-14 01:33:58.000000000 -0500
++++ Firebird-5.0.3.1683-0-source/configure.ac	2025-09-26 10:42:45.022624859 -0500
+@@ -1540,6 +1540,7 @@
+         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/install/misc/firebird.service:builds/install/arch-specific/linux/firebird.service.in
+     ],
+ 	[chmod a+x gen/install/*sh 2>/dev/null])

btyacc-honour-build-flags.patch

@@ -0,0 +1,12 @@
+--- a/extern/btyacc/Makefile	2022-08-12 15:24:40.846774310 +0200
++++ a/extern/btyacc/Makefile	2022-08-12 15:26:20.954809720 +0200
+@@ -12,7 +12,7 @@
+ # across all of our supported compilers/platforms.
+ 
+ # Vanilla CFLAGS
+-CFLAGS=
++CFLAGS=-fPIC -pie
+ 
+ # No LDFLAGS
+ #LDFLAGS=
+

cloop-honour-build-flags.patch

@@ -0,0 +1,54 @@
+Description: make cloop build honor compiler/linker flags from the environment
+Author: Damyan Ivanov <dmn@debian.org>
+Forwarded: no
+
+--- a/extern/cloop/Makefile
++++ b/extern/cloop/Makefile
+@@ -27,8 +27,8 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
+ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
+ OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
+ 
+-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+-CXX_FLAGS := $(C_FLAGS) -std=c++11
++C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter $(CPPFLAGS) $(CFLAGS)
++CXX_FLAGS := $(C_FLAGS) $(CXXFLAGS) -std=c++11
+ FPC_FLAGS := -Mdelphi -Cg
+ 
+ ifeq ($(shell uname),FreeBSD)
+@@ -94,7 +94,7 @@ $(BIN_DIR)/cloop: \
+ 	$(OBJ_DIR)/cloop/Main.o \
+ 	| $(BIN_DIR)
+ 
+-	$(LD) $^ -o $@ $(LIBS)
++	$(LD) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ $(SRC_DIR)/tests/test1/CalcCApi.h: $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl
+ 	$(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl c-header $@ CALC_C_API_H CALC_I
+@@ -121,23 +121,23 @@ $(BIN_DIR)/test1-c$(SHRLIB_EXT): \
+ 	$(OBJ_DIR)/tests/test1/CalcCApi.o \
+ 	$(OBJ_DIR)/tests/test1/CTest.o \
+ 
+-	$(LD) $^ -shared $(DL_LIB) -o $@ $(LIBS)
++	$(LD) $(LDFLAGS) $^ -shared $(DL_LIB) -o $@ $(LIBS)
+ 
+ $(BIN_DIR)/test1-c$(EXE_EXT): \
+ 	$(OBJ_DIR)/tests/test1/CalcCApi.o \
+ 	$(OBJ_DIR)/tests/test1/CTest.o \
+ 
+-	$(LD) $^ $(DL_LIB) -o $@ $(LIBS)
++	$(LD) $(LDFLAGS) $^ $(DL_LIB) -o $@ $(LIBS)
+ 
+ $(BIN_DIR)/test1-cpp$(SHRLIB_EXT): \
+ 	$(OBJ_DIR)/tests/test1/CppTest.o \
+ 
+-	$(LD) $^ -shared $(DL_LIB) -o $@ $(LIBS)
++	$(LD) $(LDFLAGS) $^ -shared $(DL_LIB) -o $@ $(LIBS)
+ 
+ $(BIN_DIR)/test1-cpp$(EXE_EXT): \
+ 	$(OBJ_DIR)/tests/test1/CppTest.o \
+ 
+-	$(LD) $^ $(DL_LIB) -o $@ $(LIBS)
++	$(LD) $(LDFLAGS) $^ $(DL_LIB) -o $@ $(LIBS)
+ 
+ $(BIN_DIR)/test1-pascal$(SHRLIB_EXT): \
+ 	$(SRC_DIR)/tests/test1/PascalClasses.pas \

examples-honour-build-flags.patch

@@ -0,0 +1,28 @@
+diff --git a/builds/posix/Makefile.in.plugins_examples b/builds/posix/Makefile.in.plugins_examples
+index 989e80d..344f487 100644
+--- a/builds/posix/Makefile.in.plugins_examples
++++ b/builds/posix/Makefile.in.plugins_examples
+@@ -101,7 +101,7 @@ AllObjects += $(CA_Objects)
+ crypt_app: $(CRYPT_APP)
+ 
+ $(CRYPT_APP):	$(CA_Objects)
+-	$(EXE_LINK) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
++	$(EXE_LINK) $(EXE_LINK_OPTIONS) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
+ 
+ 
+ include $(ROOT)/gen/make.shared.targets
+diff --git a/examples/extauth/Makefile b/examples/extauth/Makefile
+index 3c8b878..7de22a8 100644
+--- a/examples/extauth/Makefile
++++ b/examples/extauth/Makefile
+@@ -61,8 +61,8 @@ KEYGEN_objects=$(INTERMED)/keygen.o
+ TCWRAP_objects=$(INTERMED)/TcWrapper.o
+ KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
+ 
+-CXXFLAGS=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+-LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
++CXXFLAGS+=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
++LDFLAGS+=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
+ 
+ LINK_LIBS=-lfbclient -ltomcrypt -ltommath
+ 

fb_config

@@ -0,0 +1,20 @@
+#!/usr/bin/sh
+
+ARCH=$(uname -m)
+
+case $ARCH in
+    x86_64 | sparc64 | s390x | ppc64 | aarch64)
+        LIB_DIR=/usr/lib64
+        SECONDARY_LIB_DIR=/usr/lib
+        ;;
+    *)
+        LIB_DIR=/usr/lib
+        SECONDARY_LIB_DIR=/usr/lib64
+        ;;
+esac
+
+if [ ! -x $LIB_DIR/fb_config ]; then
+    LIB_DIR=$SECONDARY_LIB_DIR
+fi
+
+exec $LIB_DIR/fb_config "$@"

firebird-CVE-2016-1569.patch

@@ -1,11 +0,0 @@
---- a/firebird/branches/B2_5_Release/src/burp/burp.cpp
-+++ b/firebird/branches/B2_5_Release/src/burp/burp.cpp
-@@ -460,7 +460,7 @@
- 		}
- 		else
- 		{
--			BURP_print(true, 137, sw.c_str());
-+			BURP_error(137, true, sw.c_str());
- 			// msg 137  unknown switch %s
- 		}
- 	}

firebird-btyacc-fpie.patch

@@ -1,11 +0,0 @@
---- extern/btyacc/Makefile.ori	2013-03-19 09:38:04.000000000 +0100
-+++ extern/btyacc/Makefile	2013-04-27 13:20:35.964379129 +0200
-@@ -12,7 +12,7 @@ HDRS	      = defs.h mstring.h
- # across all of our supported compilers/platforms.
- 
- # Vanilla CFLAGS
--CFLAGS=
-+#CFLAGS=
- 
- # No LDFLAGS
- #LDFLAGS=

firebird.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Firebird Database Server
+After=network.target
+Conflicts=firebird-classic.socket
+
+[Service]
+User=firebird
+Group=firebird
+ExecStart=/usr/sbin/fbguard -forever
+RuntimeDirectory=firebird
+RuntimeDirectoryMode=0775
+
+[Install]
+WantedBy=multi-user.target

no-copy-from-icu.patch

@@ -0,0 +1,51 @@
+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
+@@ -543,7 +543,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)
++	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(ICU_LIBS)
+ 
+ nbackup:		$(NBACKUP)
+ 

sources

@@ -1 +1 @@
-SHA512 (Firebird-2.5.7.27050-0.tar.bz2) = 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
+SHA512 (Firebird-5.0.3.1683-0-source.tar.xz) = 3b1d075ced4dfcf099723f06a8a18ac6821aa9fd3c0c9919f44b4bb7126390436dc1a9f61369f0dd7401af5bbac82dff02edf28555046c89cbe33657e26fd937