From f6968a60269d65e78c2682cbc8b3820575243a50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 20 Feb 2015 07:25:46 +0000 Subject: [PATCH] www-servers/tomcat: version bump Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xCFE47E2F --- www-servers/tomcat/ChangeLog | 9 +- www-servers/tomcat/Manifest | 5 +- .../files/tomcat-8.0.18-build.xml.patch | 230 ++++++++++++++++++ www-servers/tomcat/tomcat-8.0.18.ebuild | 142 +++++++++++ 4 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch create mode 100644 www-servers/tomcat/tomcat-8.0.18.ebuild diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 5e36664892f2..fb11c820cc03 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.340 2015/02/10 12:17:43 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.341 2015/02/20 07:25:43 fordfrog Exp $ + +*tomcat-8.0.18 (20 Feb 2015) + + 20 Feb 2015; Miroslav Å ulc +tomcat-8.0.18.ebuild, + +files/tomcat-8.0.18-build.xml.patch: + version bump (per bug #540696, ebuild by William L. Thomson Jr. + ) *tomcat-6.0.43 (10 Feb 2015) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 9a072691d4ee..cd769a975a8c 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -3,6 +3,7 @@ AUX tomcat-6.0.43-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169 AUX tomcat-7.0.56-build.xml.patch 3854 SHA256 51b845985859132b633371c6fd2e1e2ea5c787bf7206125546c4b8752464d39e SHA512 8da59a51e58db16b0062bcc6b24e6b0b43d13884abd7c68a37b15226ff4184fb872a8e43ac281c3c7bd379dd11a1343db3eff84175f9323808d1d0c8641242b4 WHIRLPOOL 6035466159f30b873117478a8859451d73c4424cb22e29991cec2af72fc918cf14adf2bb51d107a7a1b95ca1b770f7a3ba6290abdb036d1bdf1a9a4b8da75130 AUX tomcat-7.0.57-build.xml.patch 7127 SHA256 ed30b302255203296a7e895924587f845ee5611e47f803d533e84927d9ac7765 SHA512 69826d3117abe07453f2c74922ab7ca066988bee2b86ae61ba6c57e8c22e751e4b627eddf89d83c58c5ca23a4cbd6e5851a214571def1f101a3a0110085f95b6 WHIRLPOOL 2a1032a989134c0e2f3c0a59bcc92d8e5d89ff134e52ed4e984cbd8eb09aa2f705f61ef0612a48859c5e334addc7a6935263d46c494c872bd129cbf4da1ff52f AUX tomcat-7.0.59-build.xml.patch 4021 SHA256 eaedbf4f596109b8b2218f4643b8433d9907ded1e81060e1694bd9b8ea1c972c SHA512 c58512a0edec2c70ed1751cefebdcfeb992f5748f83a5797bd6a23f17f99f40283521dfc8c1734868168ecae8bcf1b8435900f16ff113b0c89c2ea1d64e4dbcc WHIRLPOOL f2ff5781f8e31bbd7210a535216b8e61b6d0c000629eaba96a05fd48eb32bf828be9f79b6081aacc0071c333bb72e1fc70eedfedcc1311fb8ea7583b628e13c9 +AUX tomcat-8.0.18-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2 AUX tomcat-instance-manager-r1.bash 6451 SHA256 28990e664007e6eab91d1f90f58009457f683c4c9d37ef78f9065b4b6c87add2 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 WHIRLPOOL 3be20ac95b1b2e80d62cecbd5e47d0b7c768e78ec38c5ec5661e4d563962196eb45fae82d54349a9202323f5a464ac922930b1b01e197ed6e83f03a3d38f79af AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3 @@ -12,10 +13,12 @@ DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02 DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93 DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff +DIST apache-tomcat-8.0.18-src.tar.gz 5019289 SHA256 ab1085912c26356ea1526c1679f3a950fe97483d9ee2041e63a17cb058c763bd SHA512 4aa908fc5d59ee2070a10d688c5977b7a8ba3507df2ed067c76f1a3e41fff369a7b7323ef1330f2227e4b1c3e3b1c3172a800f194f62fc1c9a594c79da362f67 WHIRLPOOL f23109f0e3c5fd9f01231cc844c9e35e202f33f81b87ca84ac120f43abc2316cd97679c8c5b9ca8a46b5c1bf04ead4bcb9ce85bcd588189dfd6a41e9b98dc5ba EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61 EBUILD tomcat-6.0.43.ebuild 4109 SHA256 5577cf55a7ca8cabd213e62178c81ad6e98b7bdde8da7c1d27976d72c1514aff SHA512 782fd83b71db4a13a9c9247c3773cf0674a507f5332c7dc61129c4217b013b401621c4c233e9534b49f0713be54e2018aed6a604d54e9986192044b3b1dc0cb6 WHIRLPOOL 37e7b8cf12c98a74c43db448d4ad0bfb2b7299df44894552fb52232e3c52997ba79f335d175b2eb488d075168e4115ad87810172677fad3bf9cbe6b01cc86331 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507 EBUILD tomcat-7.0.57.ebuild 4349 SHA256 6fc213d477109c9438715922d2f86ad4b2e208ade3f5094cb308832377ce3a91 SHA512 9e37119cde5bce1fd15c8637e779ecbcd6aed21000eaabca2f1f67f6c17085379e33b364878e3e23c994ef8990edec20ff20c59f5a063a4fc8e38b7a7fed670d WHIRLPOOL cc6ebef82f783bd44e7ac5573b309ca65d67eb0df5675ddc454155603326f4d60c7503fa46c823c9213adb6653460750ab3f728a6eea97b04ead034476584440 EBUILD tomcat-7.0.59.ebuild 4352 SHA256 139c44589a83570efcbf9c3ac00d0da77d91be2fa9cdf4f075f007f8cf63dc6f SHA512 2d96e0b56fa306c832528ee7baad071ba3f2d3cb274a62d070e164ce51b7018b50c110784f842b302df0f8d00ee0d05471e17e5c298e6bd8a9018b4810eb6521 WHIRLPOOL 6f6a5e9652ea117e74c11a980934b20137a67c0295392de75818acc23f974b0d7db568b9b92ba55117d482180e5377252113ca1d9204a89f04e878c99b819b2a -MISC ChangeLog 81012 SHA256 2afc4cd2f39deddeb716c3bc3f1a24f72f9bdbb510af269aaa4aa38ec0c53ebd SHA512 25d0daf88f365c17279efce5ee22fa47b6c91d2232fecee5b804f3e560d518445f8e4e4ec6db1cc66fff30931335578ffaf4b057258094c58acdf8ec362de22a WHIRLPOOL 236050da82beb358fe3dbd0070c6febfda2d43041b03bd90dca5a9391c86f75c40a05e5d9041c3e4081cca735d3458c781c6f33a675b6ea8662bfc7202b23343 +EBUILD tomcat-8.0.18.ebuild 4184 SHA256 ef3e9735969769cc7da809b70141d97486af2039f5d796e042b625a10c5d1672 SHA512 41226a77144592c4414f37442ecc71793c8706725399986aa9e6b934af8cbad0c87d4db256bace6ccb9d6a7d12344ae8d6f9603b49cf251542320963dca5b630 WHIRLPOOL b93b6610783df3c907cd6c1e611aa6cc865fd76b796b7d05adbab42e77e6ebce8066f8743078822354622b9200cef4b42f4eb88ce2dc8cd82b0ac241e9dca031 +MISC ChangeLog 81254 SHA256 6b78fd25f01346ee6550cff1bd71df6216db36a481acce3a48b8496ba0b24ea0 SHA512 64e3fddfb8514b7cea9a09ed660a6c614e8d9e2c4a1e9068a5c48faf5c8903c0c37b1c90766dad4c19fb71d7cb24ff90475928be0d86b012cf74f99c52ab9982 WHIRLPOOL 4eaacb5c21e59def870a074567c1d876671e78d85f5f07144ba64b581825a724c0843fe9d56b256c515aff3b13a25e96dbda5001bde0eb1e12e087e9bc4fca5c MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e diff --git a/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch new file mode 100644 index 000000000000..d7479598837b --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch @@ -0,0 +1,230 @@ +diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml +--- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 ++++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 +@@ -703,24 +703,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + ++ + + ++ + + + +- ++ + + + +@@ -1059,7 +1064,7 @@ + + + +- ++ + + + +@@ -1093,7 +1098,7 @@ + + + +- ++ + + + + + +- ++ + + + + ++ + +@@ -1519,7 +1525,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1658,7 +1664,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -2703,7 +2709,7 @@ + + + ++ description="Download (and build) components necessary to compile" unless="noget"> + + + +@@ -2746,7 +2752,7 @@ + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2792,7 +2798,7 @@ + + + ++ description="Download additional components for a distribution" unless="noget"> + + + +@@ -2818,18 +2824,18 @@ + + + +- ++ + + + + +- ++ + + + + +- ++ + + + +@@ -2841,7 +2847,7 @@ + + + +- ++ + + + +@@ -2860,7 +2866,7 @@ + + + +- ++ + + + +@@ -2871,7 +2877,7 @@ + + + +- ++ + + + +@@ -2889,7 +2895,7 @@ + + + +- ++ + + + +@@ -2899,7 +2905,7 @@ + + + +- ++ + + + +@@ -2922,7 +2928,7 @@ + + + +- ++ + + + +@@ -2933,7 +2939,7 @@ + + + +- ++ + + + +@@ -2944,7 +2950,7 @@ + + ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + + diff --git a/www-servers/tomcat/tomcat-8.0.18.ebuild b/www-servers/tomcat/tomcat-8.0.18.ebuild new file mode 100644 index 000000000000..521759c41765 --- /dev/null +++ b/www-servers/tomcat/tomcat-8.0.18.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.18.ebuild,v 1.1 2015/02/20 07:25:43 fordfrog Exp $ + +EAPI=4 + +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/tomcat-servlet-api-${PV} + extra-webapps? ( dev-java/jakarta-jstl:0 )" +RDEPEND="${COMMON_DEP} + !=virtual/jre-1.7" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.7 + >=dev-java/ant-core-1.8.1:0 + test? ( + dev-java/ant-junit:0 + dev-java/junit:4 + )" + +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 -exec rm -frv {} + || 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="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revision of the instance-manager script +IM_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" + +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 + + # so we don't have to call java-config with --with-dependencies, which might + # bring in more jars then actually desired. + java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" + + 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 ### + + # 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 + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + doexe "${T}"/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 http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." +} -- 2.26.2