firebird 1.0.3, fix for bugs #15071 #16237

7 files changed, 129 insertions, 3 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 37fea03566cc..f9645a162c32 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.5 2003/04/16 11:21:19 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.6 2003/06/15 14:32:12 mksoft Exp $
 
+*firebird-1.0.3 (15 Jun 2003)
+  15 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  Added firebird to /etc/xinetd.d, 70firebird to /etc/env.d
+  Kill lingering gds_lock_mgr processes. Closes #15071
+
+  11 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  New upstream version, 1.0.3. Closes #16237
+  
 *firebird-1.0-r1 (22 Mar 2002)
 
   16 Apr 2003; Martin Holzer <mholzer@gentoo.org> firebird-1.0-r1.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index cf440e52cfb5..143c1c3e244d 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,4 +1,9 @@
-MD5 b6f3427ff33bad6330ab931debc45d64 ChangeLog 714
 MD5 2b6f422a6d1afe8fd18443a66ff0aa87 firebird-1.0-r1.ebuild 1385
-MD5 00a05e4f04f632436d491144b0bd8853 files/digest-firebird-1.0-r1 150
+MD5 54b7aae42283297acba3464d2f04f721 ChangeLog 1049
+MD5 13d1f7d1c061f58b917bc102c13e6f84 firebird-1.0.3.ebuild 2293
+MD5 2cff92f0e2ed8a01c4b08902c6751be8 files/firebird-1.0.3-gentoo.patch 996
+MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
 MD5 d76a09a887248deb2d4d466f06515730 files/firebird-1.0-gentoo.patch 2549
