Addresses bug #111963. Fix contributed by Sir No <wiktorw@people.pl>. Also some cleanup.

Package-Manager: portage-2.1_pre1

6 files changed, 185 insertions, 9 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index cf2e5beac90f..58e1e2b1a7c7 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.13 2005/07/10 17:03:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.14 2005/12/27 04:53:12 nichoj Exp $
+
+*hsqldb-1.7.3.1-r2 (27 Dec 2005)
+
+  27 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/server.properties-r1, +files/sqltool.rc-r1,
+  +hsqldb-1.7.3.1-r2.ebuild:
+  Addresses bug #111963. Fix contributed by Sir No <wiktorw@people.pl>. Also
+  some cleanup.
 
   10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> hsqldb-1.7.3.1-r1.ebuild:
   dep fix, cleanup
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 2d5cb77fdf95..3b4b128a2f42 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a02ad29d9dec0e875727ce6f1c2a2185 ChangeLog 1908
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 fdaba688267d398e70b0468d0b9fe3bb hsqldb-1.7.3.1-r1.ebuild 2484
-MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
+MD5 12bd9ba9570f550754d836702c3a07fb ChangeLog 2170
+MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64
+MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r2 64
 MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
+MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
+MD5 0a8db7a417272c532f28a9e001fd32dd files/server.properties-r1 686
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
-MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64
+MD5 094dd08ec8e3d3e273b2fab5b32008a7 files/sqltool.rc-r1 619
+MD5 fdaba688267d398e70b0468d0b9fe3bb hsqldb-1.7.3.1-r1.ebuild 2484
+MD5 c082ccea6fa17d84f1c45b00ea7a9c44 hsqldb-1.7.3.1-r2.ebuild 3807
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJCAE/rLF9B432nYRAmNGAKCKEKBzYd4D1w1BoJx6t+3hmuLlPgCgxYix
-wgkObY9/L67eKdroosCYYLU=
-=5uEw
+iD8DBQFDsMhbndWRXhKOboURAqArAJ9RPc54Gbss9IivkbgbFfaK7y8RcQCg3WwP
+Sjya2lU/44Glik/2CRGRBr4=
+=7LjM
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
new file mode 100644
index 000000000000..ca1745f96ca7
--- /dev/null
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
@@ -0,0 +1 @@
+MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/files/server.properties-r1 b/dev-db/hsqldb/files/server.properties-r1
new file mode 100644
index 000000000000..4827d1cb6ec0
--- /dev/null
+++ b/dev-db/hsqldb/files/server.properties-r1
@@ -0,0 +1,20 @@
+# Hsqldb Server cfg file.
+# See the UNIX Quick Start and the Advanced Topics chapters
+# of the Hsqldb User Guide.
+
+server.database.0=file:/var/lib/hsqldb/db1
+server.urlid.0=localhost
+
+# Warning!
+# When running hsqldb in Server mode, for each additional database
+# the server.urlid.X entry must have a proper corresponding urlid
+# section in the 'sqltool.rc' file.
+# Otherwise you may have problems with shutting down the server.
+#
+# Note that each server can serve only up to 10 different
+# databases simultaneously (with consecutive {0-9} suffixes).
+
+# An example of additional database.
+#server.database.1=file:/var/lib/hsqldb/newdb/newdb
+#server.dbname.1=newdb
+#server.urlid.1=newdb
diff --git a/dev-db/hsqldb/files/sqltool.rc-r1 b/dev-db/hsqldb/files/sqltool.rc-r1
new file mode 100644
index 000000000000..9284be44867a
--- /dev/null
+++ b/dev-db/hsqldb/files/sqltool.rc-r1
@@ -0,0 +1,20 @@
+# $Id sqltool.rc,v 1.11 2004/07/18 21:34:35 unsaved Exp $
+
+# This is a sample SqlTool configuration file, a.k.a. rc file.
+
+# This is for a hsqldb Server running with default settings on your local
+# computer (and for which you have not changed the password for "sa").
+urlid localhost
+url jdbc:hsqldb:hsql://localhost
+username sa
+password 
+
+# Each urlid section in this file corresponds to one of the
+# server.urlid.X entries in the 'server.properties' file.
+# This is required by the hsqldb init script.
+
+# An example of additional database.
+#urlid newdb
+#url jdbc:hsqldb:hsql://localhost/newdb
+#username sa
+#password 
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild
new file mode 100644
index 000000000000..ac4ce3974f62
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild,v 1.1 2005/12/27 04:53:12 nichoj Exp $
+
+inherit java-pkg eutils versionator
+
+MY_PV=$(replace_all_version_separators _ )
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="HSQLDB is the leading SQL relational database engine written in Java."
+HOMEPAGE="http://hsqldb.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+#SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc"
+IUSE="doc jikes source"
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/servletapi-2.3*"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+		rm *.jar
+		java-pkg_jar-from servletapi-2.3
+	cd ${S}
+	sed -i -r \
+		-e "s/etc\/sysconfig/etc\/conf.d/g" \
+			bin/hsqldb
+	einfo "Cleaning build directory..."
+	ant -q -f build/build.xml cleanall || die "failed to clean"
+
+	einfo "Preparing configuration files..."
+	mkdir conf
+	local HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+	sed -e 's:^JAVA_EXECUTABLE=.*$:JAVA_EXECUTABLE=$(java-config --java):g' \
+		-e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \
+		-e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \
+		-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
+		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
+		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb
+	cp ${FILESDIR}/server.properties-r1 conf/server.properties
+	cp ${FILESDIR}/sqltool.rc-r1 conf/sqltool.rc
+}
+
+src_compile() {
+	local antflags="jar jarclient jarsqltool"
+	use doc && antflags="${antflags} javadocdev"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant -f build/build.xml ${antflags} || die "Compilation failed."
+}
+
+src_install() {
+	java-pkg_dojar lib/hsql*.jar
+
+	if use doc; then
+		dodoc doc/*.txt
+		java-pkg_dohtml -r doc/guide
+		java-pkg_dohtml -r doc/src
+	fi
+	use source && java-pkg_dosrc src/*
+
+	doinitd ${FILESDIR}/hsqldb
+	doconfd conf/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	insopts -m 0600 -o hsqldb -g hsqldb
+	doins conf/server.properties
+	insopts -m 0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc
+
+	dodir /var/lib/hsqldb/bin
+	keepdir /var/lib/hsqldb
+	exeinto /var/lib/hsqldb/bin
+	doexe bin/hsqldb
+	dosym /etc/hsqldb/server.properties /var/lib/hsqldb/server.properties
+	dosym /etc/hsqldb/sqltool.rc /var/lib/hsqldb/sqltool.rc
+	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
+	chmod o-rwx ${D}/var/lib/hsqldb
+}
+
+pkg_postinst() {
+	ewarn "If you intend to run hsqldb in Server mode and you want to create"
+	ewarn "additional databases, remember to put correct information in both"
+	ewarn "'server.properties' and 'sqltool.rc' files."
+	ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+	ewarn "UNIX Quick Start' in the hsqldb docs for more information)"
+	einfo ""
+	einfo "Example:"
+	einfo ""
+	einfo "/etc/hsqldb/server.properties"
+	einfo "============================="
+	einfo "server.database.1=file:/var/lib/hsqldb/newdb/newdb"
+	einfo "server.dbname.1=newdb"
+	einfo "server.urlid.1=newdb"
+	einfo ""
+	einfo "/etc/hsqldb/sqltool.rc"
+	einfo "======================"
+	einfo "urlid newdb"
+	einfo "url jdbc:hsqldb:hsql://localhost/newdb"
+	einfo "username sa"
+	einfo "password "
+	ewarn ""
+	ewarn "Also note that each hsqldb server can serve only up to 10"
+	ewarn "different databases simultaneously (with consecutive {0-9}"
+	ewarn "suffixes in the 'server.properties' file)."
+}