Version bump, security bug #201799.

(Portage version: 2.1.4_rc10)

9 files changed, 254 insertions, 3 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 7bd1649db730..5120f1eafffa 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.29 2007/10/24 03:23:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.30 2007/12/19 21:58:05 caster Exp $
+
+*hsqldb-1.8.0.9 (19 Dec 2007)
+
+  19 Dec 2007; Vlastimil Babka <caster@gentoo.org> +files/35hsqldb,
+  +files/bundle-all-tools.patch, files/hsqldb,
+  +files/resolve-config-softlinks.patch, +files/server.properties,
+  +files/sqltool.rc, +hsqldb-1.8.0.9.ebuild:
+  Version bump, security bug #201799.
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -files/server.properties, -files/sqltool.rc, -hsqldb-1.7.3.1-r1.ebuild,
diff --git a/dev-db/hsqldb/files/35hsqldb b/dev-db/hsqldb/files/35hsqldb
new file mode 100644
index 000000000000..7ea66e048230
--- /dev/null
+++ b/dev-db/hsqldb/files/35hsqldb
@@ -0,0 +1 @@
+CONFIG_PROTECT="/var/lib/hsqldb"
diff --git a/dev-db/hsqldb/files/bundle-all-tools.patch b/dev-db/hsqldb/files/bundle-all-tools.patch
new file mode 100644
index 000000000000..27b12e0466db
--- /dev/null
+++ b/dev-db/hsqldb/files/bundle-all-tools.patch
@@ -0,0 +1,16 @@
+diff -urpN hsqldb.orig/build/build.xml hsqldb/build/build.xml
+--- hsqldb.orig/build/build.xml	2006-04-11 19:07:22.000000000 +0200
++++ hsqldb/build/build.xml	2006-07-09 02:07:48.000000000 +0200
+@@ -593,12 +593,6 @@ examples:

+          </manifest>

+          <exclude name="org/hsqldb/jmx/**"/>

+          <exclude name="org/hsqldb/util/*Swing.*" if="noswing"/>

+-         <exclude name="org/hsqldb/util/*Transfer*.*"/>

+-         <exclude name="org/hsqldb/util/DataAccess*.*"/>

+-         <exclude name="org/hsqldb/util/*Helper*.*"/>

+-         <exclude name="org/hsqldb/util/JDBCTypes.*"/>

+-         <exclude name="org/hsqldb/util/SQLStatements.*"/>

+-         <exclude name="org/hsqldb/util/QueryTool.*"/>

+          <exclude name="org/hsqldb/util/Zaurus*.*"/>

+          <exclude name="org/hsqldb/test/*.class"/>

+          <exclude name="org/hsqldb/sample/*.class"/>

diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.8.0.9 b/dev-db/hsqldb/files/digest-hsqldb-1.8.0.9
new file mode 100644
index 000000000000..af4fd63ab038
--- /dev/null
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.8.0.9
@@ -0,0 +1,3 @@
+MD5 c3f8010e3e2c73143eb702b7f28f0c8e hsqldb_1_8_0_9.zip 3493449
+RMD160 202b3dce4b737f928e57e281f4035df378526ce1 hsqldb_1_8_0_9.zip 3493449
+SHA256 e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec hsqldb_1_8_0_9.zip 3493449
diff --git a/dev-db/hsqldb/files/hsqldb b/dev-db/hsqldb/files/hsqldb
index b0c42698bf5a..09553ea72083 100644
--- a/dev-db/hsqldb/files/hsqldb
+++ b/dev-db/hsqldb/files/hsqldb
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/files/hsqldb,v 1.1 2004/10/30 20:58:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/files/hsqldb,v 1.2 2007/12/19 21:58:05 caster Exp $
 
 depend() {
     use net
@@ -14,7 +14,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping HSQL Databse"
+	ebegin "Stopping HSQL Database"
 	hsqldb_enable=yes /var/lib/hsqldb/bin/hsqldb stop
 	eend $?
 }
