diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/resin/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/resin/Manifest | 15 | ||||
| -rw-r--r-- | www-servers/resin/files/3.1.9/resin.conf | 12 | ||||
| -rw-r--r-- | www-servers/resin/files/3.1.9/resin.init | 43 | ||||
| -rw-r--r-- | www-servers/resin/resin-3.1.9.ebuild | 176 |
5 files changed, 248 insertions, 6 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index 7d27540f9474..34218ff1c238 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/resin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.90 2009/08/02 14:12:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.91 2009/12/12 13:16:58 nelchael Exp $ + +*resin-3.1.9 (12 Dec 2009) + + 12 Dec 2009; Krzysiek Pawlik <nelchael@gentoo.org> + +files/3.1.9/resin.conf, +resin-3.1.9.ebuild, +files/3.1.9/resin.init: + Version bump. 02 Aug 2009; Markus Meier <maekke@gentoo.org> resin-3.2.1-r3.ebuild: amd64 stable, bug #275672 diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index 4441645144f8..a9f29d74ed9e 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -5,23 +5,28 @@ AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 5 AUX 3.0.25/resin.init 951 RMD160 c6bb819c7bd225a4a5fb570782f15d4cba9bce7e SHA1 123e2b64bc29f1ebbb5cdc65ea98be10c09cf9f8 SHA256 86d043936058453da710957d9da81644eb67f8a4e656160d6624eb9cd974db17 AUX 3.1.8/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df AUX 3.1.8/resin.init 885 RMD160 d8f2cae1744cd32b805aa45ca3680a685afa2d96 SHA1 47930eed1019c58877a588b56efd0d86c70e0a3f SHA256 6f8a84d8716c989fe319a23e8e99e819aaf7abc8d79acad2f67748d15340309a +AUX 3.1.9/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df +AUX 3.1.9/resin.init 885 RMD160 12576668fc5e41b6a635c9bf50a6791c43a5b93b SHA1 88981660e5f34f51c2bd6d777d721fccd8df8ead SHA256 d061817a68b51c5d51ef95c069ee94c9d8a50739cee97cf90abf15964df3e566 AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc +DIST resin-3.1.9-src.zip 13611096 RMD160 6a4c7eec574eeee73cce38ec17b0d997bada52f1 SHA1 28d91e510e5f9a1e861490dc81b484951ba13370 SHA256 f64825ac061122517cb4fb092122272d8af32ef7d63f7d158ba3a2d56a4a9b08 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6 +DIST resin-gentoo-patches-3.1.9.tar.bz2 3872 RMD160 0fea48e0b94c19e6dc6946f0d85be7808f7b4f3d SHA1 f828d981380430dedf6617c07d2d09ba583dc4c9 SHA256 c22dd2a7933385b76f239a89dff4eddd2895bc503b8821c5474a3b3a56260506 DIST resin-gentoo-patches-3.2.1-r1.tar.bz2 4202 RMD160 012888c1b89943a78919cdbe046480c99eac3315 SHA1 a467cb8db54a1660ad0deedfed12d4786809b2ed SHA256 18c145d94d2f9a56ac582e6401639588d5597bcde0b69c5702ccf86ec154126a EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d EBUILD resin-3.1.8.ebuild 4095 RMD160 da5c86497aeb0a6a2c1536f9e76b14b3c1b24c5b SHA1 21c978377ac7450df9ae582958673b2ccfa0d4e2 SHA256 ba0dd18156f76f9b0d3544ea1e13c28d0d124cd39d33d92a267fab6a20d358f8 +EBUILD resin-3.1.9.ebuild 4095 RMD160 d972eb56398156b5d830eb618db311f2df148c59 SHA1 ffe6cc9350aec0791aea62e5c369e51572d3ce5d SHA256 c526874025d8fddd121aa296be092503dea0b73b5277df4eba973cc51e27f57b EBUILD resin-3.2.1-r3.ebuild 4049 RMD160 7c6d56f1883609f6a6dfd1bab81328387f0087da SHA1 8137be15da5837a810603ca758eeea82321d39f8 SHA256 3fb6f4497a1d565bce9f61a11b6751c2a7977772aa3c46906c798d376d6947c5 -MISC ChangeLog 17172 RMD160 818a9ef2a7389b15574fb6b08411970466b27710 SHA1 66948c25bf946d39a61b2bc6ae24c2055fe983f4 SHA256 669387f3bfbe8fbd352504d39824280c4d93c26bd111fd34f2bfdee35c2319f3 +MISC ChangeLog 17345 RMD160 bc7b8b076501435c2cd243920132ef7f08237916 SHA1 2abf38bff3b99b328e3befe58c7ef28edfd59c79 SHA256 480dbca89012728f5f35667bc881b870223432357d29d4dfe186de48e7b2b0d5 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkp1nu8ACgkQkKaRLQcq0GJ7kgCeJgRlOGDg8Ndn7Zvs3oynUL58 -XEUAn2JRU77+cB7kLw7CT5tGMBF7JYV6 -=bfVg +iEYEARECAAYFAksjl9AACgkQgo/w9rxVVVEofQCeJ2BnG5STWQYkOxLZ3rkE2oR6 +gKUAn3NvcNbsCY7WgOQNXe1JViZr4OYd +=VUt8 -----END PGP SIGNATURE----- diff --git a/www-servers/resin/files/3.1.9/resin.conf b/www-servers/resin/files/3.1.9/resin.conf new file mode 100644 index 000000000000..b205f671a22d --- /dev/null +++ b/www-servers/resin/files/3.1.9/resin.conf @@ -0,0 +1,12 @@ +# JVM Runtime +# Using the default setting, it will determine your JVM from the system-vm +# set using java-config. +# See java-config(1) manual page for assistance in determining this value. + +# You can override this value with whatever JDK you want. +# For a list of valid values for GENTOO_VM see output of +# java-config -L +#GENTOO_VM=sun-jdk-1.5 + +# Verbose starting and stopping? (yes/no, defaults to no) +#VERBOSE="yes" diff --git a/www-servers/resin/files/3.1.9/resin.init b/www-servers/resin/files/3.1.9/resin.init new file mode 100644 index 000000000000..66b4faff802c --- /dev/null +++ b/www-servers/resin/files/3.1.9/resin.init @@ -0,0 +1,43 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.9/resin.init,v 1.1 2009/12/12 13:16:58 nelchael Exp $ + +depend() { + need net + use dns logger mysql postgresql +} + +runResin() { + + JAVA_HOME=$(java-config -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME + + local extraArgs= + if [ "${VERBOSE}" = "yes" ]; then + extraArgs="-verbose" + fi + + local msg="${1}" + shift + + local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.conf -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}" + + ebegin "${msg}" + su - resin -c "${cmdline}" + eend $? + +} + +start() { + + runResin "Starting Resin" "start" + +} + +stop() { + + runResin "Stopping Resin" "stop" + +} diff --git a/www-servers/resin/resin-3.1.9.ebuild b/www-servers/resin/resin-3.1.9.ebuild new file mode 100644 index 000000000000..66cffd063046 --- /dev/null +++ b/www-servers/resin/resin-3.1.9.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.9.ebuild,v 1.1 2009/12/12 13:16:58 nelchael Exp $ + +EAPI="1" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools + +DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine." +HOMEPAGE="http://www.caucho.com" +SRC_URI="http://www.caucho.com/download/${P}-src.zip + mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +IUSE="admin" + +KEYWORDS="~amd64 ~ppc ~x86" + +COMMON_DEP="~dev-java/resin-servlet-api-${PV} + dev-java/iso-relax + dev-java/aopalliance + =dev-java/sun-j2ee-deployment-bin-1.1* + dev-java/jax-ws-api:2 + dev-java/jaxb:2 + java-virtuals/javamail + java-virtuals/jaf" + +RDEPEND=">=virtual/jdk-1.5 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.5 + app-arch/unzip + dev-java/ant-core + dev-libs/openssl + ${COMMON_DEP}" + +RESIN_HOME="/usr/$(get_libdir)/resin" + +# Rewrites build.xml in documentation +JAVA_PKG_BSFIX="off" + +src_unpack() { + + unpack ${A} + + cd "${S}" + for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do + epatch "${i}" + done; + + eautoreconf + +} + +pkg_setup() { + + java-pkg-2_pkg_setup + enewgroup resin + enewuser resin -1 /bin/bash ${RESIN_HOME} resin + +} + +src_compile() { + + append-flags -fPIC -DPIC + + chmod 755 "${S}/configure" + econf --prefix=${RESIN_HOME} || die "econf failed" + + einfo "Building libraries..." + # Broken with -jn where n > 1 + emake -j1 || die "emake failed" + + mkdir "${S}/lib" + cd "${S}/lib" + java-pkg_jar-from --virtual jaf + java-pkg_jar-from --virtual javamail + java-pkg_jar-from iso-relax + java-pkg_jar-from aopalliance-1 + java-pkg_jar-from sun-j2ee-deployment-bin-1.1 + java-pkg_jar-from jax-ws-api-2 + java-pkg_jar-from jaxb-2 + java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar + ln -s $(java-config --jdk-home)/lib/tools.jar + cd "${S}" + + einfo "Building jars..." + eant || die "ant failed" + + if use doc; then + einfo "Building docs..." + eant doc || die "ant doc failed" + fi + +} + +src_install() { + + make DESTDIR="${D}" install || die + + dodir /etc/ + mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed" + dosym /etc/resin ${RESIN_HOME}/conf + + keepdir /var/log/resin + keepdir /var/log/resin + keepdir /var/run/resin + + dosym /var/log/resin ${RESIN_HOME}/logs + dosym /var/log/resin ${RESIN_HOME}/log + + dodoc README "${S}"/conf/*.conf + + newinitd "${FILESDIR}/${PV}/resin.init" resin + newconfd "${FILESDIR}/${PV}/resin.conf" resin + + sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" + + rm -f "${S}/lib/tools.jar" + java-pkg_dojar "${S}"/lib/*.jar + rm -fr "${D}/${RESIN_HOME}/lib" + dosym /usr/share/resin/lib ${RESIN_HOME}/lib + dosym /var/log/resin /usr/share/resin/log + + dodir /var/lib/resin/webapps + mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \ + die "mv of webapps failed" + rm -rf "${D}/${RESIN_HOME}/webapps" + dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps + + dosym /etc/resin/resin.conf /etc/resin/resin.xml + + use admin && { + cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed" + } + + use source && { + einfo "Zipping source..." + java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null + } + + einfo "Removing unneeded files..." + rm -fr "${D}/${RESIN_HOME}/bin" + rm -f "${D}"/etc/resin/*.orig + + einfo "Fixing permissions..." + chown -R resin:resin "${D}${RESIN_HOME}" + chown -R resin:resin "${D}/etc/resin" + chown -R resin:resin "${D}/var/log/resin" + chown -R resin:resin "${D}/var/lib/resin" + chown -R resin:resin "${D}/var/run/resin" + + chmod 644 "${D}/etc/conf.d/resin" + chmod 755 "${D}/etc/init.d/resin" + chmod 750 "${D}/var/lib/resin" + chmod 750 "${D}/var/run/resin" + chmod 750 "${D}/etc/resin" + +} + +pkg_postinst() { + + elog + elog " User and group 'resin' have been added." + elog + elog " By default, Resin runs on port 8080. You can change this" + elog " value by editing /etc/resin/resin.conf." + elog + elog " webapps directory was moved to /var/lib/resin/webapps" + elog + elog " Most options has been moved from /etc/conf.d/resin to" + elog " /etc/resin/resin.conf." + elog + +} |