firebird3: => 3.0.3.32900-0

12 files changed, 126 insertions, 94 deletions

diff --git a/database/firebird3/BUILD b/database/firebird3/BUILD
index eaf9103a86..1482a7763e 100755
--- a/database/firebird3/BUILD
+++ b/database/firebird3/BUILD
@@ -1,7 +1,11 @@
 CXXFLAGS+=" -Wno-narrowing -Wno-deprecated-declarations -Wno-invalid-offsetof" &&
 CXXFLAGS+=" -fno-sized-deallocation -fno-delete-null-pointer-checks -flifetime-dse=1 -fcheck-new" &&
+CXXFLAGS+=" -Wno-deprecated" &&
+CXXFLAGS+=" -fPIC" &&
+OPTS+=" -DCMAKE_CXX_STANDARD=11" &&
+OPTS+=" -DCMAKE_C_STANDARD=11" &&
 persistent_add FB_PREFIX               &&
-FB_PREFIX=${INSTALL_ROOT}/opt/firebird &&
+FB_PREFIX=${INSTALL_ROOT}/opt/firebird3 &&
 cmake_build $FB_PREFIX &&
 if [[ $CMAKE_GEN == Ninja ]];then
   ninja copy_files
diff --git a/database/firebird3/DETAILS b/database/firebird3/DETAILS
index 3b9d030c16..8969fa9c78 100755
--- a/database/firebird3/DETAILS
+++ b/database/firebird3/DETAILS
@@ -1,12 +1,14 @@
            SPELL=firebird3
           SPELLX=Firebird
-         VERSION=3.0.2.32703-0
-     SOURCE_HASH=sha512:5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
+         VERSION=3.0.3.32900-0
+     SOURCE_HASH=sha512:09c4b48745b91973ead9a0be065ebe0ba38db40e4e8a98e29a56c37582e7a7b2bc503c9303af5478bb4c857ce6b7ea07713d769ef7df0543c6c02cffdb630555
   SECURTIY_PATCH=1
+        VX=${VERSION%.*}
+        VX=${VX/./_}
+        VX=R${VX/./_}
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
           SOURCE=${SPELLX}-$VERSION.tar.bz2
