diff options
18 files changed, 275 insertions, 1350 deletions
diff --git a/dev-db/repmgr/metadata.xml b/dev-db/repmgr/metadata.xml index ed88a4488c95..48b021f0c8f6 100644 --- a/dev-db/repmgr/metadata.xml +++ b/dev-db/repmgr/metadata.xml @@ -5,7 +5,7 @@ <email>robbat2@gentoo.org</email> </maintainer> <maintainer> - <email>betelguese@gentoo.org</email> + <email>betelgeuse@gentoo.org</email> </maintainer> <use> </use> diff --git a/dev-python/edpwd/metadata.xml b/dev-python/edpwd/metadata.xml index b445c930e02c..73198ca55646 100644 --- a/dev-python/edpwd/metadata.xml +++ b/dev-python/edpwd/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>tampakrap@gmail.com</email> + <email>tampakrap@gentoo.org</email> <name>Theo Chatzimichos</name> </maintainer> <upstream> diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml index 1ef6ae53cee8..bf0534930eac 100644 --- a/dev-python/pylast/metadata.xml +++ b/dev-python/pylast/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>idella4gentoo.org</email> + <email>idella4@gentoo.org</email> <name>Ian Delaney</name> </maintainer> <longdescription lang="en"> diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml index 72c026130307..2920253981cc 100644 --- a/dev-util/qstlink2/metadata.xml +++ b/dev-util/qstlink2/metadata.xml @@ -6,9 +6,6 @@ <email>no111u3@gmail.com</email> <name>Boris Vinogradov</name> </maintainer> - <maintainer> - <email>@gentoo.org</email> - </maintainer> <longdescription> This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows. diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml index 52072ceeff07..ce992e4c1c9e 100644 --- a/kde-misc/kcm-grub2/metadata.xml +++ b/kde-misc/kcm-grub2/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>kde</herd> <maintainer> - <email>thevoodoo@gentoo.org</email> + <email>thev00d00@gentoo.org</email> <name>Ian Whyman</name> </maintainer> <use> diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest index edc713672d60..e5a2278089cf 100644 --- a/sys-kernel/hardened-sources/Manifest +++ b/sys-kernel/hardened-sources/Manifest @@ -5,9 +5,6 @@ DIST deblob-check-4.2 681496 SHA256 8b72723b3f5c651ba45017f557372dd25a43a1ce1b9b DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6 DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1 -DIST hardened-patches-4.2.3-4.extras.tar.bz2 1464525 SHA256 476824e9cf3bab15d52b522569b70aa6eb9819120eb098fbd164e6fc54d2227c SHA512 ac7e67165ff6d1711927268f36a0ce2d5f65099a67b38491cb28f19f306c87c2412eed5db202500d633a21ca6c530ea7c9e14fa4d690dbbfd39db3d802860a35 WHIRLPOOL 0fabf287f54293832bb1d60b72d9adaa5c61c78655d8e6944b9e76e337966bdbe957643f94e0ef6bc45f46fec9b55deddfbc905a951097d2c8362be3e205b7f7 -DIST hardened-patches-4.2.3-7.extras.tar.bz2 1614579 SHA256 b458ab1d642052d93bf95e603757e862b471e0cd6f85ca805ba154a305be8bd8 SHA512 c5a4fc722d1aea57d8b67729881825e4537815475eb1d3dde46edd0159e53c83e0f0dced6245ff877f55980cd599c155fd6475ae5333e21a3d2229ef0dec4116 WHIRLPOOL 815abd3267b1f02e053cb9eec1d6da5b11435398e08a516f8be3e253916ebb7011669bd8436bbd5dcf885b77c606293a1f0c9dda8c54f0a0f712a357f36cada1 -DIST hardened-patches-4.2.4-1.extras.tar.bz2 1694154 SHA256 38353677c3bd46c513996cf79a8f3fe6adbe7a931e29923fda80c0e06bbb51f9 SHA512 2036d72c6f2f2e63beaa4ac580e5d564b4fe68d3527758dc27f729a20ef21f4d2a40711623f15685956d7d105499f185f7cf31e60c778d7aa70e16c976f8beb1 WHIRLPOOL 325370b7fa5c1787bd7385b3f1340c924f6065037c0a4d42c91b26f4ae3f6c7be3bad341b299501b49a9cfaf09db0d3e05c936ff3ed936dfde2416de0c657e5f DIST hardened-patches-4.2.4-2.extras.tar.bz2 1695534 SHA256 a88011fdfa2b48cbfdf27ca5e4af61cc56e9328169c4dbf214c1e8be42581683 SHA512 fe5f753b3ad4da928d01bc73d3f8a68b1dd276206b1f1f42a811d308e18db61c920ed95b9b5164201e4d739bdf024b6bdd526775fb9a0b429baf7616d6636e87 WHIRLPOOL a61bcefc0cc9dc23cdc35e8770b110d4135f52955e33fcbb03caeaa76952d11d30ce7fe26efc4010faf63518469e20c391ea8980befc91ad2dce33f496feb1eb DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild deleted file mode 100644 index 821789304a1e..000000000000 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 -detect_version - -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4" -HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" -SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" -UNIPATCH_EXCLUDE=" - 1500_XATTR_USER_PREFIX.patch - 2900_dev-root-proc-mount-fix.patch" - -DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" -IUSE="deblob" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=sys-devel/gcc-4.5" - -pkg_postinst() { - kernel-2_pkg_postinst - - local GRADM_COMPAT="sys-apps/gradm-3.1*" - - ewarn - ewarn "Users of grsecurity's RBAC system must ensure they are using" - ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." - ewarn "It is strongly recommended that the following command is issued" - ewarn "prior to booting a ${PF} kernel for the first time:" - ewarn - ewarn "emerge -na =${GRADM_COMPAT}" - ewarn -} diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild deleted file mode 100644 index 8406cf796098..000000000000 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 -detect_version - -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7" -HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" -SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" -UNIPATCH_EXCLUDE=" - 1500_XATTR_USER_PREFIX.patch - 2900_dev-root-proc-mount-fix.patch" - -DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" -IUSE="deblob" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=sys-devel/gcc-4.5" - -pkg_postinst() { - kernel-2_pkg_postinst - - local GRADM_COMPAT="sys-apps/gradm-3.1*" - - ewarn - ewarn "Users of grsecurity's RBAC system must ensure they are using" - ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." - ewarn "It is strongly recommended that the following command is issued" - ewarn "prior to booting a ${PF} kernel for the first time:" - ewarn - ewarn "emerge -na =${GRADM_COMPAT}" - ewarn -} diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.4.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.4.ebuild deleted file mode 100644 index bf12ce9c792b..000000000000 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 -detect_version - -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1" -HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" -SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" -UNIPATCH_EXCLUDE=" - 1500_XATTR_USER_PREFIX.patch - 1600_dm-crypt-limit-max-segment-size.patch - 2900_dev-root-proc-mount-fix.patch" - -DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" -IUSE="deblob" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=sys-devel/gcc-4.5" - -pkg_postinst() { - kernel-2_pkg_postinst - - local GRADM_COMPAT="sys-apps/gradm-3.1*" - - ewarn - ewarn "Users of grsecurity's RBAC system must ensure they are using" - ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." - ewarn "It is strongly recommended that the following command is issued" - ewarn "prior to booting a ${PF} kernel for the first time:" - ewarn - ewarn "emerge -na =${GRADM_COMPAT}" - ewarn -} diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index af697ab74e29..6e88e73ed43d 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,7 +2,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51 DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d -DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc -DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch deleted file mode 100644 index 481591fb6ff5..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch +++ /dev/null @@ -1,149 +0,0 @@ -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}"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch deleted file mode 100644 index d7479598837b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch +++ /dev/null @@ -1,230 +0,0 @@ -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" /> - - <!-- Servlet 3.1 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.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -992,14 +997,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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"> - <fileset dir="bin"> -@@ -1059,7 +1064,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1093,7 +1098,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- 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}" -@@ -1108,7 +1113,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1212,10 +1217,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1519,7 +1525,7 @@ - - <target name="extras-commons-logging-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-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1658,7 +1664,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}"/> -@@ -2703,7 +2709,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}"/> -@@ -2746,7 +2752,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}"/> -@@ -2792,7 +2798,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}"/> -@@ -2818,18 +2824,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2841,7 +2847,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2860,7 +2866,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2871,7 +2877,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2889,7 +2895,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2899,7 +2905,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2922,7 +2928,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2933,7 +2939,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2944,7 +2950,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch deleted file mode 100644 index 1923d23ba50b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch +++ /dev/null @@ -1,265 +0,0 @@ -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" /> - - <!-- Servlet 3.1 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.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -982,14 +987,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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"> - <fileset dir="bin"> -@@ -1049,7 +1054,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1083,7 +1088,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- 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}" -@@ -1098,7 +1103,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1202,10 +1207,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1542,7 +1548,7 @@ - - <target name="extras-commons-logging-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-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1681,7 +1687,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}"/> -@@ -1882,6 +1888,7 @@ - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1940,6 +1947,7 @@ - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1970,15 +1978,17 @@ - docencoding="UTF-8" - charset="UTF-8" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" > -+ maxmemory="512m" > - <classpath> - <path refid="compile.classpath"/> - <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/"/> -@@ -2739,7 +2749,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}"/> -@@ -2773,7 +2783,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}"/> -@@ -2819,7 +2829,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}"/> -@@ -2845,18 +2855,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2868,7 +2878,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2887,7 +2897,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2898,7 +2908,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2916,7 +2926,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2926,7 +2936,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2949,7 +2959,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2960,7 +2970,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2971,7 +2981,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch deleted file mode 100644 index 1923d23ba50b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch +++ /dev/null @@ -1,265 +0,0 @@ -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" /> - - <!-- Servlet 3.1 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.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -982,14 +987,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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"> - <fileset dir="bin"> -@@ -1049,7 +1054,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1083,7 +1088,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- 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}" -@@ -1098,7 +1103,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1202,10 +1207,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1542,7 +1548,7 @@ - - <target name="extras-commons-logging-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-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1681,7 +1687,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}"/> -@@ -1882,6 +1888,7 @@ - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1940,6 +1947,7 @@ - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1970,15 +1978,17 @@ - docencoding="UTF-8" - charset="UTF-8" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" > -+ maxmemory="512m" > - <classpath> - <path refid="compile.classpath"/> - <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/"/> -@@ -2739,7 +2749,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}"/> -@@ -2773,7 +2783,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}"/> -@@ -2819,7 +2829,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}"/> -@@ -2845,18 +2855,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2868,7 +2878,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2887,7 +2897,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2898,7 +2908,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2916,7 +2926,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2926,7 +2936,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2949,7 +2959,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2960,7 +2970,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2971,7 +2981,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r2.bash b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash new file mode 100644 index 000000000000..b3b1a0221bc3 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash @@ -0,0 +1,270 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Author: Ralph Sennhauser <sera@gentoo.org> + +die() { + echo "${@}" + exit 1 +} + +dir_is_empty() { + # usage: + # dir_is_empty <some-dir> + # + # returns 2 if the dir does not even exist + # returns 1 if the dir is not empty + # returns 0 (success) if the dir exists and is empty + + local dir=$1 + local files + + if [[ ! -e ${dir} ]] ; then + return 2 + fi + + shopt -s nullglob dotglob # To include hidden files + files=( "${dir}"/* ) + shopt -u nullglob dotglob + + if [[ ${#files[@]} -eq 0 ]]; then + return 0 + else + return 1 + fi + +} + +usage() { + cat <<EOL +Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g] + + Options: + --help: + show this text. + --create: + create a new instance + --remove: + remove an existing instance. + --suffix SUFFIX: + a suffix for this instance. the suffix may not collide with an already + existing instance, defaults to empty. + --user USER: + the user for which to configure this instance for. The user needs to + exist already. defaults to tomcat. + --group GROUP: + the group for which to configure this instance for. The group needs to + exist already. defaults to tomcat. + + Examples: + ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot + ${BASH_SOURCE} --remove --suffix testing +EOL +} + +parse_argv() { + action="not specified" + instance_name="tomcat-@SLOT@" + instance_user="tomcat" + instance_group="tomcat" + + while [[ -n $1 ]]; do + case $1 in + --help) + usage + exit 0;; + --suffix) + instance_name+="-$2" + shift; shift;; + --user) + instance_user="$2" + shift; shift;; + --group) + instance_group="$2" + shift; shift;; + --create) + action=create + shift;; + --remove) + action=remove + shift;; + --backup) + action=backup + shift;; + --restore) + action=restore + shift;; + --update) + action=update + shift;; + *) + echo "Invalid option '$1'" + usage + exit 2;; + esac + done + + tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@" + instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}" + instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" + instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}" + instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}" + + all_targets=( + "${instance_base}" + "${instance_logs}" + "${instance_temp}" + "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" + "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" + "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" + ) +} + +test_can_deploy() { + local no_deploy target + for target in "${all_targets[@]}"; do + if [[ -e "${target}" ]]; then + if ! dir_is_empty "${target}" ; then + echo "Error: '${target}' already exists and is not empty." + no_deploy=yes + fi + fi + done + if [[ -n "${no_deploy}" ]]; then + cat <<-EOL + + To protect an existing installation no new instance was deployed. You can use + '${BASH_SOURCE} --remove' + to remove an existing instance first or run + '${BASH_SOURCE} --create --sufix <instance_suffix>' + to deploy an instance under a different name + + EOL + usage + exit 1 + fi + + if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then + echo "Error: user '${instance_user}' doesn't exist." + exit 1 + fi + + if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then + echo "Error: group '${instance_group}' doesn't exist." + exit 1 + fi +} + +deploy_instance() { + test_can_deploy + + mkdir -p "${instance_base}"/{work,webapps} || die + mkdir -p "${instance_logs}" || die + mkdir -p "${instance_temp}" || die + mkdir -p "${instance_conf}" || die + + cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die + + chown -R "${instance_user}":"${instance_group}" \ + "${instance_base}" "${instance_logs}" "${instance_temp}" || die + + find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die + find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die + + # initial config # + + cp -r "${tomcat_home}"/conf/* "${instance_conf}"/ || die + + sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \ + "${instance_conf}"/logging.properties || die + sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \ + "${instance_conf}"/server.xml || die + + mkdir -p "${instance_conf}"/Catalina/localhost || die + cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/host-manager" + antiResourceLocking="false" privileged="true" /> + EOF + + cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/manager" + antiResourceLocking="false" privileged="true" /> + EOF + + if [[ -d "${tomcat_home}"/webapps/docs ]]; then + cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/docs" /> + EOF + fi + + if [[ -d "${tomcat_home}"/webapps/examples ]]; then + cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/examples" /> + EOF + fi + + chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die + find "${instance_conf}" -type d -exec chmod 750 {} + || die + find "${instance_conf}" -type f -exec chmod 640 {} + || die + + # rc script # + + cp "${tomcat_home}"/gentoo/tomcat.init \ + "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die + + sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \ + -e "s|@INSTANCE_USER@|${instance_user}|g" \ + -e "s|@INSTANCE_GROUP@|${instance_group}|g" \ + "${tomcat_home}"/gentoo/tomcat.conf \ + > "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die + + # some symlinks for tomcat and netbeans # + + ln -s "${instance_conf}" "${instance_base}"/conf || die + ln -s "${instance_temp}" "${instance_base}"/temp || die + + # a note to update the default configuration # + + cat <<-EOL + Successfully created instance '${instance_name}' + It's strongly recommended for production systems to go carefully through the + configuration files at '${instance_conf}'. + The generated initial configuration is close to upstreams default which + favours the demo aspect over hardening. + EOL +} + +remove_instance() { + echo "The following files will be removed permanently:" + local target; for target in "${all_targets[@]}"; do + find ${target} + done + + echo "Type 'yes' to continue" + read + if [[ ${REPLY} == yes ]]; then + rm -rv "${all_targets[@]}" + else + echo "Aborting as requested ..." + fi +} + +parse_argv "$@" + +if [[ ${action} == create ]]; then + deploy_instance +elif [[ ${action} == remove ]]; then + remove_instance +elif [[ ${action} == "not specified" ]]; then + echo "No action specified!" + usage + exit 1 +else + echo "${action} not yet implemented!" + usage + exit 1 +fi diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild deleted file mode 100644 index 763649776bee..000000000000 --- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# 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/tomcat-servlet-api:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !<dev-java/tomcat-native-1.1.24 - >=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 -delete -print || 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_dohtml -r 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 - - 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 https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." -} diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild index 3074dfa43e93..a06fb32f8105 100644 --- a/www-servers/tomcat/tomcat-8.0.27.ebuild +++ b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild @@ -69,7 +69,7 @@ EANT_NEEDS_TOOLS="true" EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" # revisions of the scripts -IM_REV="-r1" +IM_REV="-r2" INIT_REV="-r1" src_compile() { diff --git a/www-servers/tomcat/tomcat-8.0.28.ebuild b/www-servers/tomcat/tomcat-8.0.28.ebuild deleted file mode 100644 index 3074dfa43e93..000000000000 --- a/www-servers/tomcat/tomcat-8.0.28.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# 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} - !<dev-java/tomcat-native-1.1.24 - >=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." -} |