Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ae823a549e3a68da155e617e0acaf1b88236b5f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ae823a549e3a68da155e617e0acaf1b88236b5f)
  • Date: Fri, 5 Oct 2018 07:20:16 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird3/BUILD | 2 +-
database/firebird3/DETAILS | 4 ++--
database/firebird3/FINAL | 4 ++--
database/firebird3/HISTORY | 4 ++++
database/firebird3/INSTALL | 36
++++++++++++++++++++++--------------
database/firebird3/init.d/firebird3 | 2 +-
6 files changed, 32 insertions(+), 20 deletions(-)

New commits:
commit 3ae823a549e3a68da155e617e0acaf1b88236b5f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird3: => 3.0.4.33054-0

diff --git a/database/firebird3/BUILD b/database/firebird3/BUILD
index 1482a77..851a6fa 100755
--- a/database/firebird3/BUILD
+++ b/database/firebird3/BUILD
@@ -5,7 +5,7 @@ CXXFLAGS+=" -fPIC" &&
OPTS+=" -DCMAKE_CXX_STANDARD=11" &&
OPTS+=" -DCMAKE_C_STANDARD=11" &&
persistent_add FB_PREFIX &&
-FB_PREFIX=${INSTALL_ROOT}/opt/firebird3 &&
+FB_PREFIX=${INSTALL_ROOT}/opt &&
cmake_build $FB_PREFIX &&
if [[ $CMAKE_GEN == Ninja ]];then
ninja copy_files
diff --git a/database/firebird3/DETAILS b/database/firebird3/DETAILS
index 326f144..ceafc4a 100755
--- a/database/firebird3/DETAILS
+++ b/database/firebird3/DETAILS
@@ -1,7 +1,7 @@
SPELL=firebird3
SPELLX=Firebird
- VERSION=3.0.3.32900-0
-
SOURCE_HASH=sha512:09c4b48745b91973ead9a0be065ebe0ba38db40e4e8a98e29a56c37582e7a7b2bc503c9303af5478bb4c857ce6b7ea07713d769ef7df0543c6c02cffdb630555
+ VERSION=3.0.4.33054-0
+
SOURCE_HASH=sha512:a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
PATCHLEVEL=1
SECURTIY_PATCH=1
VX=${VERSION%.*}
diff --git a/database/firebird3/FINAL b/database/firebird3/FINAL
index f215744..a00ce34 100755
--- a/database/firebird3/FINAL
+++ b/database/firebird3/FINAL
@@ -2,14 +2,14 @@
# constantly modified in normal use
local LOG &&

-cd $FB_PREFIX &&
+#cd $FB_PREFIX &&
# log file
mkdir -p $INSTALL_ROOT/var/log/ &&
LOG=$INSTALL_ROOT/var/log/firebird.log &&
touch $LOG &&
chown firebird:firebird $LOG &&
chmod o=,ug=rw $LOG &&
-mkdir -p $INSTALL_ROOT/var/run/firebird
+#mkdir -p $INSTALL_ROOT/var/run/firebird
message "\n${PROBLEM_COLOR}Creating a SYSDBA user:" \
"$MESSAGE_COLOR" \
"\nThe Firebird3 install process does not create a SYSDBA user." \
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index db5e879..a15264d 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,7 @@
+2018-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.4.33054-0
+ * BUILD INSTALL FINAL init.d/firebird3: adapt to upstream changes
+
2018-06-05 Treeve Jelbert <treeve AT sourcemage.org>
* init.d/firebird3: tweak

diff --git a/database/firebird3/INSTALL b/database/firebird3/INSTALL
index f16bd87..254daaa 100755
--- a/database/firebird3/INSTALL
+++ b/database/firebird3/INSTALL
@@ -8,30 +8,38 @@ chown firebird:firebird $DEST &&
install_config_file security3.fdb $DEST/security3.fdb &&
chown firebird:firebird $DEST/security3.fdb &&
cp -a *.conf $DEST &&
-cd $BLD &&
-DEST=$INSTALL_ROOT/$FB_PREFIX &&
-mkdir -p $DEST &&
-cp src/msg.fdb src/help.fdb $DEST &&
+
+DEST=$INSTALL_ROOT/$FB_PREFIX/firebird &&
+mkdir -p $DEST &&
# install the built tree
-cp -a firebird/* $DEST &&
+cp -a * $DEST &&
+
+cd $BLD/src &&
+cp msg.fdb help.fdb $DEST &&

-DEST=$INSTALL_ROOT/$FB_PREFIX/include/firebird &&
+DEST=$FB_PREFIX/firebird/include/firebird
mkdir -p $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/$FB_PREFIX &&
-FROM=$INSTALL_ROOT/usr &&
-mkdir -p $FROM/lib &&
-ln -vsf $TGT/lib/libfbclient.so $FROM/lib &&
-mkdir -p $FROM/include &&
-ln -vsf $TGT/include/ibase.h $FROM/include &&
-ln -vsf $TGT/include/firebird $FROM/include &&
+TGT=$TRACK_ROOT/$FB_PREFIX/firebird &&
+
+FROM=$INSTALL_ROOT/usr/include &&
+mkdir -p $FROM &&
+
+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/$FB_PREFIX &&
+FROM=$FB_PREFIX/firebird &&
TGT=$TRACK_ROOT/etc/firebird3 &&
ln -vsf $TGT/security3.fdb $FROM &&
ln -vsf $TGT/firebird.conf $FROM &&
diff --git a/database/firebird3/init.d/firebird3
b/database/firebird3/init.d/firebird3
index da6a98f..2a56b62 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/firebird3/bin
+FB_DIR=/opt/firebird/bin
FB=firebird
# preferred method of stopping is to kill the process




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ae823a549e3a68da155e617e0acaf1b88236b5f), Treeve Jelbert, 10/05/2018

Archive powered by MHonArc 2.6.24.

Top of Page