---- Firebird-3.0.0.32483-0/src/yvalve/gds.cpp.orig 2016-08-30 21:31:23.418702669 +0200
-+++ Firebird-3.0.0.32483-0/src/yvalve/gds.cpp 2016-08-31 20:24:57.044428320 +0200
-@@ -3785,7 +3785,7 @@
+--- Firebird-4.0.4.3010-0/src/yvalve/gds.cpp.orig 2023-12-20 10:30:04.215137656 +0100
++++ Firebird-4.0.4.3010-0/src/yvalve/gds.cpp 2023-12-20 10:34:30.890122203 +0100
+@@ -3950,10 +3950,7 @@
if (!fb_utils::readenv(FB_LOCK_ENV, lockPrefix))
{
- #ifndef WIN_NT
-- PathUtils::concatPath(lockPrefix, WORKFILE, LOCKDIR);
+ #if !defined(WIN_NT)
+- const char* tmp = getTemporaryFolder();
+- if (!tmp)
+- tmp = WORKFILE;
+- PathUtils::concatPath(lockPrefix, tmp, LOCKDIR);
+ PathUtils::concatPath(lockPrefix, "/var/lib", LOCKDIR);
#else
- #ifdef WIN9X_SUPPORT
- // shell32.dll version 5.0 and later supports SHGetFolderPath entry point
+ char cmnData[MAXPATHLEN];
+ if (SHGetSpecialFolderPath(NULL, cmnData, CSIDL_COMMON_APPDATA, TRUE))
---- firebird-1.5.0.4290/builds/posix/make.defaults.orig 2003-11-11 02:01:51.000000000 +0100
-+++ firebird-1.5.0.4290/builds/posix/make.defaults 2004-05-24 23:47:17.602325704 +0200
-@@ -92,9 +92,9 @@
- SH= sh -c
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.defaults Firebird-3.0.7.33374-0/builds/posix/make.defaults
+--- Firebird-3.0.7.33374-0.org/builds/posix/make.defaults 2020-10-20 08:40:05.000000000 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/make.defaults 2022-04-04 17:50:57.999465936 +0000
+@@ -142,9 +142,9 @@ SH= sh -c
RM= rm -f
+ RM_R= rm -rf
CHMOD= chmod
-CHMOD_6= chmod 666
-CHMOD_7= chmod 777
---- Firebird-3.0.0.32483-0/configure.ac.orig 2010-09-08 10:44:05.000000000 +0200
-+++ Firebird-3.0.0.32483-0/configure.ac 2010-10-27 22:32:38.567739367 +0200
-@@ -652,10 +652,10 @@
- AC_SEARCH_LIBS(dlopen, dl)
- AC_CHECK_LIB(m, main)
+diff -up Firebird-4.0.4.3010-0/configure.ac._orig Firebird-4.0.4.3010-0/configure.ac
+--- Firebird-4.0.4.3010-0/configure.ac._orig 2024-01-11 13:38:19.046694587 +0100
++++ Firebird-4.0.4.3010-0/configure.ac 2024-01-11 13:48:42.098677678 +0100
+@@ -887,10 +887,10 @@ AC_SUBST(CRYPTLIB)
+ dnl Check for termcap support
if test "$EDITLINE_FLG" = "Y"; then
-+ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
- AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
- AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
-- AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- AC_MSG_ERROR(termcap support not found)))))
+ if test -z "$TERMLIB"; then
++ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+ AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
+ AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
+ AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
+- AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+ AC_MSG_ERROR(termcap support not found)))))
+ fi
AC_SUBST(TERMLIB)
- XE_APPEND(-l$TERMLIB, LIBS)
+++ /dev/null
-# Author: Adriano dos Santos Fernandes
-#Index: src/common/classes/alloc.h
-#===================================================================
-#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
-#retrieving revision 1.71
-diff -u -p -r1.71 alloc.h
---- src/common/classes/alloc.h 26 Sep 2007 17:48:20 -0000 1.71
-+++ src/common/classes/alloc.h 20 May 2009 02:20:08 -0000
-@@ -47,6 +47,7 @@
- #include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
- stdlib.h (EKU) */
- #endif
-+#include <new>
-
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
---- Firebird-3.0.0.32483-0/builds/posix/Makefile.in.orig 2016-04-14 16:07:29.000000000 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/Makefile.in 2016-09-01 21:59:46.720043484 +0200
-@@ -315,7 +315,7 @@
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in._orig Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in
+--- Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in._orig 2024-02-22 09:14:30.430893458 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in 2024-02-22 09:17:31.106365442 +0100
+@@ -495,7 +495,7 @@ SECURITY_TMP = security.tmp
- databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
+ databases: yachts.lnk $(SECURITY_FDB)
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(FIREBIRD)/lib
+export LD_LIBRARY_PATH := $(FIREBIRD)/lib:$(LD_LIBRARY_PATH)
---- 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
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux 2024-02-22 08:47:40.412106924 +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 -std=gnu++03 -fno-delete-null-pointer-checks
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-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 -std=gnu++03 -fno-delete-null-pointer-checks
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
+ WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs
+ PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof -Wno-class-memaccess
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- 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
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64 2024-02-22 08:49:50.947915307 +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 -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 -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
-
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm 2016-08-31 20:40:23.017751079 +0200
-@@ -20,8 +20,8 @@
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
+ WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs
+ PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof -Wno-class-memaccess
+ #VALGRIND_FLAGS=-DUSE_VALGRIND
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm 2024-02-22 08:51:24.290642044 +0100
+@@ -20,7 +20,7 @@
#LD=@CXX@
--#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
--#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
--
--PROD_FLAGS=-O3 -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
--DEV_FLAGS=-ggdb -DLINUX -DARM -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
-+OPTIMIZE_FLAGS=
-+
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMMON_FLAGS) -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm64.orig 2016-04-14 16:07:29.000000000 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm64 2016-08-31 21:08:27.381065178 +0200
-@@ -20,8 +20,8 @@
+-COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
- #LD=@CXX@
-
--#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
--#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
-+OPTIMIZE_FLAGS=
+-PROD_FLAGS=$(COMMON_FLAGS) -O3
+-DEV_FLAGS=$(COMMON_FLAGS) -p -ggdb -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64 2024-02-22 09:08:58.709795676 +0100
+@@ -23,5 +23,5 @@
+ #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+ #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch
-PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
--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.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 @@
+-DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
++DEV_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic 2024-02-22 08:54:40.156050585 +0100
+@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--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=
+-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
-PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)
--DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64 2016-08-31 20:55:10.367740946 +0200
-@@ -18,8 +18,8 @@
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- # Adriano dos Santos Fernandes - IA-64 port
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
-+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
-
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips 2016-08-31 20:56:05.504406983 +0200
-@@ -1,5 +1,5 @@
+-DEV_FLAGS=-ggdb -p -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS)
++DEV_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips 2024-02-22 08:57:58.424615561 +0100
+@@ -1,7 +1,7 @@
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin
+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
+ WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel 2016-08-31 21:01:06.977736874 +0200
-@@ -19,7 +19,9 @@
-
- LD=@CXX@
+ #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
+-DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel._orig 2024-02-22 08:37:49.342919440 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel 2024-02-22 08:59:04.557427310 +0100
+@@ -21,5 +21,5 @@ LD=@CXX@
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC
-+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
# you may remove it if engine is getting compiled with any other GCC version
-PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
--DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-non-virtual-dtor
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMMON_FLAGS) -DDEBUG_GDS_ALLOC -Wall -Wno-switch -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc 2016-08-31 21:03:32.994401873 +0200
-@@ -18,6 +18,9 @@
+-DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-non-virtual-dtor
++PROD_FLAGS=@CFLAGS@ -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
++DEV_FLAGS=@CFLAGS@ -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc._orig 2024-02-22 08:37:49.346252747 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc 2024-02-22 09:00:37.110050069 +0100
+@@ -18,6 +18,6 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3
--DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
-+COMMON_FLAGS=@CFLAGS@ -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DPowerPC -DPPC
-+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
-+
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMMON_FLAGS) -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
- #DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64.orig 2016-08-31 21:09:42.987730985 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64 2016-08-31 21:09:45.644397621 +0200
-@@ -20,8 +20,8 @@
-
- #LD=@CXX@
-
--#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
--#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
-+OPTIMIZE_FLAGS=
+-DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
++PROD_FLAGS=@CFLAGS@ -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3
++DEV_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
+ #DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64._orig 2024-02-22 08:37:49.346252747 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64 2024-02-22 09:01:39.009585755 +0100
+@@ -23,5 +23,5 @@
+ #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+ #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch
-PROD_FLAGS=-O3 -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
--DEV_FLAGS=-ggdb -DLINUX -DPPC64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMON_FLAGS) -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el.orig 2016-04-14 16:07:29.000000000 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el 2016-08-31 21:10:53.874396836 +0200
-@@ -20,8 +20,8 @@
-
- #LD=@CXX@
-
--#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
--#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
-+OPTIMIZE_FLAGS=
+-DEV_FLAGS=-ggdb -DLINUX -DPPC64 -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
++DEV_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el._orig 2024-02-22 08:37:49.346252747 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el 2024-02-22 09:02:33.409184029 +0100
+@@ -23,5 +23,5 @@
+ #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+ #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch
-PROD_FLAGS=-O3 -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
--DEV_FLAGS=-ggdb -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMMON_FLAGS) -Wno-non-virtual-dtor
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x 2016-08-31 21:05:39.261067098 +0200
-@@ -18,8 +18,8 @@
+-DEV_FLAGS=-ggdb -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
++DEV_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x._orig 2024-02-22 08:37:49.346252747 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x 2024-02-22 09:03:36.152060506 +0100
+@@ -18,10 +18,10 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char -Wno-invalid-offsetof
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char -Wno-invalid-offsetof
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
+ WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32 2016-08-31 21:06:34.644399800 +0200
-@@ -18,6 +18,7 @@
+ #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
+-DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
+diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32
+--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32._orig 2024-02-22 08:37:49.346252747 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32 2024-02-22 09:05:08.354733545 +0100
+@@ -18,6 +18,6 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
-PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
--DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
+-DEV_FLAGS=-ggdb -p -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
-+OPTIMIZE_FLAGS=
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS)
++DEV_FLAGS=@CFLAGS@ -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
# - create SYSDBA user with initial password before first firebird start
# eg.:
# su firebird
-# echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security3.fdb
+# echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security5.fdb
#
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.3.32900
+Version: 5.0.0.1306
Release: 1
License: Interbase Public License 1.0, Initial Developer's Public License 1.0
Group: Applications/Databases
-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
+Source0: https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/%{name}-%{version}-0-source.tar.xz
+# Source0-md5: 9d8b64e922df57d6a3f3de1acca4f8e3
+Source1: https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/qsg5/firebird-5-quickstartguide.pdf
+# Source1-md5: c02b14827cc050806bf107fd85a18458
# distfiles refuses this, would require some audit to allow '('/')' chars
#Source2: http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
## Source2-md5: 9eb90583c200bdd7292a80ecc1df1178
Source3: http://www.firebirdsql.org/pdfmanual/%{name}-Null-Guide.pdf
-# Source3-md5: d1f8ba75fe3bb9eb9d203ce3f82a1a1a
+# Source3-md5: dc8e5e234b2138af9a472feca6565359
Source4: http://www.firebirdsql.org/pdfmanual/%{name}-Generator-Guide.pdf
-# Source4-md5: 44e7568ef477072a8ad5f381c3e12a75
+# Source4-md5: 23926037205ab8716cf0a54544585231
Source5: http://www.firebirdsql.org/pdfmanual/MSSQL-to-%{name}.pdf
-# Source5-md5: 1bd4a168e550910fc899e2aa125d83a3
+# Source5-md5: 230ef237842d255916398f408f459281
Source6: http://www.firebirdsql.org/pdfmanual/%{name}-nbackup.pdf
-# Source6-md5: 7ef8a8b9a899d06bec2a5da0bb5fea0e
-Source7: http://www.firebirdsql.org/pdfmanual/%{name}-Utils-WIP.pdf
-# Source7-md5: 39b9a4f3c9d9e27d985e9277ae163ceb
+# Source6-md5: 98d310a374ecc3f1f241e1feac6e4dca
+Source7: http://www.firebirdsql.org/pdfmanual/%{name}-shell-scripts.pdf
+# Source7-md5: 01c5e91de9f1639f62f93b3e486584c8
Source8: http://www.firebirdnews.org/docs/fb2min.pdf
-# Source8-md5: ebac312c0afbe97b1850bdc74c553c28
-Source9: http://www.firebirdsql.org/doc/contrib/fb_2_1_errorcodes.pdf
+# Source8-md5: 5e192abaf5db4417b29ad871716522b5
+Source9: https://firebirdsql.org/file/documentation/reference_manuals/reference_material/Firebird-2.1-ErrorCodes.pdf
# Source9-md5: 9ab392dc349657dbcf9a9c35acd8e8db
+Source10: http://www.firebirdsql.org/pdfmanual/%{name}-gsec.pdf
+# Source10-md5: 326ef6f7afebf369b534838945ee4f74
+Source11: http://www.firebirdsql.org/pdfmanual/%{name}-gfix.pdf
+# Source11-md5: 22e2cdc1058dd4f764728bcb3a8644f0
+Source12: http://www.firebirdsql.org/pdfmanual/%{name}-gsplit.pdf
+# Source12-md5: 0147b5d2118e2e80c93762600107a71f
+Source13: https://firebirdsql.org/file/documentation/pdf/en/refdocs/fblangref50/firebird-50-language-reference.pdf
+# Source13-md5: cf095a223a7b7f631e6a4b8a9604b1da
Source100: firebird.init
Source101: firebird.sysconfig
Source102: firebird.inetd
Source106: firebird-classic.socket
Source107: server_mode-ss.conf
Source108: server_mode-classic.conf
+Source109: fb_config
Patch0: %{name}-chmod.patch
Patch1: %{name}-editline.patch
Patch2: %{name}-va.patch
Patch3: %{name}-FHS.patch
Patch4: %{name}-opt.patch
-Patch5: %{name}-gcc-icu.patch
Patch6: %{name}-libpath.patch
-Patch8: Provide-sized-global-delete-operators-when-compiled.patch
-Patch9: parallel-build.patch
+Patch7: add-pkgconfig-files.patch
Patch10: no-copy-from-icu.patch
Patch11: config.patch
Patch12: chown.patch
+Patch13: cloop-honour-build-flags.patch
+Patch14: mod_loader.patch
URL: http://www.firebirdsql.org/
BuildRequires: autoconf >= 2.67
BuildRequires: automake
ExclusiveArch: %{ix86} %{x8664} x32 arm ia64 mips mipsel ppc sparc sparcv9 alpha
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define filterout -flto
%define ibdir %{_libdir}/interbase
%define specflags -fno-strict-aliasing
%define debugcflags -O1 -g -Wall -fno-strict-aliasing
Skrypty startowe Firebirda w wersji Classic (inetd).
%prep
-%setup -q -n %{name}-%{version}-0
+%setup -q -n %{name}-%{version}-0-source
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p0
%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch7 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
mkdir docs
-cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
+cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} \
+ %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} docs
# not processed by configure
%{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags} %{rpmcppflags}/' extern/btyacc/Makefile
-%{__sed} -i -e 's/^\(CC\|LINKER\)\(.*= \)gcc$/\1\2 %{__cc}/' extern/btyacc/Makefile
+%{__sed} -i -e 's;^\(CC\|LINKER\)\(.*= \)gcc$;\1\2 %{__cc};' extern/btyacc/Makefile
%build
%{__libtoolize}
%configure \
CFLAGS="%{rpmcflags} -fno-delete-null-pointer-checks" \
--prefix=%{ibdir} \
- --with-system-editline \
--with-fbconf=%{_sysconfdir}/firebird \
--with-fbinclude=%{_includedir} \
--with-fblib=%{_libdir} \
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C src -f ../gen/Makefile.install buildImageDir
+%{__make} -C src -f ../gen/Makefile.install buildRoot
install -d $RPM_BUILD_ROOT%{_sysconfdir}/{firebird{,/conf.d},rc.d/init.d,sysconfig/rc-inetd}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir},%{_pkgconfigdir}} \
install -d $RPM_BUILD_ROOT/var/{log,lib/firebird} \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/firebird.conf
touch $RPM_BUILD_ROOT/var/log/firebird.log
+cp -p gen/install/misc/fbclient.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+
cd gen/buildroot
-cp -p var/lib/firebird/security3.fdb $RPM_BUILD_ROOT/var/lib/firebird
+cp -p var/lib/firebird/security5.fdb $RPM_BUILD_ROOT/var/lib/firebird
cp -p etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
chmod 755 usr/include/firebird/impl
cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}
cp -dp usr/%{_lib}/*.so* $RPM_BUILD_ROOT%{_libdir}
cd .%{ibdir}
-cp -a UDF bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
+cp -a bin intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird
-ln -s %{ibdir}/{UDF,bin,plugins,firebird.msg} $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+ln -s %{ibdir}/{bin,plugins,firebird.msg} $RPM_BUILD_ROOT%{_sysconfdir}/firebird
chmod u+w -R examples # allow further cleaning
cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE100} >$RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
cp -p %{SOURCE101} $RPM_BUILD_ROOT/etc/sysconfig/firebird
sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE104} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird.service
-install -d $RPM_BUILD_ROOT/var/run/firebird
+install -d $RPM_BUILD_ROOT/run/firebird
sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE102} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE105} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird-classic@.service
cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
+install -p %{_sourcedir}/fb_config $RPM_BUILD_ROOT%{_bindir}/fb_config
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
+%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*}
%dir %{_sysconfdir}/firebird
%dir %{_sysconfdir}/firebird/conf.d
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/databases.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/fbtrace.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/firebird.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/plugins.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/replication.conf
%{_sysconfdir}/firebird/intl
-%{_sysconfdir}/firebird/UDF
%{_sysconfdir}/firebird/bin
%{_sysconfdir}/firebird/firebird.msg
%{_sysconfdir}/firebird/plugins
%attr(755,root,root) %{_bindir}/gstat
%attr(755,root,root) %{_bindir}/nbackup
%attr(755,root,root) %{_libdir}/libib_util.so
-%attr(755,root,root) %{ibdir}/UDF
%attr(755,root,root) %{ibdir}/bin/*
%exclude %{ibdir}/bin/fb_config
%exclude %{ibdir}/bin/gpre
%exclude %{ibdir}/bin/fbguard
-%{ibdir}/help
%dir %{ibdir}/intl
%attr(755,root,root) %{ibdir}/intl/fbintl
# should it be moved to %{_sysconfdir} and marked as config?
%{ibdir}/intl/fbintl.conf
%dir %{ibdir}/plugins
+%attr(755,root,root) %{ibdir}/plugins/libChaCha.so
+%attr(755,root,root) %{ibdir}/plugins/libDefault_Profiler.so
%attr(755,root,root) %{ibdir}/plugins/libfbtrace.so
-%attr(755,root,root) %{ibdir}/plugins/libCryptKeyHolder_example.so
-%attr(755,root,root) %{ibdir}/plugins/libDbCrypt_example.so
-%attr(755,root,root) %{ibdir}/plugins/libEngine12.so
+%attr(755,root,root) %{ibdir}/plugins/libEngine13.so
%attr(755,root,root) %{ibdir}/plugins/libLegacy_Auth.so
%attr(755,root,root) %{ibdir}/plugins/libLegacy_UserManager.so
%attr(755,root,root) %{ibdir}/plugins/libSrp.so
%attr(755,root,root) %{ibdir}/plugins/libudr_engine.so
%dir %{ibdir}/plugins/udr
+%attr(755,root,root) %{ibdir}/plugins/udr/libudf_compat.so
+%{ibdir}/plugins/udr/udf_compat.sql
%attr(755,root,root) %{ibdir}/plugins/udr/libudrcpp_example.so
%{ibdir}/plugins/udr_engine.conf
%{ibdir}/firebird.msg
%dir %attr(770,root,firebird) /var/lib/firebird
-%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security3.fdb
+%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security5.fdb
%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fb_config
%attr(755,root,root) %{_libdir}/libfbclient.so
%attr(755,root,root) %{ibdir}/bin/fb_config
%attr(755,root,root) %{ibdir}/bin/gpre
%attr(755,root,root) %{_bindir}/gpre
+%{_pkgconfigdir}/fbclient.pc
%{_includedir}/firebird
%{_includedir}/ib_util.h
%{_includedir}/ibase.h
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/firebird
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tmpfiles.d/firebird.conf
%attr(755,root,root) %{ibdir}/bin/fbguard
-%dir %attr(770,root,firebird) /var/run/firebird
+%dir %attr(770,root,firebird) /run/firebird
%{systemdunitdir}/firebird.service
%files classic
+++ /dev/null
-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
-
-
--- /dev/null
+From: Michal Kubecek <mkubecek@suse.cz>
+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
+--- /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.0.1306-0-source/configure.ac.orig 2024-02-22 09:18:28.582654361 +0100
++++ Firebird-5.0.0.1306-0-source/configure.ac 2024-02-22 09:20:41.441784406 +0100
+@@ -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])
--- /dev/null
+Description: make cloop build honor compiler/linker flags from the environment
+Author: Damyan Ivanov <dmn@debian.org>
+Forwarded: no
+
+--- Firebird-4.0.4.3010-0/extern/cloop/Makefile.orig 2023-11-08 13:07:47.000000000 +0100
++++ Firebird-4.0.4.3010-0/extern/cloop/Makefile 2023-12-20 11:25:08.527689312 +0100
+@@ -6,7 +6,7 @@
+
+ CC := $(CC)
+ CXX := $(CXX)
+-LD := $(CXX)
++LD := $(CXX) $(LDFLAGS)
+
+ SRC_DIR := src
+ BUILD_DIR := build
+@@ -27,8 +27,9 @@
+ 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
++COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
++C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) -std=c++11
+ FPC_FLAGS := -Mdelphi -Cg
+
+ ifeq ($(shell uname),FreeBSD)
---- Firebird-3.0.2.32703-0/builds/install/misc/firebird.conf.in.orig 2017-03-21 10:11:35.000000000 +0100
-+++ Firebird-3.0.2.32703-0/builds/install/misc/firebird.conf.in 2017-04-03 12:24:52.184150250 +0200
-@@ -919,3 +919,5 @@
- # Type: string
+--- Firebird-5.0.0.1306-0-source/builds/install/misc/firebird.conf.orig 2024-01-11 11:24:21.000000000 +0100
++++ Firebird-5.0.0.1306-0-source/builds/install/misc/firebird.conf 2024-02-22 09:29:00.475211032 +0100
+@@ -775,6 +775,7 @@
+ # Type: string
#
- #ServerMode = Super
+ #DataTypeCompatibility =
++DataTypeCompatibility = 3.0
+
+
+ # ===========================
+@@ -1258,3 +1259,5 @@
+ # Type: integer
+ #
+ #ExtConnPoolLifeTime = 7200
+
+include conf.d/*.conf
--- /dev/null
+#!/bin/sh
+
+set -e
+ARCH=$(uname -m)
+
+case "$ARCH" in
+ x86_64 | sparc64 | s390x | ppc64 | aarch64)
+ LIB_DIR=/usr/lib64/interbase/bin
+ SECONDARY_LIB_DIR=/usr/lib/interbase/bin
+ ;;
+ *)
+ LIB_DIR=/usr/lib/interbase/bin
+ SECONDARY_LIB_DIR=/usr/lib64/interbase/bin
+ ;;
+esac
+
+if [ ! -x "$LIB_DIR"/fb_config ]; then
+ LIB_DIR=$SECONDARY_LIB_DIR
+fi
+
+exec "$LIB_DIR"/fb_config "$@"
Group=firebird
ExecStart=/usr/lib/interbase/bin/firebird -el /var/lib/firebird
StandardInput=socket
-StandardError=syslog
[Install]
Also=firebird-classic.socket
. /etc/sysconfig/network
-# Source oident configureation.
+# Source firebird configuration.
if [ -f /etc/sysconfig/firebird ]; then
. /etc/sysconfig/firebird
fi
GUARDIAN=/usr/lib/interbase/bin/fbguard
-PIDFILE=/var/run/firebird/firebird.pid
+PIDFILE=/run/firebird/firebird.pid
# Check that networking is up.
if is_yes "${NETWORKING}"; then
User=firebird
Group=firebird
Type=forking
-PIDFile=/var/run/firebird/default.pid
-ExecStart=/usr/lib/interbase/bin/fbguard -pidfile /var/run/firebird/default.pid -daemon -forever
-StandardError=syslog
+ExecStart=/usr/lib/interbase/bin/fbguard -pidfile /run/firebird/default.pid -daemon -forever
[Install]
WantedBy=multi-user.target
-d /var/run/firebird 0770 root firebird -
+d /run/firebird 0770 root firebird -
--- /dev/null
+Loosen a bit a module filename check
+
+diff -up Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp._orig Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp
+--- Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp._orig 2024-02-22 09:31:12.670991187 +0100
++++ Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp 2024-02-22 09:34:31.349588488 +0100
+@@ -199,7 +199,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS
+ symbolPath = info.dli_fname;
+
+ const char* errText = "Actual module name does not match requested";
+- if (PathUtils::isRelative(libraryPath) || PathUtils::isRelative(symbolPath))
+ {
+ // check only name (not path) of the library
+ Firebird::PathName dummyDir, nm1, nm2;
+@@ -211,11 +210,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS
+ return NULL;
+ }
+ }
+- else if (libraryPath != symbolPath)
+- {
+- makeErrorStatus(status, errText);
+- return NULL;
+- }
+ #endif
+
+ return result;
// 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
-@@ -454,7 +454,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB
+--- Firebird-3.0.5.33220-0/builds/posix/Makefile.in.orig 2020-01-13 12:24:58.332032230 +0100
++++ Firebird-3.0.5.33220-0/builds/posix/Makefile.in 2020-01-13 12:37:30.703461522 +0100
+@@ -481,7 +481,8 @@
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)
+- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
++ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) \
++ $(LINK_LIBS) $(ICU_LIBS) $(call LINK_DARWIN_RPATH,..)
nbackup: $(NBACKUP)
+++ /dev/null
-Description: allow building with make -jN
- without this there are sporadic segmentation faults
- .
- it seems that when gpre opens a database, it clashes with other gpre
- processes that have the database open. perhaps this is because at
- this stage of the build the compiled firebird engine lacks ability for
- synchronisation. So, wrap all engine-using calls with a lock file
-Author: Damyan Ivanov <dmn@debian.org>
-Forwarded: no
-
---- a/builds/posix/Makefile.in
-+++ b/builds/posix/Makefile.in
-@@ -329,8 +329,8 @@ yachts.lnk: metadata.fdb
-
- metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql
- -$(RM) $@
-- $(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql
-- $(RUN_GFIX) -mode read_only $@
-+ $(call LOCK_RUN,$(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql)
-+ $(call LOCK_RUN,$(RUN_GFIX) -mode read_only $@)
- $(CHMOD) 0444 $@
-
- $(HELP_FDB): help.fdb
-@@ -339,7 +339,7 @@ $(HELP_FDB): help.fdb
- $(CHMOD) 0444 $@
-
- help.fdb: $(BLD_ROOT)/misc/help.gbak
-- $(RUN_GBAK) -MODE read_only -R $< $@
-+ $(call LOCK_RUN,$(RUN_GBAK) -MODE read_only -R $< $@)
- $(CHMOD) 0444 $@
-
- $(SECURITY_FDB): security.fdb
-@@ -349,18 +349,18 @@ $(SECURITY_FDB): security.fdb
- security.fdb: $(SRC_ROOT)/dbs/security.sql
- -$(RM) $@
- -$(RM) $(SECURITY_TMP)
-- echo create database \'$(SECURITY_TMP)\'\; | $(RUN_ISQL)
-- $(RUN_GFIX) -write async $(SECURITY_TMP)
-- $(RUN_ISQL) -i $^ $(SECURITY_TMP)
-+ $(call LOCK_RUN,echo create database \'$(SECURITY_TMP)\'\; | $(RUN_ISQL))
-+ $(call LOCK_RUN,$(RUN_GFIX) -write async $(SECURITY_TMP))
-+ $(call LOCK_RUN,$(RUN_ISQL) -i $^ $(SECURITY_TMP))
- $(CHMOD) a=rw $(SECURITY_TMP)
- $(CP) $(SECURITY_TMP) $@
-- $(RUN_GFIX) -write sync $@
-+ $(call LOCK_RUN,$(RUN_GFIX) -write sync $@)
-
- msg.timestamp: $(MSG_FILES)
- -$(RM) msg.fdb
-- echo create database \'msg.fdb\'\; | $(RUN_ISQL)
-- $(RUN_GFIX) -write async msg.fdb
-- for sql in $(MSG_FILES); do (echo $$sql; $(RUN_ISQL) -i $$sql msg.fdb) || exit; done
-+ $(call LOCK_RUN,echo create database \'msg.fdb\'\; | $(RUN_ISQL))
-+ $(call LOCK_RUN,$(RUN_GFIX) -write async msg.fdb)
-+ $(call LOCK_RUN,for sql in $(MSG_FILES); do (echo $$sql; $(RUN_ISQL) -i $$sql msg.fdb) || exit; done)
- $(TOUCH) $@
-
-
-@@ -528,7 +528,7 @@ codes: gen_codes
- ids: $(IDS)
-
- gen_codes: $(CODES) msg.timestamp
-- $(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
-+ $(call LOCK_RUN,$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT))
-
- $(CODES): $(CODES_Objects) $(COMMON_LIB)
- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
-@@ -564,7 +564,7 @@ examples: include_generic
- message_file: $(FIREBIRD_MSG)
-
- $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp
-- $(BUILD_FILE) -d msg.fdb -f $@
-+ $(call LOCK_RUN,$(BUILD_FILE) -d msg.fdb -f $@)
- $(CHMOD_6) $@
-
- $(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
---- a/builds/posix/make.defaults
-+++ b/builds/posix/make.defaults
-@@ -378,6 +378,7 @@ GPRE_BOOT = $(RBIN)/gpre_boot$(EXE
- GPRE = $(BIN)/gpre$(EXEC_EXT)
- RUN_GPRE = $(RBIN)/gpre$(EXEC_EXT)
- GPRE_CURRENT = $(RBIN)/gpre_current$(EXEC_EXT)
-+LOCK_RUN = sh -x -c "lockfile -1 $(BIN)/build-db.lock && $(subst $$,\$$,$(1)); res=\$$?; rm -f $(BIN)/build-db.lock; exit \$$res"
-
-
- # From msgs
---- a/builds/posix/make.rules
-+++ b/builds/posix/make.rules
-@@ -72,17 +72,17 @@ ISQL_GPRE_FLAGS = -m -z -n -ocxx
- .SUFFIXES: .c .e .epp .cpp
-
- .e.c:
-- $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@)
-
-
- $(OBJ)/jrd/%.cpp: $(SRC_ROOT)/jrd/%.epp
-- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@)
-
- $(OBJ)/isql/%.cpp: $(SRC_ROOT)/isql/%.epp
-- $(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@)
-
- $(OBJ)/%.cpp: $(SRC_ROOT)/%.epp
-- $(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@)
-
-
- .SUFFIXES: .lo .o .cpp .c
---- a/builds/posix/make.shared.targets
-+++ b/builds/posix/make.shared.targets
-@@ -65,13 +65,13 @@ $(OBJ)/dsql/Parser.o $(OBJ)/yvalve/keywo
-
- # Special cases for building cpp from epp
- $(OBJ)/dsql/metd.cpp: $(SRC_ROOT)/dsql/metd.epp
-- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@)
-
- $(OBJ)/dsql/DdlNodes.cpp: $(SRC_ROOT)/dsql/DdlNodes.epp
-- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@)
-
- $(OBJ)/dsql/PackageNodes.cpp: $(SRC_ROOT)/dsql/PackageNodes.epp
-- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@)
-
- # Adding resources as prerequisite for some files
-
---- a/builds/posix/Makefile.in.examples
-+++ b/builds/posix/Makefile.in.examples
-@@ -123,8 +123,8 @@ $(EXAMPLES_DEST)% : $(EXAMPLES_SRC)%
-
- $(EMPLOYEE_DB): $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT)
- -$(RM) $(EMPLOYEE_DB)
-- ./empbuild $(EMPLOYEE_DB)
-- $(GFIX) -write sync $(EMPLOYEE_DB)
-+ $(call LOCK_RUN,./empbuild $(EMPLOYEE_DB))
-+ $(call LOCK_RUN,$(GFIX) -write sync $(EMPLOYEE_DB))
- -$(CHMOD_6) $(EMPLOYEE_DB)
-
- # To get past the fact isql is called from the programs, we create a local link in this directory
-@@ -140,7 +140,7 @@ $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_
-
- $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
- -$(RM) $(EXAMPLES_DEST)/empbuild.fdb
-- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql
-+ $(call LOCK_RUN,$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql)
-
- # The chain for intlemp.fdb is the same a script file to create an empty database
- # to allow a .e program to be compiled, to then create and populate with data
-@@ -148,7 +148,7 @@ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPL
-
- $(EXAMPLES_DEST)/intlemp.fdb: $(EXAMPLES_DEST)/intlbld$(EXEC_EXT) $(INTL_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT)
- -$(RM) intlemp.fdb
-- ./intlbld intlemp.fdb
-+ $(call LOCK_RUN,./intlbld intlemp.fdb)
- -$(CHMOD_6) intlemp.fdb
-
- $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_LIB)
-@@ -158,7 +158,7 @@ $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_D
-
- $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
- -$(RM) intlbuild.fdb
-- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql
-+ $(call LOCK_RUN,$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql)
-
-
- $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql
projects / packages / Firebird.git / commitdiff