-#   SOURCE_URL[0]=https://firebirdsql.org/download/prerelease/source/$SOURCE
-   SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
+   SOURCE_URL[0]=https://github.com/FirebirdSQL/firebird/releases/download/$VX/$SOURCE
         WEB_SITE=https://www.firebirdsql.org
          LICENSE=IDPL
          ENTERED=20151111
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 9c4e95d4e5..2548a616a5 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,10 @@
+2018-02-03 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.0.3.32900-0
+	* patches/*: update
+	* BUILD: tweak flags
+	* INSTALL: adjust, install to /opt/firebird3, to allow co-installation with firebird4
+	* init.d/firebird3: adjust
+
 2017-04-01 Treeve Jelbert <treeve@sourcemage.org>
 	* PREPARE  BUILD: revert pervious patch
 	* BUILD: suppress some warnings
diff --git a/database/firebird3/INSTALL b/database/firebird3/INSTALL
index 5ae14b4164..4b0ddad2f7 100755
--- a/database/firebird3/INSTALL
+++ b/database/firebird3/INSTALL
@@ -1,48 +1,42 @@
-cd $SOURCE_DIRECTORY/build/firebird &&
+BLD=$SOURCE_DIRECTORY/build &&
+cd $BLD/firebird &&
 # config files
-DEST=$INSTALL_ROOT/etc/firebird   &&
+DEST=$INSTALL_ROOT/etc/firebird3   &&
 mkdir -p $DEST &&
 chown firebird:firebird $DEST     &&
-
 # treate the security db as a config file
 install_config_file security3.fdb $DEST/security3.fdb &&
 chown firebird:firebird $DEST/security3.fdb  &&
-
-install_config_file firebird.conf  $DEST/firebird.conf    &&
-install_config_file databases.conf $DEST/databases.conf   &&
+cp -a *.conf $DEST &&
+#cd  $SOURCE_DIRECTORY/builds/install/misc/ &&
+#install_config_file firebird.conf.in  $DEST/firebird.conf    &&
+#install_config_file databases.conf.in $DEST/databases.conf   &&
 #install_config_file fbintl.conf   $DEST/fbintl.conf  &&
-install_config_file plugins.conf  $DEST/plugins.conf &&
-install_config_file fbtrace.conf  $DEST/fbtrace.conf     &&
+#install_config_file plugins.conf  $DEST/plugins.conf &&
+cd $BLD &&
+DEST=$INSTALL_ROOT/$FB_PREFIX &&
+mkdir -p $DEST &&
+cp src/msg.fdb src/help.fdb $DEST &&
+# install the built tree
+cp -a firebird/* $DEST    &&
 
-# don't overwrite existing config files
-rm *.conf security3.fdb        &&
-# need the impl/boost files; copy them to the built tree
-cp -a $SOURCE_DIRECTORY/src//include/firebird/impl include/firebird    &&
-#cp src/msg.fdb src/help.fdb $FB_PREFIX &&
-DEST=$FB_PREFIX  &&
+DEST=$INSTALL_ROOT/$FB_PREFIX/include/firebird  &&
 mkdir -p $DEST   &&
-cp -a * $DEST    &&
+# need the impl/boost files; copy them as well
+cp -a $SOURCE_DIRECTORY/src/include/firebird/impl $DEST &&
 
 # need some symlinks
 
-TGT=$TRACK_ROOT/opt/firebird     &&
-#ln -vsf $TGT/plugins $DEST       &&
-#ln -vsf $TGT/intl    $DEST       &&
-
-FROM=$INSTALL_ROOT/usr/include   &&
-mkdir -p $FROM &&
+TGT=$TRACK_ROOT/$FB_PREFIX     &&
+FROM=$INSTALL_ROOT/usr &&
+mkdir -p $FROM/lib &&
+ln -vsf $TGT/lib/libfb3client.so $FROM/lib &&
+mkdir -p $FROM/include &&
+ln -vsf $TGT/include $FROM/include/fb3 &&
 
-ln -vsf $TGT/include/ibase.h   $FROM &&
-ln -vsf $TGT/include/iberror.h $FROM &&
-ln -vsf $TGT/include/ib_util.h $FROM &&
-ln -vsf $TGT/include/firebird  $FROM &&
-FROM=$INSTALL_ROOT/usr/lib &&
-mkdir -p $FROM &&
-ln -vsf $TGT/lib/libfbclient.so $FROM &&
-ln -vsf $TGT/lib/libib_util.so  $FROM &&
 # link to config files
-FROM=$INSTALL_ROOT/opt/firebird &&
-TGT=$TRACK_ROOT/etc/firebird    &&
+FROM=$INSTALL_ROOT/$FB_PREFIX &&
+TGT=$TRACK_ROOT/etc/firebird3    &&
 ln -vsf $TGT/security3.fdb  $FROM &&
 ln -vsf $TGT/firebird.conf  $FROM &&
 ln -vsf $TGT/databases.conf $FROM &&
diff --git a/database/firebird3/init.d/firebird3 b/database/firebird3/init.d/firebird3
index ad61e77084..9eeee6c613 100755
--- a/database/firebird3/init.d/firebird3
+++ b/database/firebird3/init.d/firebird3
@@ -6,7 +6,7 @@
 # on system startup and shutdown to start the background
 # Firebird2  database Super server daemon 
 
-FB_DIR=/opt/firebird/bin
+FB_DIR=/opt/firebird3/bin
 FB=firebird
 # preferred method of stopping is to kill the process
 
diff --git a/database/firebird3/patches/0001-use-system-libedit.patch b/database/firebird3/patches/0001-use-system-libedit.patch
index bf151f647d..5e67283988 100644
--- a/database/firebird3/patches/0001-use-system-libedit.patch
+++ b/database/firebird3/patches/0001-use-system-libedit.patch
@@ -1,7 +1,7 @@
-From 2f45f14f3393b7a978f9301599183a54c0d90ad5 Mon Sep 17 00:00:00 2001
+From 67edd37004966eff8329cfc9bffe91c797c70f7d Mon Sep 17 00:00:00 2001
 From: Treeve Jelbert <treeve@sourcemage.org>
 Date: Thu, 7 Jan 2016 15:59:12 +0100
-Subject: [PATCH 1/5] use system libedit
+Subject: [PATCH 1/6] use system libedit
 
 ---
  CMakeLists.txt                  |  2 +-
@@ -11,11 +11,11 @@ Subject: [PATCH 1/5] use system libedit
  4 files changed, 8 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d23b260..0423ca7 100644
+index 6938299..fd1fc25 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -215,7 +215,7 @@ if (UNIX)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4")
  
      if (NOT CMAKE_CROSSCOMPILING)
 -        set(LIB_readline readline)
@@ -24,7 +24,7 @@ index d23b260..0423ca7 100644
      if (NOT FREEBSD)
          set(LIB_dl dl)
 diff --git a/builds/cmake/Configure.cmake b/builds/cmake/Configure.cmake
-index 1e1e9a1..006f9a3 100644
+index 9faa0e5..81a0575 100644
 --- a/builds/cmake/Configure.cmake
 +++ b/builds/cmake/Configure.cmake
 @@ -124,7 +124,7 @@ set(include_files_list
@@ -37,7 +37,7 @@ index 1e1e9a1..006f9a3 100644
      fcntl.h
      float.h
 diff --git a/src/include/gen/autoconfig.h.in b/src/include/gen/autoconfig.h.in
-index 997589e..4a04c7a 100644
+index 4440f4c..552255f 100644
 --- a/src/include/gen/autoconfig.h.in
 +++ b/src/include/gen/autoconfig.h.in
 @@ -195,8 +195,8 @@
@@ -52,7 +52,7 @@ index 997589e..4a04c7a 100644
  /* Define to 1 if you have the <errno.h> header file. */
  #cmakedefine HAVE_ERRNO_H 1
 diff --git a/src/isql/isql.epp b/src/isql/isql.epp