+MD5 00a05e4f04f632436d491144b0bd8853 files/digest-firebird-1.0-r1 150
+MD5 a71afe7683db444d9647fc136eaeb1c1 files/70firebird 77
+MD5 10d808d19eb3949349b591c3d525b74a files/digest-firebird-1.0.3 150
diff --git a/dev-db/firebird/files/70firebird b/dev-db/firebird/files/70firebird
new file mode 100644
index 000000000000..1f6d91cece6f
--- /dev/null
+++ b/dev-db/firebird/files/70firebird
@@ -0,0 +1,3 @@
+INTERBASE=/opt/interbase
+PATH=/opt/interbase/bin
+ROOTPATH=/opt/interbase/bin
diff --git a/dev-db/firebird/files/digest-firebird-1.0.3 b/dev-db/firebird/files/digest-firebird-1.0.3
new file mode 100644
index 000000000000..e30a3fbfd283
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-1.0.3
@@ -0,0 +1,2 @@
+MD5 b12e48e95e6b208b56c0f2835dcaf74b FirebirdCS-1.0.3.972-0.tar.gz 2618227
+MD5 f90c2e43e4ad19b58b4de2d16d18710e Firebird-1.0.3.972.src.tar.gz 6956659
diff --git a/dev-db/firebird/files/firebird-1.0.3-gentoo.patch b/dev-db/firebird/files/firebird-1.0.3-gentoo.patch
new file mode 100644
index 000000000000..25e25250a53c
--- /dev/null
+++ b/dev-db/firebird/files/firebird-1.0.3-gentoo.patch
@@ -0,0 +1,24 @@
+diff -urN interbase_old/builds/original/build_kit interbase/builds/original/build_kit
+--- interbase_old/builds/original/build_kit	2001-08-06 18:34:57.000000000 +0300
++++ interbase/builds/original/build_kit	2003-06-10 16:56:46.000000000 +0300
+@@ -67,7 +67,7 @@
+ 
+ #
+ 
+-LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib
++LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib:$INTERBASE/lib
+ SHLIB_PATH=$CURDIR/jrd
+ 
+ export LD_LIBRARY_PATH
+diff -urN interbase_old/builds/original/prefix.linux interbase/builds/original/prefix.linux
+--- interbase_old/builds/original/prefix.linux	2003-05-30 12:56:17.000000000 +0300
++++ interbase/builds/original/prefix.linux	2003-06-10 16:58:09.000000000 +0300
+@@ -33,7 +33,7 @@
+ PROD_DEBUG_OBJECTS=	nodebug.o
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_VERSION_FLAG=	-DPROD_BUILD
+-PROD_CFLAGS=            -O3 -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=           $(GENTOO_CFLAGS) -fpic -DFLINTSTONE
+ 
+ 
+ DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd
new file mode 100644
index 000000000000..842fc3ec3301
--- /dev/null
+++ b/dev-db/firebird/files/firebird.xinetd
@@ -0,0 +1,11 @@
+service gds_db
+{
+	flags			= REUSE
+	socket_type		= stream
+	wait			= no
+	user			= root
+	log_on_success		+= USERID
+	log_on_failure 		+= USERID
+	server			= /opt/interbase/bin/gds_inet_server
+	disable			= yes
+}
diff --git a/dev-db/firebird/firebird-1.0.3.ebuild b/dev-db/firebird/firebird-1.0.3.ebuild
new file mode 100644
index 000000000000..f111115bc368
--- /dev/null
+++ b/dev-db/firebird/firebird-1.0.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0.3.ebuild,v 1.1 2003/06/15 14:32:12 mksoft Exp $
+
+S=${WORKDIR}/interbase
+DESCRIPTION="A relational database offering many ANSI SQL-92 features"
+SRC_URI="mirror://sourceforge/${PN}/FirebirdCS-1.0.3.972-0.tar.gz
+	mirror://sourceforge/${PN}/Firebird-1.0.3.972.src.tar.gz"
+HOMEPAGE="http://firebird.sourceforge.net/"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+DEPEND="app-shells/bash
+	app-arch/zip
+	>=sys-devel/gcc-2.95.3-r5"
+
+src_unpack() {
+	unpack FirebirdCS-1.0.3.972-0.tar.gz
+	cd ${WORKDIR}
+	unpack Firebird-1.0.3.972.src.tar.gz
+	cd ${WORKDIR}/FirebirdCS-1.0.3.972-0
+	tar xzf buildroot.tar.gz
+
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	export INTERBASE="${WORKDIR}/FirebirdCS-1.0.3.972-0/opt/interbase/"
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib"
+	export FIREBIRD_64_BIT_IO="1"
+	export NOPROMPT_SETUP="1"
+	export GENTOO_CFLAGS=$CFLAGS
+	./Configure.sh PROD || die
+	cd ${S}/interbase/lib
+	ln -s gds.so libgds.so
+	cd ${S}
+	source Configure_SetupEnv.sh
+	make LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib" firebird || die
+	make classictarfile || die
+}
+
+src_install () {
+	dodoc README
+	cd ${D}
+	tar xzpf ${S}/FirebirdCS-1.0.3.972-0.64IO/buildroot.tar.gz
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/firebird.xinetd firebird
+	insinto /etc/env.d ; doins ${FILESDIR}/70firebird
+
+	# kill lingering gds_lock_mgr processes - bug #15071
+	kill `ps aux | grep gds_lock_mgr | grep '/var/tmp/portage' | awk '{print $2}'`
+	# move isc4.gdb and isc_config to /etc/firebird and have them
+	# protected by CONFIG_PTROTECT
+	dodir /etc/firebird
+	mv ${D}/opt/interbase/{isc4.gdb,isc_config} ${D}/etc/firebird
+	dosym /etc/firebird/isc4.gdb /opt/interbase/isc4.gdb
+	dosym /etc/firebird/isc_config /opt/interbase/isc_config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If not done already, please execute the command"
+	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\"	"
+	einfo "to add gds_db to /etc/services" 
+	einfo
+}
+
+pkg_config() {
+	echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services
+	echo "gds_db		3050/tcp" >> /etc/services
+
+	einfo "added gds_db to /etc/services"
+}