mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
www-servers/tomcat: version bump for slot 7
Package-Manager: Portage-2.3.6, Repoman-2.3.2
This commit is contained in:
Miroslav Šulc
@@ -1,4 +1,5 @@
|
||||
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
|
||||
DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
|
||||
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
|
||||
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
|
||||
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
|
||||
--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
|
||||
+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
|
||||
@@ -660,12 +660,14 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
<!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
|
||||
+<!--
|
||||
<copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
|
||||
<fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
|
||||
<include name="*" />
|
||||
<exclude name="jspxml*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
+-->
|
||||
|
||||
</target>
|
||||
|
||||
@@ -721,26 +723,32 @@
|
||||
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
|
||||
|
||||
<!-- Servlet 3.0 Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${servlet-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.servlet-api"
|
||||
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||
license="${tomcat.manifests}/servlet-api.jar.license" />
|
||||
+-->
|
||||
|
||||
<!-- JSP 2.2 Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${jsp-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.jsp-api"
|
||||
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
|
||||
notice="${tomcat.manifests}/jsp-api.jar.notice"
|
||||
license="${tomcat.manifests}/jsp-api.jar.license" />
|
||||
+-->
|
||||
|
||||
<!-- JSP 2.2 EL Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${el-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.el-api"
|
||||
manifest="${tomcat.manifests}/el-api.jar.manifest" />
|
||||
+-->
|
||||
|
||||
<!-- Bootstrap JAR File -->
|
||||
<jarIt jarfile="${bootstrap.jar}"
|
||||
@@ -986,12 +994,14 @@
|
||||
<target name="deploy" depends="package,build-docs,compile-webapp-examples"
|
||||
description="Default. Builds a working Tomcat instance">
|
||||
|
||||
+<!--
|
||||
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
|
||||
file="${tomcat-native.tar.gz}" />
|
||||
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
|
||||
file="${commons-daemon.native.src.tgz}" />
|
||||
|
||||
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
|
||||
+-->
|
||||
|
||||
<!-- Copy scripts -->
|
||||
<copy todir="${tomcat.build}/bin">
|
||||
@@ -1051,14 +1061,15 @@
|
||||
<exclude name="${jdt.jar.filename}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
+<!--
|
||||
<copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
|
||||
-
|
||||
+-->
|
||||
<!-- Add sources for examples -->
|
||||
<antcall target="examples-sources" />
|
||||
-
|
||||
+<!--
|
||||
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
|
||||
failonerror="false"/>
|
||||
-
|
||||
+-->
|
||||
<!-- build the jdbc-pool jar and source jar-->
|
||||
<echo message="Building Tomcat JDBC pool libraries"/>
|
||||
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
|
||||
@@ -1681,7 +1692,7 @@
|
||||
|
||||
<target name="extras-webservices-prepare"
|
||||
depends="extras-prepare"
|
||||
- description="Prepare to build web services extras package">
|
||||
+ description="Prepare to build web services extras package" unless="noget">
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
|
||||
@@ -1886,6 +1897,7 @@
|
||||
description="Create the Tomcat javadoc" >
|
||||
<fail unless="java.7.home"
|
||||
message="The java.7.home property must be set for javadoc build"/>
|
||||
+<!--
|
||||
<javadoc packagenames="javax.servlet.*"
|
||||
excludepackagenames="javax.servlet.jsp.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
@@ -1947,6 +1959,7 @@
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
</javadoc>
|
||||
+-->
|
||||
<javadoc packagenames="javax.websocket.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
destdir="${tomcat.dist}/webapps/docs/websocketapi"
|
||||
@@ -1985,9 +1998,11 @@
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
+<!--
|
||||
<link href="../servletapi"/>
|
||||
<link href="../jspapi"/>
|
||||
<link href="../elapi"/>
|
||||
+-->
|
||||
<link href="../websocketapi"/>
|
||||
<link href="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
<link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
|
||||
@@ -2642,7 +2657,7 @@
|
||||
</target>
|
||||
|
||||
<target name="download-compile"
|
||||
- description="Download (and build) components necessary to compile" >
|
||||
+ description="Download (and build) components necessary to compile" unless="noget">
|
||||
|
||||
<antcall target="downloadfile-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|
||||
@@ -2699,7 +2714,7 @@
|
||||
</target>
|
||||
|
||||
<target name="download-test-compile"
|
||||
- description="Download additional components for the tests" >
|
||||
+ description="Download additional components for the tests" unless="noget">
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${junit.loc}"/>
|
||||
@@ -2727,7 +2742,7 @@
|
||||
</target>
|
||||
|
||||
<target name="download-dist"
|
||||
- description="Download additional components for a distribution" >
|
||||
+ description="Download additional components for a distribution" unless="noget">
|
||||
|
||||
<antcall target="downloadzip-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
|
||||
@@ -0,0 +1,148 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2 prefix user
|
||||
|
||||
MY_P="apache-${P}-src"
|
||||
|
||||
DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
|
||||
HOMEPAGE="http://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="7"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="extra-webapps websockets"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.5"
|
||||
SAPI_SLOT="3.0"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
dev-java/tomcat-servlet-api:${SAPI_SLOT}"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
websockets? ( >=virtual/jre-1.7 )
|
||||
!websockets? ( >=virtual/jre-1.6 )
|
||||
!<dev-java/tomcat-native-1.1.24"
|
||||
DEPEND="${COMMON_DEP}
|
||||
websockets? ( >=virtual/jdk-1.7 )
|
||||
!websockets? ( >=virtual/jdk-1.6 )
|
||||
test? ( dev-java/ant-junit:0 )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
enewgroup tomcat 265
|
||||
enewuser tomcat 265 -1 /dev/null tomcat
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/javax/{el,servlet} || die
|
||||
|
||||
java-pkg_clean
|
||||
|
||||
epatch "${FILESDIR}/${P}-build.xml.patch"
|
||||
|
||||
# For use of catalina.sh in netbeans
|
||||
sed -i -e "/^# ----- Execute The Requested Command/ a\
|
||||
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
|
||||
bin/catalina.sh || die
|
||||
|
||||
java-pkg-2_src_prepare
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
|
||||
EANT_BUILD_TARGET="deploy"
|
||||
EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
|
||||
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
|
||||
EANT_NEEDS_TOOLS="true"
|
||||
EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
|
||||
|
||||
# revisions of the scripts
|
||||
IM_REV="-r1"
|
||||
INIT_REV="-r1"
|
||||
|
||||
src_compile() {
|
||||
use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
|
||||
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
|
||||
java-pkg-2_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/share/${PN}-${SLOT}"
|
||||
|
||||
java-pkg_jarinto "${dest}"/bin
|
||||
java-pkg_dojar output/build/bin/*.jar
|
||||
exeinto "${dest}"/bin
|
||||
doexe output/build/bin/*.sh
|
||||
|
||||
java-pkg_jarinto "${dest}"/lib
|
||||
java-pkg_dojar output/build/lib/*.jar
|
||||
|
||||
dodoc RELEASE-NOTES RUNNING.txt
|
||||
use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
|
||||
use source && java-pkg_dosrc java/*
|
||||
|
||||
### Webapps ###
|
||||
|
||||
insinto "${dest}"/webapps
|
||||
doins -r output/build/webapps/{host-manager,manager,ROOT}
|
||||
use extra-webapps && doins -r output/build/webapps/{docs,examples}
|
||||
|
||||
### Config ###
|
||||
|
||||
# create "logs" directory in $CATALINA_BASE
|
||||
# and set correct perms, see #458890
|
||||
dodir "${dest}"/logs
|
||||
fperms 0750 "${dest}"/logs
|
||||
|
||||
# replace the default pw with a random one, see #92281
|
||||
local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
|
||||
sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
|
||||
|
||||
# prepend gentoo.classpath to common.loader, see #453212
|
||||
sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
|
||||
|
||||
insinto "${dest}"
|
||||
doins -r output/build/conf
|
||||
|
||||
### rc ###
|
||||
|
||||
cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
|
||||
eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
|
||||
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
|
||||
|
||||
insinto "${dest}"/gentoo
|
||||
doins "${T}"/tomcat.conf
|
||||
exeinto "${dest}"/gentoo
|
||||
newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
|
||||
newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
|
||||
elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
|
||||
elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
|
||||
|
||||
elog "To manage Tomcat instances, run:"
|
||||
elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
|
||||
|
||||
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
|
||||
ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
|
||||
|
||||
# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
|
||||
}
|
||||
Reference in New Issue
Block a user