From 27a07a8dc5a05d8008c78325d6432b0cad5dbfda Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Tue, 22 Nov 2011 15:02:54 +0100 Subject: [PATCH] update to 2.4.1 --- dev-java/artifactory/Manifest | 7 ++++--- ...tory-2.3.3.1.ebuild => artifactory-2.4.1.ebuild} | 13 +++++++++---- dev-java/artifactory/files/artifactory.confd | 6 ++++++ dev-java/artifactory/files/artifactory.initd | 5 +++-- 4 files changed, 22 insertions(+), 9 deletions(-) rename dev-java/artifactory/{artifactory-2.3.3.1.ebuild => artifactory-2.4.1.ebuild} (90%) diff --git a/dev-java/artifactory/Manifest b/dev-java/artifactory/Manifest index 89fb73f..5677339 100644 --- a/dev-java/artifactory/Manifest +++ b/dev-java/artifactory/Manifest @@ -1,3 +1,4 @@ -AUX artifactory.initd 833 RMD160 8e076445998d939fbe7080f3ce12f0efd027d218 SHA1 39b62d863b2184967d4e051e0b02b069b10b134d SHA256 2ee9e266be89841ac1920613370441cc598665c0bb58ae96a320390aafc0342f -DIST artifactory-2.3.3.1.zip 35982504 RMD160 6941e17f7d9e47e6b3f495fff07e3f36caa0266d SHA1 7905760a641aa5ed6fb58215a13039f4b38e0fac SHA256 23a457028f23dbe5c29107cdf3a62ecceb098565d2c4567fe3bbd085ad5b1c89 -EBUILD artifactory-2.3.3.1.ebuild 1163 RMD160 6adc4a215bb6309988a154d750ab77f236a14fda SHA1 f0eb38b63e1d1fec86630abb89ed8ca585c66ced SHA256 dd01fd01540d200122cf41030e2166a168cd98a90aeca83df30e8f0a198a0a0d +AUX artifactory.confd 729 RMD160 810db10baee3161591a850cb5d70926f7f6e3233 SHA1 740581f0324063d11384385d51804e4efe0c9448 SHA256 81df9fa9ca65259199a1a844c45cd7c58e07565ef89369af54e198421a40f69c +AUX artifactory.initd 1054 RMD160 435d6b3d97905e254ac7714e2621a42cef6c5609 SHA1 38a6308a0e60d464b41f6b2cd94607bf25e52c6e SHA256 c94ddfda9aa088d76269678eba73817092cc2421752440d63d3f1b2ae6bdb845 +DIST artifactory-2.4.1.zip 33661456 RMD160 89e99581f1d5c8d824c39f18186220b6d292155b SHA1 3ee96e45697ccd3c7a27f000445c97a08113a3d7 SHA256 b49bb9b1130b37779ad0cf76443454f51c449aa0125fb114800c0cb2548e0187 +EBUILD artifactory-2.4.1.ebuild 2853 RMD160 07c33b2e0706181130d6951c18ffbe69b7a9b9ec SHA1 72803c6d23a5289432cd81c2a2ef8cb0991db297 SHA256 ea3fc1d580ad3ba9c2b75a948a49160a9909bb860be2fa118d9ee8c37c13c112 diff --git a/dev-java/artifactory/artifactory-2.3.3.1.ebuild b/dev-java/artifactory/artifactory-2.4.1.ebuild similarity index 90% rename from dev-java/artifactory/artifactory-2.3.3.1.ebuild rename to dev-java/artifactory/artifactory-2.4.1.ebuild index 31fe9cb..32bfb99 100644 --- a/dev-java/artifactory/artifactory-2.3.3.1.ebuild +++ b/dev-java/artifactory/artifactory-2.4.1.ebuild @@ -7,6 +7,7 @@ DESCRIPTION="Artifactory Maven Artifact Server" HOMEPAGE="http://www.jfrog.org/products.php" SLOT="0" +RESTRICT="mirror" SRC_URI="mirror://sourceforge/${PN}/${P}.zip" KEYWORDS="~amd64 ~x86" @@ -14,7 +15,10 @@ LICENSE="LGPL-3" IUSE="mysql derby postgres" RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5" +DEPEND=">=virtual/jdk-1.5 + dev-java/jsr305 + mysql? ( dev-java/jdbc-mysql ) + " ARTIFACTORY_HOME=/var/lib/${PN} ARTIFACTORY_INSTALL=/usr/share/${PN} @@ -55,7 +59,7 @@ src_install() { # remove unneeded configs rm -r ${S}/etc/repo/*mssql - rm -r ${S}/etc/repo/oracle10 + rm -r ${S}/etc/repo/*oracle* if ! use derby; then rm -r ${S}/etc/repo/*derby fi @@ -66,7 +70,8 @@ src_install() { rm -r ${S}/etc/repo/*postgresql fi - # remove windows-wrapper + chown ${ARTIFACTORY_USER}:artifact ${S}/etc/repo + # remove windows-wrapper rm ${S}/lib/wrapper* sed -i -e "s:/webapps:${ARTIFACTORY_INSTALL}/webapps:" "${S}"/etc/jetty.xml @@ -80,11 +85,11 @@ src_install() { exeinto /usr/bin doexe bin/artadmin -# doexe bin/artifactory.sh newinitd "${FILESDIR}"/artifactory.initd artifactory newconfd "${FILESDIR}"/artifactory.confd artifactory elog "Artifact storage is /var/lib/artifact. Ensure that there is enough space." elog "The default password for user 'admin' is 'password'." + elog "After upgrading clean up the jetty-dir '${ARTIFACTORY_INSTALL}/work'" } diff --git a/dev-java/artifactory/files/artifactory.confd b/dev-java/artifactory/files/artifactory.confd index cfc9ef0..9921d84 100644 --- a/dev-java/artifactory/files/artifactory.confd +++ b/dev-java/artifactory/files/artifactory.confd @@ -9,6 +9,12 @@ ARTIFACTORY_INSTALL="/usr/share/artifactory" # Options for artifacory ARTIFACTORY_OPTS="" +# JSR 305 support for non sun/oracle VMs +JDBC_JAR="/usr/share/jsr305/lib/jsr305.jar" +# adding JDBC to the classpath choose the needed. +#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-mysql/lib/jdbc-mysql.jar" +#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar" + # User and group as which to run artifactory #ARTIFACTORY_USER="artifact" #ARTIFACTORY_GROUP="artifact" diff --git a/dev-java/artifactory/files/artifactory.initd b/dev-java/artifactory/files/artifactory.initd index 9d54670..5282869 100644 --- a/dev-java/artifactory/files/artifactory.initd +++ b/dev-java/artifactory/files/artifactory.initd @@ -18,9 +18,10 @@ start() { do CLASSPATH="$CLASSPATH:$i" done + CLASSPATH="$CLASSPATH:$JDBC_JAR" - start-stop-daemon --start --chuid ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \ - -t --chdir "/var/lib/artifactory" \ + start-stop-daemon --start --user ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \ + --chdir "/var/lib/artifactory" \ --pidfile /var/run/artifactory.pid --make-pidfile --background \ --exec "$JAVACMD" -- $JAVA_OPTIONS -cp "$CLASSPATH" org.artifactory.standalone.main.Main eend $?