diff --git a/database/firebird/CONFIGURE b/database/firebird/CONFIGURE
index e53b3a7..707f24a 100755
--- a/database/firebird/CONFIGURE
+++ b/database/firebird/CONFIGURE
@@ -4,5 +4,9 @@ if [ $FB_CLIENT == n ]; then
config_query_multi FB_GPRE "which additional GPRE languages to support?" \
none ada cobol pascal fortran &&
config_query_option FB_STAT "build static libraries?" n "--enable-static"
"--disable-static" &&
- config_query_option FB_SS "Build Superserver?" y "--enable-superserver" ""
+ if [[ $FB_VER != 2.5 ]];then
+ config_query_option FB_SS "Build Superserver?" y "--enable-superserver"
""
+ else
+ FB_SS=""
+ fi
fi
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 5939dc8..b73c17e 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,8 +1,8 @@
SPELL=firebird
case $FB_VER in
2.5)
- VERSION=2.5.0.24643-Beta2
-
SOURCE_HASH=sha512:816144a2baac37d077864f7d809c3b0b2351703e4ab0a034b33fe51e8e1593fb3ddc12454ab249cab9f227360443c526f5d6c92eba2d69aa75d743354dc46c7d
+ VERSION=2.5.0.25784-ReleaseCandidate1
+
SOURCE_HASH=sha512:7227b39cd73477dc50123999f819b52cdaaf19a37bc583bae77b4ae68743a7fff51b67eebab28e4faa8ba15af47e9560b94d5284fac639ac74e882879f652fd0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
SECURITY_PATCH=1
;;
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 9191fcd..71db44f 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,10 @@
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0.25784-ReleaseCandidate1
+ * fb2.5.patch.bz2: updated
+ * CONFIGURE: disable superserver query
+ there is now one super-classic build
+ * init.d/firebird2: name of server has changed
+
2009-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.3.18185-0
diff --git a/database/firebird/fb2.5.patch.bz2
b/database/firebird/fb2.5.patch.bz2
index 05f2d07..db885b4 100644
Binary files a/database/firebird/fb2.5.patch.bz2 and
b/database/firebird/fb2.5.patch.bz2 differ
diff --git a/database/firebird/init.d/firebird2
b/database/firebird/init.d/firebird2
index 0dbcb40..9f8dacd 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -8,6 +8,10 @@
FB_DIR=/opt/firebird/bin
FB=fbserver
+if [[ ! -f $FB_DIR/$FB]];then
+# 2.5 has a combined classic-super server using libfbembed.so
+ FB=fb_smp_server
+fi
# as of rc2, preferred method of stopping is to kill the process