- rediffed patches

diff --git a/Firebird-chmod.patch b/Firebird-chmod.patch
index 5b6fb8321883ddd47a669e4661a2e8dd3d6e5c7f..7a239e0b3bcd8e43f093dc9b256218eb31bfd158 100644 (file)
--- a/Firebird-chmod.patch
+++ b/Firebird-chmod.patch
@@ -1,8 +1,9 @@
---- 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

diff --git a/Firebird-gcc-icu.patch b/Firebird-gcc-icu.patch
index 808a51c4a8c5fb139cc78817543ce9ac1cbb8627..c5c08144b2bf56dc132ee9f5f523262adde47894 100644 (file)
--- a/Firebird-gcc-icu.patch
+++ b/Firebird-gcc-icu.patch
@@ -1,16 +1,11 @@
-# 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) */
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h Firebird-3.0.7.33374-0/src/common/classes/alloc.h
+--- Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h      2020-10-20 08:40:05.000000000 +0000
++++ Firebird-3.0.7.33374-0/src/common/classes/alloc.h  2022-04-04 17:51:33.923548962 +0000
+@@ -55,6 +55,7 @@
+ #else
+ #include <malloc.h>
  #endif
 +#include <new>
  
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
+ #include <memory.h>
+ 

diff --git a/Firebird.spec b/Firebird.spec
index 1717360da6e8d69e11756989ee02b5e0ff4dc5aa..1d484bc815a74c5ee44a5b8fa387653846e6b7c3 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -16,7 +16,7 @@ Summary(de.UTF-8):    Firebird - relationalen Open-Source- Datenbankmanagementsyste
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 Version:       3.0.7.33374
-Release:       1
+Release:       2
 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_7/%{name}-%{version}-0.tar.bz2
@@ -195,7 +195,7 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1

diff --git a/parallel-build.patch b/parallel-build.patch
index dc43df9d1d63e98f91891dfae4df3322294b1669..30a393f8c8f6bd6a568657db4479038153b40db1 100644 (file)
--- a/parallel-build.patch
+++ b/parallel-build.patch
@@ -8,9 +8,10 @@ Description: allow building with make -jN
 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
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in Firebird-3.0.7.33374-0/builds/posix/Makefile.in
+--- Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in        2022-04-04 17:53:31.957821756 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/Makefile.in    2022-04-04 17:53:33.598825549 +0000
+@@ -359,8 +359,8 @@ yachts.lnk:                metadata.fdb
  
  metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql
        -$(RM) $@
@@ -21,7 +22,7 @@ Forwarded: no
        $(CHMOD) 0444 $@
  
  $(HELP_FDB):  help.fdb
-@@ -339,7 +339,7 @@ $(HELP_FDB):       help.fdb
+@@ -369,7 +369,7 @@ $(HELP_FDB):       help.fdb
        $(CHMOD) 0444 $@
  
  help.fdb:     $(BLD_ROOT)/misc/help.gbak
@@ -30,7 +31,7 @@ Forwarded: no
        $(CHMOD) 0444 $@
  
  $(SECURITY_FDB):      security.fdb
-@@ -349,18 +349,18 @@ $(SECURITY_FDB): security.fdb
+@@ -379,18 +379,18 @@ $(SECURITY_FDB): security.fdb
  security.fdb: $(SRC_ROOT)/dbs/security.sql
        -$(RM) $@
        -$(RM) $(SECURITY_TMP)
@@ -56,7 +57,7 @@ Forwarded: no
        $(TOUCH) $@
  
  
-@@ -528,7 +528,7 @@ codes:     gen_codes
+@@ -562,7 +562,7 @@ codes:     gen_codes
  ids:  $(IDS)
  
  gen_codes:    $(CODES) msg.timestamp
@@ -64,8 +65,8 @@ Forwarded: no
 +      $(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
+       $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
+@@ -598,7 +598,7 @@ examples: include_generic
  message_file: $(FIREBIRD_MSG)
  
  $(FIREBIRD_MSG):      $(BUILD_FILE) msg.timestamp
@@ -74,9 +75,51 @@ Forwarded: no
        $(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
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examples Firebird-3.0.7.33374-0/builds/posix/Makefile.in.examples
+--- Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examples       2020-10-20 08:40:05.000000000 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/Makefile.in.examples   2022-04-04 17:53:33.598825549 +0000
+@@ -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
+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      2022-04-04 17:53:31.949821738 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/make.defaults  2022-04-04 17:53:33.598825549 +0000
+@@ -397,6 +397,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)
@@ -84,8 +127,9 @@ Forwarded: no
  
  
  # From msgs
---- a/builds/posix/make.rules
-+++ b/builds/posix/make.rules
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.rules Firebird-3.0.7.33374-0/builds/posix/make.rules
+--- Firebird-3.0.7.33374-0.org/builds/posix/make.rules 2020-10-20 08:40:05.000000000 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/make.rules     2022-04-04 17:53:33.598825549 +0000
 @@ -72,17 +72,17 @@ ISQL_GPRE_FLAGS = -m -z -n -ocxx
  .SUFFIXES: .c .e .epp .cpp
  
@@ -108,9 +152,10 @@ Forwarded: no
  
  
  .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
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.shared.targets Firebird-3.0.7.33374-0/builds/posix/make.shared.targets
+--- Firebird-3.0.7.33374-0.org/builds/posix/make.shared.targets        2020-10-20 08:40:05.000000000 +0000
++++ Firebird-3.0.7.33374-0/builds/posix/make.shared.targets    2022-04-04 17:53:33.598825549 +0000
+@@ -65,13 +65,13 @@ $(OBJ)/dsql/Parser.o $(OBJ)/common/keywo
  
  # Special cases for building cpp from epp
  $(OBJ)/dsql/metd.cpp: $(SRC_ROOT)/dsql/metd.epp
@@ -127,43 +172,3 @@ Forwarded: no
  
  # 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