From d3d922b91187c8238c65c8ac4ad1e043b64d94bd Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Sun, 4 Mar 2012 20:21:59 +0100 Subject: [www-servers/jetty-bin] fork from seden's overlay. Respect multilib-strict --- www-servers/jetty-bin/ChangeLog | 39 ++++++ www-servers/jetty-bin/Manifest | 8 ++ www-servers/jetty-bin/files/conf.d/jetty-6 | 24 ++++ www-servers/jetty-bin/files/conf.d/jetty-7 | 24 ++++ www-servers/jetty-bin/files/init.d/jetty-6 | 51 ++++++++ www-servers/jetty-bin/files/init.d/jetty-7 | 51 ++++++++ www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild | 145 +++++++++++++++++++++++ 7 files changed, 342 insertions(+) create mode 100644 www-servers/jetty-bin/ChangeLog create mode 100644 www-servers/jetty-bin/Manifest create mode 100644 www-servers/jetty-bin/files/conf.d/jetty-6 create mode 100644 www-servers/jetty-bin/files/conf.d/jetty-7 create mode 100644 www-servers/jetty-bin/files/init.d/jetty-6 create mode 100644 www-servers/jetty-bin/files/init.d/jetty-7 create mode 100644 www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild diff --git a/www-servers/jetty-bin/ChangeLog b/www-servers/jetty-bin/ChangeLog new file mode 100644 index 0000000..9105226 --- /dev/null +++ b/www-servers/jetty-bin/ChangeLog @@ -0,0 +1,39 @@ +# ChangeLog for www-servers/jetty-bin +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 02 Feb 2012; Sven Eden + -jetty-bin-7.5.4.ebuild : + It is not possible to make Eclipse be happy with jetty-7, so + drop it. + +*jetty-bin-7.5.4.ebuild (02 Feb 2012) +*jetty-bin-6.1.26-r3.ebuild (02 Feb 2012) + + 02 Feb 2012; Sven Eden + +jetty-bin-7.5.4.ebuild : + First Ebuild for Jetty-7 + +jetty-bin-6.1.26-r3.ebuild : + Cleaned up some issues + + - jetty-bin-6.1.26.ebuild + - jetty-bin-6.1.26-r1.ebuild + - jetty-bin-6.1.26-r2.ebuild + Removed old ebuilds + +*jetty-bin-6.1.26-r2.ebuild (22 Nov 2011) + + 15 Aug 2011; Sven Eden +jetty-bin-6.1.26-r2.ebuild : + Added USE_Flag "tomcat7" to depend on tomcat:3.0 instead of 2.5. + +*jetty-bin-6.1.26-r1.ebuild (16 Aug 2011) + + 15 Aug 2011; Sven Eden +jetty-bin-6.1.26-r1.ebuild : + Changed the ebuild to install as "jetty" and not "jetty-bin". Eclipse + 3.7 now merges fine with it. + +*jetty-bin-6.1.26.ebuild (15 Aug 2011) + + 15 Aug 2011; Sven Eden +jetty-bin-6.1.26.ebuild : + Initial commit of the ebuild. Ebuild taken from Bug #328747, written + by John J. Aylward (johnjaylward@yahoo.com) diff --git a/www-servers/jetty-bin/Manifest b/www-servers/jetty-bin/Manifest new file mode 100644 index 0000000..80c4484 --- /dev/null +++ b/www-servers/jetty-bin/Manifest @@ -0,0 +1,8 @@ +AUX conf.d/jetty-6 676 RMD160 47bd799223d448b21e83d4f2102597ba1012788d SHA1 4add53cc8f55b8d3154efab67b4e082270089356 SHA256 19ea54fbf09fab5b3ccaf819ae872935d6d3718ce6e753dc834302a6be4d199f +AUX conf.d/jetty-7 638 RMD160 833e953d23750afd17e20a8b4274e84150a0bf03 SHA1 4b9e6c67ed1eba32d36e840a590d378a8975a0ce SHA256 5e15c5283ac1177d42e209f1838b34d50c8c687befb3978f31072c16b8cdc0f5 +AUX init.d/jetty-6 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f278c31dc1397df1b6bd318f844a2266c8ebf4 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720 +AUX init.d/jetty-7 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f278c31dc1397df1b6bd318f844a2266c8ebf4 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720 +DIST jetty-6.1.26.zip 25894195 RMD160 6e960763e720641e1bfd69ca8e5d54f0bc7d8def SHA1 9485913f1a1945a849a90f1a34853d22350bc524 SHA256 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187 +DIST jetty-ant-6.1.26.jar 22961 RMD160 910a0e8522a9bf9f6e33298d72a1aba46aa39954 SHA1 0e07d6fad03c440daa7b0523ffbf58bf41151266 SHA256 b82f643508d0fbcac5f92e3ecd7271684be098a97bd1304345c00c98a4d95f4c +EBUILD jetty-bin-6.1.26-r3.ebuild 5139 RMD160 d7f4bd16c30eeb4170a4bccefbcaef22ba73f423 SHA1 a0631ac1df261e9b60dee3f94010159d76eb771e SHA256 2c9fe405e256f08deeb2a2dbd3bc9d90147c519635f4bd78313b483c0f03f3fe +MISC ChangeLog 1254 RMD160 50e0707342b57c5625020bca3888186edccc4f8a SHA1 3447932b56e0b58d26e4a177205481da1d7bc67b SHA256 1706f719a8484e130b69d691f568b2b8547ee232750ce5c712b4d12d4c5b1086 diff --git a/www-servers/jetty-bin/files/conf.d/jetty-6 b/www-servers/jetty-bin/files/conf.d/jetty-6 new file mode 100644 index 0000000..730ac76 --- /dev/null +++ b/www-servers/jetty-bin/files/conf.d/jetty-6 @@ -0,0 +1,24 @@ +#Configuration options for jetty server + +#JETTY_HOST=localhost +#JETTY_PORT=8080 + +# port to listen on to stop the server +#STOP_PORT=8079 + +# "password" used on the stop port to verify that the server should be stopped +STOP_KEY=secret + +# Set this value to 1 and configure the jetty-setuid.xml to have the server run as an unprivilaged user +#USE_SETUID=1 + +# jetty 6 has a bug that only lets it connect to ipv6 or ipv4, not both +#USE_IPV6=1 + +# Use the SSL config jetty-ssl.xml +#USE_SSL=1 + +# Set this to a space delimited list of extra conf files you want loaded +# The files are relative to ${JETTY_HOME} so +# ex. JETTY_CONF="etc/jetty-ajp.xml etc/jetty-logging.xml" +#JETTY_CONF="" diff --git a/www-servers/jetty-bin/files/conf.d/jetty-7 b/www-servers/jetty-bin/files/conf.d/jetty-7 new file mode 100644 index 0000000..43c75e0 --- /dev/null +++ b/www-servers/jetty-bin/files/conf.d/jetty-7 @@ -0,0 +1,24 @@ +#Configuration options for jetty server + +#JETTY_HOST=localhost +#JETTY_PORT=8080 + +# port to listen on to stop the server +#STOP_PORT=8079 + +# "password" used on the stop port to verify that the server should be stopped +STOP_KEY=secret + +# Set this value to 1 and configure the jetty-setuid.xml to have the server run as an unprivilaged user +#USE_SETUID=1 + +# Set this value to 1 to use ipv6 +#USE_IPV6=1 + +# Use the SSL config jetty-ssl.xml +#USE_SSL=1 + +# Set this to a space delimited list of extra conf files you want loaded +# The files are relative to ${JETTY_HOME} so +# ex. JETTY_CONF="etc/jetty-ajp.xml etc/jetty-logging.xml" +#JETTY_CONF="" diff --git a/www-servers/jetty-bin/files/init.d/jetty-6 b/www-servers/jetty-bin/files/init.d/jetty-6 new file mode 100644 index 0000000..1e54649 --- /dev/null +++ b/www-servers/jetty-bin/files/init.d/jetty-6 @@ -0,0 +1,51 @@ +#!/sbin/runscript + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + + JETTY_HOME="/var/lib/${SVCNAME}" + CONF_FILES="${JETTY_HOME}/etc/jetty.xml" + JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config" + + if [[ -n ${JETTY_HOST} ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}" + fi + if [[ -n ${JETTY_PORT} ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}" + fi + if [[ -n ${STOP_PORT} ]]; then + JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}" + fi + if [[ -n ${STOP_KEY} ]]; then + JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}" + fi + if [[ ${USE_SETUID} -eq 1 ]]; then + # Setuid configuration file needs to be the first one in the list + CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}" + JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/" + fi + if [[ ${USE_IPV6} -ne 1 ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true" + fi + if [[ ${USE_SSL} -eq 1 ]]; then + # Setuid configuration file needs to be the first one in the list + CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml" + fi + + cd "${JETTY_HOME}" + + start-stop-daemon --start --background --make-pidfile \ + --pidfile /var/run/${SVCNAME}.pid \ + --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + eend $? +} diff --git a/www-servers/jetty-bin/files/init.d/jetty-7 b/www-servers/jetty-bin/files/init.d/jetty-7 new file mode 100644 index 0000000..1e54649 --- /dev/null +++ b/www-servers/jetty-bin/files/init.d/jetty-7 @@ -0,0 +1,51 @@ +#!/sbin/runscript + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + + JETTY_HOME="/var/lib/${SVCNAME}" + CONF_FILES="${JETTY_HOME}/etc/jetty.xml" + JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config" + + if [[ -n ${JETTY_HOST} ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}" + fi + if [[ -n ${JETTY_PORT} ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}" + fi + if [[ -n ${STOP_PORT} ]]; then + JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}" + fi + if [[ -n ${STOP_KEY} ]]; then + JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}" + fi + if [[ ${USE_SETUID} -eq 1 ]]; then + # Setuid configuration file needs to be the first one in the list + CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}" + JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/" + fi + if [[ ${USE_IPV6} -ne 1 ]]; then + JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true" + fi + if [[ ${USE_SSL} -eq 1 ]]; then + # Setuid configuration file needs to be the first one in the list + CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml" + fi + + cd "${JETTY_HOME}" + + start-stop-daemon --start --background --make-pidfile \ + --pidfile /var/run/${SVCNAME}.pid \ + --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + eend $? +} diff --git a/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild b/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild new file mode 100644 index 0000000..6a4204a --- /dev/null +++ b/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils java-pkg-2 + +DESCRIPTION="Jetty Web Server; Java Servlet container" + +SLOT="6" +HOMEPAGE="http://jetty.codehaus.org/" +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" + +MY_PN=${PN/-bin} +MY_JETTY=${MY_PN}-${SLOT} +MY_P=${MY_PN}-${PV} + +IUSE="anttasks client ldap ssl stats tomcat7" + +SRC_URI="http://dist.codehaus.org/jetty/jetty-${PV}/jetty-${PV}.zip + anttasks? ( http://dist.codehaus.org/jetty/jetty-${PV}/jetty-ant-${PV}.jar )" +RESTRICT="mirror" + +DEPEND=" + tomcat7? ( dev-java/tomcat-servlet-api:3.0 ) + !tomcat7? ( dev-java/tomcat-servlet-api:2.5 ) + !www-servers/jetty:${SLOT} + !www-servers/jetty-eclipse:${SLOT} + !www-servers/jetty-eclipse-bin:${SLOT} + >=virtual/jre-1.5" + +RDEPEND="${DEPEND} + anttasks? ( dev-java/ant ) + >=dev-java/slf4j-api-1.3.1 + >=dev-java/sun-javamail-1.4 + >=dev-java/jta-1.0.1 + >=java-virtuals/jaf-1.1" + +S=${WORKDIR}/${MY_P} + +src_install() { + cd "${S}" + rm -f etc/jetty-sslengine.xml + + java-pkg_jarinto "/usr/share/${MY_JETTY}/lib/" + java-pkg_sointo "/usr/$(get_libdir)/${MY_JETTY}" + + java-pkg_dojar start.jar + java-pkg_newjar lib/${MY_P}.jar ${MY_PN}.jar + java-pkg_newjar lib/${MY_PN}-util-${PV}.jar ${MY_PN}-util.jar + java-pkg_newjar lib/jre1.5/${MY_PN}-util5-${PV}.jar ${MY_PN}-util5.jar + java-pkg_newjar lib/annotations/${MY_PN}-annotations-${PV}.jar ${MY_PN}-annotations.jar + java-pkg_newjar lib/ext/${MY_PN}-rewrite-handler-${PV}.jar ${MY_PN}-rewrite-handler.jar + java-pkg_newjar lib/ext/${MY_PN}-html-${PV}.jar ${MY_PN}-html.jar + java-pkg_newjar lib/ext/${MY_PN}-java5-threadpool-${PV}.jar ${MY_PN}-java5-threadpool.jar + java-pkg_newjar lib/ext/${MY_PN}-ajp-${PV}.jar ${MY_PN}-ajp.jar + java-pkg_newjar lib/ext/${MY_PN}-servlet-tester-${PV}.jar ${MY_PN}-servlet-tester.jar + java-pkg_newjar lib/ext/${MY_PN}-setuid-${PV}.jar ${MY_PN}-setuid.jar + java-pkg_doso lib/ext/libsetuid.so + java-pkg_newjar lib/jsp-2.1/jsp-2.1-${MY_P}.jar jsp-2.1-${MY_PN}.jar + java-pkg_newjar lib/management/${MY_PN}-management-${PV}.jar ${MY_PN}-management.jar + java-pkg_newjar lib/naming/${MY_PN}-naming-${PV}.jar ${MY_PN}-naming.jar + java-pkg_newjar lib/plus/${MY_PN}-plus-${PV}.jar ${MY_PN}-plus.jar + java-pkg_newjar lib/terracotta/${MY_PN}-terracotta-sessions-${PV}.jar ${MY_PN}-terracotta-sessions.jar + java-pkg_newjar lib/xbean/${MY_PN}-xbean-${PV}.jar ${MY_PN}-xbean.jar + + use client && java-pkg_newjar lib/ext/${MY_PN}-client-${PV}.jar ${MY_PN}-client.jar + if use ldap ; then + java-pkg_newjar lib/ext/${MY_PN}-ldap-jaas-${PV}.jar ${MY_PN}-ldap-jaas.jar + else + rm -f etc/jetty-jaas.xml + fi + if use ssl ; then + java-pkg_newjar lib/ext/${MY_PN}-sslengine-${PV}.jar ${MY_PN}-sslengine.jar + else + rm -f etc/jetty-ssl.xml + fi + if use stats ; then + java-pkg_newjar lib/ext/${MY_PN}-java5-stats-${PV}.jar ${MY_PN}-java5-stats.jar + else + rm -f etc/jetty-stats.xml + fi + + if use anttasks ; then + java-pkg_dojar bin/jetty-tasks.xml + cd ${DISTDIR} + java-pkg_newjar ${MY_PN}-ant-${PV}.jar ${MY_PN}-ant.jar + cd ${S} + fi + + + dodir /etc/${MY_JETTY} + insinto /etc/${MY_JETTY} + doins etc/* + + dodir /etc/conf.d + insinto /etc/conf.d + newins ${FILESDIR}/conf.d/${MY_JETTY} ${MY_JETTY} + + dodir /etc/init.d + exeinto /etc/init.d + newexe ${FILESDIR}/init.d/${MY_JETTY} ${MY_JETTY} + + dodir /var/log/${MY_JETTY} + + JETTY_HOME=/var/lib/${MY_JETTY} + dodir ${JETTY_HOME}/webapps + dodir ${JETTY_HOME}/contexts + dodir ${JETTY_HOME}/resources + dosym ${JAVA_PKG_JARDEST} ${JETTY_HOME}/lib + dosym ${JAVA_PKG_JARDEST}/start.jar ${JETTY_HOME}/start.jar + dosym /etc/${MY_JETTY} ${JETTY_HOME}/etc + dosym /var/log/${MY_JETTY} ${JETTY_HOME}/logs + + START_CONFIG=${D}/${JETTY_HOME}/start.config + echo "\$(jetty.class.path).path always" > ${START_CONFIG} + echo "\$(jetty.lib)/** exists \$(jetty.lib)" >> ${START_CONFIG} + echo "jetty.home=${JETTY_HOME}" >> ${START_CONFIG} + echo "org.mortbay.xml.XmlConfiguration.class" >> ${START_CONFIG} + echo "\$(start.class).class" >> ${START_CONFIG} + echo "\$(jetty.home)/etc/jetty.xml" >> ${START_CONFIG} + echo "\$(jetty.home)/lib/*" >> ${START_CONFIG} + echo "/usr/share/sun-javamail/lib/*" >> ${START_CONFIG} + echo "/usr/share/ant/lib/*" >> ${START_CONFIG} + echo "/usr/share/slf4j-api/lib/*" >> ${START_CONFIG} + echo "/usr/share/jta/lib/*" >> ${START_CONFIG} + if use tomcat7 ; then + echo "/usr/share/tomcat-servlet-api-3.0/lib/*" >> ${START_CONFIG} + else + echo "/usr/share/tomcat-servlet-api-2.5/lib/*" >> ${START_CONFIG} + fi + echo "" >> ${START_CONFIG} + echo "\$(jetty.home)/resources/" >> ${START_CONFIG} +} + +pkg_preinst () { + enewuser jetty + fowners jetty:jetty /var/log/${MY_JETTY} + fperms g+w /var/log/${MY_JETTY} + mv ${D}/usr/share/${PN}-${SLOT}/package.env ${D}/usr/share/${MY_JETTY}/package.env + rm -rf ${D}/usr/share/${PN}-${SLOT} +} + -- cgit v1.2.3-65-gdbad