diff --git a/dev-db/hsqldb/files/resolve-config-softlinks.patch b/dev-db/hsqldb/files/resolve-config-softlinks.patch
new file mode 100644
index 000000000000..5a716e6dc3a2
--- /dev/null
+++ b/dev-db/hsqldb/files/resolve-config-softlinks.patch
@@ -0,0 +1,22 @@
+diff -urpN hsqldb.orig/bin/hsqldb hsqldb/bin/hsqldb
+--- hsqldb.orig/bin/hsqldb	2006-07-08 15:55:55.000000000 +0200
++++ hsqldb/bin/hsqldb	2006-07-08 16:03:28.000000000 +0200
+@@ -282,6 +282,18 @@ else
+         echo "Auth file '$_AUTH_TEST_PATH' not readable" 1>&2
+         exit 2
+     }
++
++    # resolve links - $_AUTH_TEST_PATH may be a softlink
++    while [ -h "$_AUTH_TEST_PATH" ]; do
++        ls=`ls -ld "$_AUTH_TEST_PATH"`
++        link=`expr "$ls" : '.*-> \(.*\)$'`
++        if expr "$link" : '.*/.*' > /dev/null; then
++            _AUTH_TEST_PATH="$link"
++        else
++            _AUTH_TEST_PATH=`dirname "$_AUTH_TEST_PATH"`/"$link"
++        fi
++    done
++
+     ls -ld "$_AUTH_TEST_PATH" | grep '^-..------' > /dev/null 2>&1 || {
+         echo "Fix permissions on '$_AUTH_TEST_PATH' like 'chmod 600 $_AUTH_TEST_PATH'" 1>&2
+         exit 2
diff --git a/dev-db/hsqldb/files/server.properties b/dev-db/hsqldb/files/server.properties
new file mode 100644
index 000000000000..4827d1cb6ec0
--- /dev/null
+++ b/dev-db/hsqldb/files/server.properties
@@ -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 b/dev-db/hsqldb/files/sqltool.rc
new file mode 100644
index 000000000000..9284be44867a
--- /dev/null
+++ b/dev-db/hsqldb/files/sqltool.rc
@@ -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.8.0.9.ebuild b/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild
new file mode 100644
index 000000000000..f5d761d9b5c4
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild,v 1.1 2007/12/19 21:58:05 caster Exp $
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils versionator java-pkg-2 java-ant-2
+
+MY_PV=$(replace_all_version_separators _ )
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="The leading SQL relational database engine written in Java."
+HOMEPAGE="http://hsqldb.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# doesn't like Java 1.6 due to JDBC changes
+CDEPEND="=dev-java/servletapi-2.3*"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar || die
+	java-pkg_jar-from --into lib servletapi-2.3
+
+	sed -i -r \
+		-e "s#etc/sysconfig#etc/conf.d#g" \
+		bin/hsqldb || die
+
+	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
+
+	epatch "${FILESDIR}/resolve-config-softlinks.patch"
+
+	mkdir conf
+	sed -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 || die
+	cp "${FILESDIR}/server.properties" conf/ || die
+	cp "${FILESDIR}/sqltool.rc" conf/ || die
+}
+
+# EANT_BUILD_XML used also in src_unpack
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
+EANT_DOC_TARGET="javadocdev"
+
+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/*
+
+	# Install env file for CONFIG_PROTECT support
+	doenvd "${FILESDIR}/35hsqldb" || die
+
+	# Put init, configuration and authorization files in /etc
+	doinitd "${FILESDIR}/hsqldb" || die
+	doconfd conf/hsqldb || die
+	dodir /etc/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/server.properties || die
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc || die
+
+	# Install init script
+	dodir "${HSQLDB_HOME}/bin"
+	keepdir "${HSQLDB_HOME}"
+	exeinto "${HSQLDB_HOME}/bin"
+	doexe bin/hsqldb || die
+
+	# Create symlinks to authorization files in the server home dir
+	# (required by the hqldb init script)
+	insinto "${HSQLDB_HOME}"
+	dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties" || die
+	dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc" || die
+
+	# Make sure that files have correct permissions
+	chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}"
+	chmod o-rwx "${D}${HSQLDB_HOME}"
+}
+
+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)"
+	echo
+	einfo "Example:"
+	echo
+	einfo "/etc/hsqldb/server.properties"
+	einfo "============================="
+	einfo "server.database.1=file:xdb/xdb"
+	einfo "server.dbname.1=xdb"
+	einfo "server.urlid.1=xdb"
+	einfo
+	einfo "/etc/hsqldb/sqltool.rc"
+	einfo "======================"
+	einfo "urlid xdb"
+	einfo "url jdbc:hsqldb:hsql://localhost/xdb"
+	einfo "username sa"
+	einfo "password "
+	echo
+	einfo "Also note that each hsqldb server can serve only up to 10"
+	einfo "different databases simultaneously (with consecutive {0-9}"
+	einfo "suffixes in the 'server.properties' file)."
+	echo
+	ewarn "For data manipulation use:"
+	ewarn
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+	ewarn "  --rcFile /var/lib/hsqldb/sqltool.rc <dbname>"
+	echo
+	einfo "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+	einfo "and Using Hsqldb' in the Hsqldb docs at:"
+	einfo "  http://hsqldb.org/web/hsqlDocsFrame.html"
+	einfo "If you intend to run it in the Server mode, it is suggested to add the"
+	einfo "init script to your start-up scripts, this should be done like this:"
+	einfo "  \`rc-update add hsqldb default\`"
+	echo
+
+	# Enable CONFIG_PROTECT for hsqldb
+	env-update
+	einfo "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
+	einfo "is added to the CONFIG_PROTECT list. In order to immediately activate"
+	einfo "these settings please do:"
+	einfo "  \`env-update && source /etc/profile\`"
+	einfo "Otherwise the settings will become active next time you login"
+	echo
+}