-index e9d1eb6..71fc21f 100644
+index af9cd49..65b4a4e 100644
 --- a/src/isql/isql.epp
 +++ b/src/isql/isql.epp
 @@ -78,10 +78,8 @@
@@ -87,5 +87,5 @@ index e9d1eb6..71fc21f 100644
  	{
  		// CVC: On 2005-04-02, use an empty prompt when not working in
 -- 
-2.12.2
+2.16.0
 
diff --git a/database/firebird3/patches/0002-use-system-libtommath.patch b/database/firebird3/patches/0002-use-system-libtommath.patch
index 2e15ec8b0f..5da150ef4c 100644
--- a/database/firebird3/patches/0002-use-system-libtommath.patch
+++ b/database/firebird3/patches/0002-use-system-libtommath.patch
@@ -1,7 +1,7 @@
-From 136edcfa28f08c7075a156bd60ae5d583b4dc5de Mon Sep 17 00:00:00 2001
+From 3a92af4f6ae241f2bd84caef3c763e5ad8c80ec6 Mon Sep 17 00:00:00 2001
 From: Treeve Jelbert <treeve@sourcemage.org>
 Date: Sat, 24 Jan 2015 12:48:36 +0100
-Subject: [PATCH 2/5] use system libtommath
+Subject: [PATCH 2/6] use system libtommath
 
 ---
  CMakeLists.txt     | 5 -----
@@ -9,7 +9,7 @@ Subject: [PATCH 2/5] use system libtommath
  2 files changed, 2 insertions(+), 7 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0423ca7..edcce97 100644
+index fd1fc25..e607732 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -321,7 +321,6 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -32,10 +32,10 @@ index 0423ca7..edcce97 100644
  ########################################
  # EXECUTABLE btyacc
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9ca8421..583c4c8 100644
+index 5b2739b..1344d1b 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -413,7 +413,7 @@ add_library                 (boot_yvalve SHARED $<TARGET_OBJECTS:yvalve_common>
+@@ -412,7 +412,7 @@ add_library                 (boot_yvalve SHARED $<TARGET_OBJECTS:yvalve_common>
  target_link_libraries       (boot_yvalve
      PRIVATE remote
      PRIVATE common
@@ -44,7 +44,7 @@ index 9ca8421..583c4c8 100644
      PUBLIC ${LIB_Ws2_32}
      PUBLIC ${LIB_readline}
      PUBLIC ${LIB_dl}
-@@ -436,7 +436,7 @@ add_library                 (yvalve SHARED $<TARGET_OBJECTS:yvalve_common> ${yva
+@@ -435,7 +435,7 @@ add_library                 (yvalve SHARED $<TARGET_OBJECTS:yvalve_common> ${yva
  target_link_libraries       (yvalve
      PRIVATE remote
      PRIVATE common
@@ -54,5 +54,5 @@ index 9ca8421..583c4c8 100644
      PUBLIC ${LIB_readline}
      PUBLIC ${LIB_dl}
 -- 
-2.12.2
+2.16.0
 
diff --git a/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch b/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
deleted file mode 100644
index d970798a51..0000000000
--- a/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ea2bd86c2cb55027b9104e0a05b444a78c6e4730 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve@sourcemage.org>
-Date: Mon, 13 Jun 2016 20:44:30 +0200
-Subject: [PATCH 3/5] pcmet.epp no longer exists
-
----
- src/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 583c4c8..1344d1b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -54,7 +54,6 @@ set(epp_boot_gds_files
-     jrd/grant.epp
-     jrd/ini.epp
-     jrd/met.epp
--    jrd/pcmet.epp
-     jrd/scl.epp
-     jrd/Function.epp
- )
-@@ -484,7 +483,6 @@ set(engine12_generated_src
-     jrd/grant.epp
-     jrd/ini.epp
-     jrd/met.epp
--    jrd/pcmet.epp
-     jrd/scl.epp
-     utilities/gstat/dba.epp
- )
--- 
-2.12.2
-
diff --git a/database/firebird3/patches/0004-suppress-some-includes.patch b/database/firebird3/patches/0003-suppress-some-includes.patch
index 9696a6477a..f1d229d70a 100644
--- a/database/firebird3/patches/0004-suppress-some-includes.patch
+++ b/database/firebird3/patches/0003-suppress-some-includes.patch
@@ -1,14 +1,14 @@
-From f5e848b35c485181c841591c0840f53123ed5a34 Mon Sep 17 00:00:00 2001
+From abc15abbeb2c083f5741c7ba4b0b761f3facecfe Mon Sep 17 00:00:00 2001
 From: Treeve Jelbert <treeve@sourcemage.org>
 Date: Sat, 11 Feb 2017 14:56:02 +0100
-Subject: [PATCH 4/5] suppress some includes
+Subject: [PATCH 3/6] suppress some includes
 
 ---
  CMakeLists.txt | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index edcce97..3be6969 100644
+index e607732..47b0fa9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -174,7 +174,7 @@ configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
@@ -32,5 +32,5 @@ index edcce97..3be6969 100644
  include_directories("src/include")
  include_directories("src/include/gen")
 -- 
-2.12.2
+2.16.0
 
diff --git a/database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
index 1a2bfbf925..1c8e69392c 100644
--- a/database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch
+++ b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
@@ -1,15 +1,15 @@
-From 3333315b97704d0935ea2c513dd2a683fb473485 Mon Sep 17 00:00:00 2001
+From f50cccdb659ceab185fa46516137693b8267a4dc Mon Sep 17 00:00:00 2001
 From: Treeve Jelbert <treeve@sourcemage.org>
 Date: Sat, 1 Apr 2017 13:11:35 +0200
-Subject: [PATCH 5/5] cmake fix for non sse4.2 machine
+Subject: [PATCH 4/6] cmake fix for non sse4.2 machine
 
 ---
- CMakeLists.txt     | 2 +-
+ CMakeLists.txt     | 3 +--
  src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3be6969..73020c6 100644
+index 47b0fa9..59210bf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -17,7 +17,7 @@
@@ -21,6 +21,14 @@ index 3be6969..73020c6 100644
  
  # In-source builds are not possible and so disabled.
  if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+@@ -212,7 +212,6 @@ if (UNIX)
+     set(OS_DIR posix)
+ 
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4")
+ 
+     if (NOT CMAKE_CROSSCOMPILING)
+         set(LIB_readline edit)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 1344d1b..6bc51de 100644
 --- a/src/CMakeLists.txt
@@ -34,5 +42,5 @@ index 1344d1b..6bc51de 100644
  add_dependencies_cc         (common UpdateCloopInterfaces)
  
 -- 
-2.12.2
+2.16.0
 
diff --git a/database/firebird3/patches/0005-fb3client.patch b/database/firebird3/patches/0005-fb3client.patch
new file mode 100644
index 0000000000..4b7193ead1
--- /dev/null
+++ b/database/firebird3/patches/0005-fb3client.patch
@@ -0,0 +1,25 @@
+From c45f2a703178b5a49057e9404d7d21851545cfac Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve@sourcemage.org>
+Date: Sun, 7 Jan 2018 12:05:27 +0100
+Subject: [PATCH 5/6] fb3client
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6bc51de..01fa3e4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -446,7 +446,7 @@ target_link_libraries       (yvalve
+ add_dependencies_cc         (yvalve databases)
+ set_exported_symbols        (yvalve firebird)
+ set_output_directory_unix   (yvalve lib)
+-set_target_properties       (yvalve PROPERTIES OUTPUT_NAME fbclient)
++set_target_properties       (yvalve PROPERTIES OUTPUT_NAME fb3client)
+ 
+ 
+ ########################################
+-- 
+2.16.0
+
diff --git a/database/firebird3/patches/0006-make-pthread-usage-explicit.patch b/database/firebird3/patches/0006-make-pthread-usage-explicit.patch
new file mode 100644
index 0000000000..de988bbb18
--- /dev/null
+++ b/database/firebird3/patches/0006-make-pthread-usage-explicit.patch
@@ -0,0 +1,24 @@
+From 96a619f0cd33ebee530f0574a8f255fc2a00d503 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve@sourcemage.org>
+Date: Thu, 18 Jan 2018 21:24:49 +0100
+Subject: [PATCH 6/6] make pthread usage explicit
+
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 01fa3e4..fa91d62 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -437,6 +437,7 @@ target_link_libraries       (yvalve
+     PRIVATE remote
+     PRIVATE common
+     PUBLIC tommath
++    PUBLIC pthread
+     PUBLIC ${LIB_Ws2_32}
+     PUBLIC ${LIB_readline}
+     PUBLIC ${LIB_dl}
+-- 
+2.16.0
+