Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 91268 Details for
Bug 111960
version bump: dev-db/hsqldb 1.8.0.7
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
hsqldb-1.8.0.4.ebuild.diff
hsqldb-1.8.0.4.ebuild.diff (text/plain), 6.23 KB, created by
Wiktor Wandachowicz
on 2006-07-09 04:41:39 UTC
(
hide
)
Description:
hsqldb-1.8.0.4.ebuild.diff
Filename:
MIME Type:
Creator:
Wiktor Wandachowicz
Created:
2006-07-09 04:41:39 UTC
Size:
6.23 KB
patch
obsolete
>--- hsqldb-1.7.3.1-r3.ebuild 2006-07-01 18:40:38.000000000 +0200 >+++ hsqldb-1.8.0.4.ebuild 2006-07-09 12:56:31.000000000 +0200 >@@ -1,6 +1,6 @@ > # Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/07/01 16:40:38 nichoj Exp $ >+# $Header: $ > > inherit java-pkg-2 eutils versionator java-ant-2 > >@@ -8,13 +8,13 @@ > MY_P="${PN}_${MY_PV}" > > DESCRIPTION="The leading SQL relational database engine written in Java." >-HOMEPAGE="http://hsqldb.sourceforge.net" >+HOMEPAGE="http://hsqldb.org" > SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" > > LICENSE="as-is" > SLOT="0" >-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc" >-IUSE="doc source" >+KEYWORDS="~x86 ~amd64" >+IUSE="doc source sqltools" > > RDEPEND=">=virtual/jre-1.4 > =dev-java/servletapi-2.3*" >@@ -29,6 +29,9 @@ > > 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 >@@ -45,19 +48,22 @@ > sed -i -r \ > -e "s/etc\/sysconfig/etc\/conf.d/g" \ > bin/hsqldb >+ >+ ant -q -f build/build.xml cleanall > /dev/null || die "failed to clean" > >- ant -q -f build/build.xml cleanall || die "failed to clean" >+ epatch ${FILESDIR}/resolve-config-softlinks.patch >+ if use sqltools; then >+ epatch ${FILESDIR}/bundle-all-tools.patch >+ fi > > 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" \ >+ 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 >- cp ${FILESDIR}/server.properties-r1 conf/server.properties >- cp ${FILESDIR}/sqltool.rc-r1 conf/sqltool.rc >+ cp ${FILESDIR}/server.properties-1.8 conf/server.properties >+ cp ${FILESDIR}/sqltool.rc-1.8 conf/sqltool.rc > } > > src_compile() { >@@ -74,49 +80,92 @@ > fi > use source && java-pkg_dosrc src/* > >+ # Install env file for CONFIG_PROTECT support >+ insinto /etc/env.d >+ insopts -m0644 >+ doins ${FILESDIR}/35hsqldb >+ >+ # Put init, configuration and authorization files in /etc > doinitd ${FILESDIR}/hsqldb > doconfd conf/hsqldb >+ dodir /etc/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 >+ insopts -m0600 -o hsqldb -g hsqldb > doins conf/server.properties >- insopts -m 0600 -o hsqldb -g hsqldb >+ insopts -m0600 -o hsqldb -g hsqldb > doins conf/sqltool.rc > >- dodir /var/lib/hsqldb/bin >- keepdir /var/lib/hsqldb >- exeinto /var/lib/hsqldb/bin >+ # Install init script >+ dodir ${HSQLDB_HOME}/bin >+ keepdir ${HSQLDB_HOME} >+ exeinto ${HSQLDB_HOME}/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 >+ >+ # 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 >+ dosym /etc/hsqldb/sqltool.rc ${HSQLDB_HOME}/sqltool.rc >+ >+ # 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 "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 >+ ewarn "UNIX Quick Start' in the Hsqldb docs for more information)" >+ echo > einfo "Example:" >- einfo >+ echo > 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 "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 newdb" >- einfo "url jdbc:hsqldb:hsql://localhost/newdb" >+ 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 "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)." >+ 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 >+} >+ >+pkg_postrm() { >+ # Disable CONFIG_PROTECT for hsqldb >+ env-update > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 111960
:
91267
| 91268 |
91269
|
91270
|
91271
|
91272
|
91273
|
91274
|
91275