From 2ac41e1e261320e2436dff0f929dada02f7f50fd Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Thu, 3 Sep 2015 18:55:00 +0200 Subject: www-servers/tomcat: version bump Package-Manager: portage-2.2.20.1 --- www-servers/tomcat/Manifest | 1 + .../tomcat/files/tomcat-8.0.26-build.xml.patch | 265 +++++++++++++++++++++ www-servers/tomcat/tomcat-8.0.26.ebuild | 147 ++++++++++++ 3 files changed, 413 insertions(+) create mode 100644 www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch create mode 100644 www-servers/tomcat/tomcat-8.0.26.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index c486b115c351..ce0df3b99a9d 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8 +DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc diff --git a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch new file mode 100644 index 000000000000..1923d23ba50b --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch @@ -0,0 +1,265 @@ +diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml +--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 ++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100 +@@ -697,24 +697,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + ++ + + ++ + + + +- ++ + + + +@@ -1049,7 +1054,7 @@ + + + +- ++ + + + +@@ -1083,7 +1088,7 @@ + + + +- ++ + + + + + +- ++ + + + + ++ + +@@ -1542,7 +1548,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1681,7 +1687,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1882,6 +1888,7 @@ + + ++ + ++ maxmemory="512m" > + + + + + ++ + + + +@@ -2739,7 +2749,7 @@ + + + ++ description="Download (and build) components necessary to compile" unless="noget"> + + + +@@ -2773,7 +2783,7 @@ + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2819,7 +2829,7 @@ + + + ++ description="Download additional components for a distribution" unless="noget"> + + + +@@ -2845,18 +2855,18 @@ + + + +- ++ + + + + +- ++ + + + + +- ++ + + + +@@ -2868,7 +2878,7 @@ + + + +- ++ + + + +@@ -2887,7 +2897,7 @@ + + + +- ++ + + + +@@ -2898,7 +2908,7 @@ + + + +- ++ + + + +@@ -2916,7 +2926,7 @@ + + + +- ++ + + + +@@ -2926,7 +2936,7 @@ + + + +- ++ + + + +@@ -2949,7 +2959,7 @@ + + + +- ++ + + + +@@ -2960,7 +2970,7 @@ + + + +- ++ + + + +@@ -2971,7 +2981,7 @@ + + ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + + diff --git a/www-servers/tomcat/tomcat-8.0.26.ebuild b/www-servers/tomcat/tomcat-8.0.26.ebuild new file mode 100644 index 000000000000..3074dfa43e93 --- /dev/null +++ b/www-servers/tomcat/tomcat-8.0.26.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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.1/JSP-2.3 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="8" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.4" +SAPI_SLOT="3.1" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/oracle-javamail:0 + dev-java/tomcat-servlet-api:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + !=virtual/jre-1.7" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.7 + test? ( + >=dev-java/ant-junit-1.9:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +java_prepare() { + find -name '*.jar' -type f -delete -print || die + + # Remove bundled javamail, servlet-api + rm -rv java/javax/{el,mail,servlet} || die + + 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_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" +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() { + 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." +} -- cgit v1.2.3-65-gdbad