New commits:
commit c080c61578a36c05262a323bece86b3c8f6d9828
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
firebird - 2.1 + 2.5 + new build process
commit f653e5fa8e77cb7e68af3cd9ba694bbc9f808b25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pygame - update subdepends stuff
commit a0c1278495b792772a0330fe7bc03218d414222b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
"numpy-1.1.1"
commit dc4aee085572effdf2331d09e2eb55ef78866ca7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gutenprint - add snapshot support
commit 376d85004ba6ab2bd09cc0d6225e7474059a36b3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
koffice2 - minor changes to depends
commit 0c390c9179d400701dd58023aca2e3e09e69be72
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
poppler - cvs and future versions - depend on openjpeg
commit 2717fef328451afe8f2dac5be774249ccdc3304b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegraphics4 - add optional qca2
diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index 0c95b1a..7484807 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -1,8 +1,8 @@
- local FF FileName DB LCK LL &&
+ local FF DB LL &&
persistent_add FB_PREFIX &&
FB_PREFIX=${INSTALL_ROOT}/usr/firebird &&
OPTS="${OPTS} ${FB_SS}" &&
-if [ $$FB_VER != 2.1 ];then
+if [[ $$FB_VER == 2.0 ]];then
if spell_ok icu; then
ICU_FLAGS=`icu-config --ldflags-libsonly` &&
LDFLAGS="$LDFLAGS $ICU_FLAGS"
@@ -10,66 +10,51 @@ if [ $$FB_VER != 2.1 ];then
if spell_ok libedit; then
LDFLAGS="$LDFLAGS -ledit"
fi
-fi &&
+fi &&
# prepare optional language support
for LL in $FB_GPRE; do
- if [ $LL != none ]; then
+ if [[ $LL != none ]]; then
OPTS="${OPTS} --with-gpre-${LL}"
fi
done &&
OPTS="${OPTS} ${FB_STAT}" &&
LDFLAGS="$LDFLAGS -lpthread" &&
-#strip -O3 from optimisations, gcc-4.2.2 problem
- CFLAGS="${CFLAGS/-O3/-O2}" &&
- CXXFLAGS="${CXXFLAGS/-O3/-O2}" &&
-
- ./configure \
- --prefix=$FB_PREFIX \
- $OPTS &&
- make_single &&
-if [ $FB_CLIENT == n ]; then
+ ./configure \
+ --prefix=$FB_PREFIX \
+ $OPTS &&
+if [[ $FB_CLIENT == n ]]; then
make &&
-# prepare an install image
- cd gen &&
- ./install/makeInstallImage.sh &&
-#
+ cd $SOURCE_DIRECTORY/gen/firebird &&
# fix ownership and permissions
- cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
chown -R root:root ./ &&
chmod -R uga-w ./ &&
-
# Everyone may execute clients
chmod 0555 bin/* &&
# Shell scripts changing security attributes are for root only
chmod 0500 bin/*.sh &&
# Security database
-# Nobody besides firebird permitted to even read this file
- chown firebird:firebird security*.fdb &&
- chmod 0600 security*.fdb &&
+ FF=security2.fdb &&
+ if [[ -e $FB_PREFIX/$FF ]];then
+ mv $FF $FF.new
+ else
+# Nobody except firebird permitted to even read this file
+ chown firebird:firebird $FF &&
+ chmod 0600 $FF
+ fi
# all database should be owned by firebird
- for DB in `ls examples/empbuild/*.fdb`
- do
- chmod ug+w $DB &&
- chown firebird:firebird $DB
- done
+ cd $SOURCE_DIRECTORY/gen/ &&
+ for DB in `ls examples/empbuild/*.fdb`
+ do
+ chmod ug+w $DB &&
+ chown firebird:firebird $DB
+ done
else
cd gen &&
make includes &&
make -f Makefile.boot.gpre &&
make -f Makefile.libfbclient &&
- make -f Makefile.client.isql &&
+ make -f Makefile.client.isql
# probably need to build gbak and then restore messages and help fdb
-# make -f Makefile.client.gbak &&
- cd firebird &&
- FBDEST=../buildroot${FB_PREFIX}/bin &&
- mkdir -p $FBDEST &&
- cp -a bin/isql $FBDEST &&
- FBDEST=../buildroot${INSTALL_ROOT}/usr/lib &&
- mkdir -p $FBDEST &&
- cp -a lib/* $FBDEST &&
- FBDEST=../buildroot${INSTALL_ROOT}/usr/include &&
- mkdir -p $FBDEST &&
- cp -a include/* $FBDEST
-fi &&
-make_normal
+# make -f Makefile.client.gbak
+fi
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 57b1342..12f8074 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -11,7 +11,8 @@ case $FB_VER in
"--without-editline" \
"for fancy line editing"
;;
- 2.1) depends btyacc &&
+ 2.1 | 2.5)
+ depends btyacc &&
depends icu '--with-system-icu' &&
optional_depends libedit \
"-with-system-editline" \
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index f77faea..442d086 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,7 +1,11 @@
SPELL=firebird
case $FB_VER in
+ 2.5)
+ VERSION=2.5.0.20343-Alpha1
+
SOURCE_HASH=sha512:2a6a0c0094ffb769de5d4818cb2f6278bd10be5a3c132055acc964c227d0247edfcc5aea88d90217d52a29891c79171b657c3185eed08a5ee6c79dfde63d2fea
+;;
2.1)
- VERSION=2.1.1.17910-RC1
+ VERSION=2.1.1.17910-0
SOURCE_HASH=sha512:8730c435eedc02d20d6a0ad194067cb6e5689e5a3f59ae03edd4f2dea92fa4e0ab2089a86a16ce0fcd71fa3ebd398a787038657ff6b1c74a2dee866b08ed7600
;;
*)
@@ -11,7 +15,7 @@ case $FB_VER in
esac
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
-# SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
+ SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/RC?/0}
WEB_SITE=http://www.firebirdsql.org
LICENSE=IDPL
diff --git a/database/firebird/FINAL b/database/firebird/FINAL
index 782edfc..b9ad338 100755
--- a/database/firebird/FINAL
+++ b/database/firebird/FINAL
@@ -1,4 +1,4 @@
-if [ $FB_CLIENT == n ]; then
+if [[ $FB_CLIENT == n ]]; then
# we do this here, so that things are not tracked, as these files are
# constantly modified in normal use
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 656a0e8..37058ac 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,20 @@
+2008-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.1.17910-0 (stable)
+ * fb2.1.patch.bz2: updated
+
+2008-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0.20343-Alpha1 (devel)
+ revert to dourceforge site
+ * PREPARE, DEPENDS: add option for 2.5
+ * fb2.5.patch.bz2: added
+ * BUILD, INSTALL: move mkInstallImage stuff to INSTALL.
+ avoids redundant copying of large amounts of data
+ * BUILD: add some extra []
+ remove stripping of optimisations and make_single
+ * INSTALL: prevent overwriting of security2.fdb
+ * volatiles, configs: add fbintl.conf
+ * init.d/firebird2: run fbserver directly. don't use fbguard
+
2008-05-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.1.17910-RC1
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index b070251..1c7276e 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,9 +1,24 @@
-if [ $FB_CLIENT == n ]; then
-cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
-# install config files first
-install_config_file firebird.conf $FB_PREFIX/firebird.conf &&
-install_config_file aliases.conf $FB_PREFIX/aliases.conf &&
-rm aliases.conf firebird.conf
-fi &&
-# install prebuilt tree
-cp -ra $SOURCE_DIRECTORY/gen/buildroot/* $INSTALL_ROOT/
+local FF FBDEST &&
+mkdir -p ${FB_PREFIX}/intl &&
+if [[ $FB_CLIENT == n ]]; then
+# prepare an install image
+ cd $SOURCE_DIRECTORY/gen &&
+ ./install/makeInstallImage.sh &&
+# security database
+ FF=firebird/security2.fdb &&
+ if [[ -e $FF ]];then
+ cp $FF $FB_PREFIX
+ fi
+# config files
+ cd $SOURCE_DIRECTORY/gen/install/misc &&
+ install_config_file firebird.conf $FB_PREFIX/firebird.conf &&
+ install_config_file aliases.conf $FB_PREFIX/aliases.conf &&
+ install_config_file fbintl.conf $FB_PREFIX/intl/fbintl.conf
+else
+ cd $SOURCE_DIRECTORY/gen/firebird &&
+ for FF in bin include lib;do
+ FBDEST=$FB_PREFIX/$FF &&
+ mkdir -p $FBDEST &&
+ cp -ar $FF/* $FBDEST/$FF
+ done
+fi
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 7f60047..b610bb6 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,7 +7,7 @@ cat <<EOF
After installing firebird, you should change the default password for the
SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VER "which version to build?" 2.0 2.1
+config_query_list FB_VER "which version to build?" 2.1 2.0 2.5
# warn of major changes
if spell_ok firebird;then
@@ -38,9 +38,11 @@ EOF
/usr/firebird/upgrade/metadata_charset.txt
EOF
;;
- 1.5)
- /bin/echo downgrading to version 1.5 is not supported
- return 1
+ 2.5)
+ cat <<EOF
+ Firebird 2.5 includes ODS 11.2 changes. Very experimental!
+ You are recommended to back up you firebird installation and
databases
+EOF
;;
esac
if ! query "do you really want to upgrade firebird?";then
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index 56818ae..f4b4318 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -16,7 +16,6 @@
# fix for gcc4 and smgl issues
#apply patches
bzcat ${SPELL_DIRECTORY}/fb${FB_VER}.patch.bz2 | patch -p1 &&
-
# run autogen
NOCONFIGURE=1 . ./autogen.sh
diff --git a/database/firebird/configs b/database/firebird/configs
index ad636c7..3319596 100644
--- a/database/firebird/configs
+++ b/database/firebird/configs
@@ -1,2 +1,3 @@
^/usr/firebird/aliases.conf$
^/usr/firebird/firebird.conf$
+^/usr/firebird/intl/fbintl.conf$
diff --git a/database/firebird/fb2.1.patch.bz2
b/database/firebird/fb2.1.patch.bz2
index db906f3..29cd638 100644
Binary files a/database/firebird/fb2.1.patch.bz2 and
b/database/firebird/fb2.1.patch.bz2 differ
diff --git a/database/firebird/fb2.5.patch.bz2
b/database/firebird/fb2.5.patch.bz2
new file mode 100644
index 0000000..5bc9a24
Binary files /dev/null and b/database/firebird/fb2.5.patch.bz2 differ
diff --git a/database/firebird/init.d/firebird2
b/database/firebird/init.d/firebird2
index a813d44..96022a8 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -6,8 +6,9 @@
# on system startup and shutdown to start the background
# Firebird2 database Super server daemon
-
-FB=/usr/firebird/bin/fbmgr.bin
+FB_DIR=/usr/firebird/bin
+FB=fbserver
+#FB=/usr/firebird/bin/fbmgr.bin
# as of rc2, preferred method of stoppng is to kill the pid
RUND=/var/run/firebird
PID=$RUND/`basename $0`.pid
@@ -23,14 +24,18 @@ case $1 in
echo "Starting Firebird Super Server"
mkdir -p $RUND
chown firebird:firebird $RUND
- su -s "/bin/sh" -m \
- -c "$FB -start -forever -pidfile $PID" -l "firebird"
+ $FB_DIR/$FB &
+# eval `$FB -e $FB_DIR` > $PID
+# su -s "/bin/sh" -m \
+# -c "$FB -start -forever -pidfile $PID" -l "firebird"
evaluate_retval
+ pgrep $FB > $PID
;;
stop)
echo "Stopping Firebird server"
kill `cat $PID`
evaluate_retval
+ rm $PID
;;