1 |
commit: 22b70e84781051a8bd99cd28e3ef630907b5fd7e |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 12 08:36:11 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 12 08:36:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b70e84 |
7 |
|
8 |
www-servers/tomcat-8.5.38: bump |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 1 + |
14 |
www-servers/tomcat/tomcat-8.5.38.ebuild | 159 ++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 160 insertions(+) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index fccc93a948a..450ac453a0e 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -3,6 +3,7 @@ DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d |
22 |
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e |
23 |
DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33 |
24 |
DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec |
25 |
+DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee |
26 |
DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6 |
27 |
DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce |
28 |
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 |
29 |
|
30 |
diff --git a/www-servers/tomcat/tomcat-8.5.38.ebuild b/www-servers/tomcat/tomcat-8.5.38.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..19c5ce31a3e |
33 |
--- /dev/null |
34 |
+++ b/www-servers/tomcat/tomcat-8.5.38.ebuild |
35 |
@@ -0,0 +1,159 @@ |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+ |
41 |
+JAVA_PKG_IUSE="doc source test" |
42 |
+ |
43 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
44 |
+ |
45 |
+MY_P="apache-${P}-src" |
46 |
+ |
47 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
48 |
+HOMEPAGE="https://tomcat.apache.org/" |
49 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
50 |
+ |
51 |
+LICENSE="Apache-2.0" |
52 |
+SLOT="8.5" |
53 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
54 |
+IUSE="extra-webapps" |
55 |
+ |
56 |
+RESTRICT="test" # can we run them on a production system? |
57 |
+ |
58 |
+ECJ_SLOT="4.5" |
59 |
+SAPI_SLOT="3.1" |
60 |
+ |
61 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
62 |
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
63 |
+RDEPEND="${COMMON_DEP} |
64 |
+ !<dev-java/tomcat-native-1.1.24 |
65 |
+ >=virtual/jre-1.7" |
66 |
+DEPEND="${COMMON_DEP} |
67 |
+ app-admin/pwgen |
68 |
+ >=dev-java/ant-core-1.9.13 |
69 |
+ >=virtual/jdk-1.7 |
70 |
+ test? ( |
71 |
+ >=dev-java/ant-junit-1.9:0 |
72 |
+ dev-java/easymock:3.2 |
73 |
+ )" |
74 |
+ |
75 |
+S=${WORKDIR}/${MY_P} |
76 |
+ |
77 |
+pkg_setup() { |
78 |
+ java-pkg-2_pkg_setup |
79 |
+ enewgroup tomcat 265 |
80 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
81 |
+} |
82 |
+ |
83 |
+src_prepare() { |
84 |
+ default |
85 |
+ |
86 |
+ find -name '*.jar' -type f -delete -print || die |
87 |
+ |
88 |
+ # Remove bundled servlet-api |
89 |
+ rm -rv java/javax/{el,servlet} || die |
90 |
+ |
91 |
+ eapply "${FILESDIR}/${PN}-8.5.37-build.xml.patch" |
92 |
+ |
93 |
+ # For use of catalina.sh in netbeans |
94 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
95 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
96 |
+ bin/catalina.sh || die |
97 |
+ |
98 |
+ java-pkg-2_src_prepare |
99 |
+} |
100 |
+ |
101 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
102 |
+ |
103 |
+EANT_BUILD_TARGET="deploy" |
104 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
105 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
106 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
107 |
+EANT_NEEDS_TOOLS="true" |
108 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
109 |
+ |
110 |
+# revisions of the scripts |
111 |
+IM_REV="-r2" |
112 |
+INIT_REV="-r1" |
113 |
+ |
114 |
+src_compile() { |
115 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
116 |
+ java-pkg-2_src_compile |
117 |
+} |
118 |
+ |
119 |
+src_test() { |
120 |
+ java-pkg-2_src_test |
121 |
+} |
122 |
+ |
123 |
+src_install() { |
124 |
+ local dest="/usr/share/${PN}-${SLOT}" |
125 |
+ |
126 |
+ java-pkg_jarinto "${dest}"/bin |
127 |
+ java-pkg_dojar output/build/bin/*.jar |
128 |
+ exeinto "${dest}"/bin |
129 |
+ doexe output/build/bin/*.sh |
130 |
+ |
131 |
+ java-pkg_jarinto "${dest}"/lib |
132 |
+ java-pkg_dojar output/build/lib/*.jar |
133 |
+ |
134 |
+ dodoc RELEASE-NOTES RUNNING.txt |
135 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
136 |
+ use source && java-pkg_dosrc java/* |
137 |
+ |
138 |
+ ### Webapps ### |
139 |
+ |
140 |
+ # add missing docBase |
141 |
+ local apps="host-manager manager" |
142 |
+ for app in ${apps}; do |
143 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
144 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
145 |
+ done |
146 |
+ |
147 |
+ insinto "${dest}"/webapps |
148 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
149 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
150 |
+ |
151 |
+ ### Config ### |
152 |
+ |
153 |
+ # create "logs" directory in $CATALINA_BASE |
154 |
+ # and set correct perms, see #458890 |
155 |
+ dodir "${dest}"/logs |
156 |
+ fperms 0750 "${dest}"/logs |
157 |
+ |
158 |
+ # replace the default pw with a random one, see #92281 |
159 |
+ local randpw="$(pwgen -s -B 15 1)" |
160 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
161 |
+ |
162 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
163 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
164 |
+ |
165 |
+ insinto "${dest}" |
166 |
+ doins -r output/build/conf |
167 |
+ |
168 |
+ ### rc ### |
169 |
+ |
170 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
171 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
172 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
173 |
+ |
174 |
+ insinto "${dest}"/gentoo |
175 |
+ doins "${T}"/tomcat.conf |
176 |
+ exeinto "${dest}"/gentoo |
177 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
178 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
179 |
+} |
180 |
+ |
181 |
+pkg_postinst() { |
182 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
183 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
184 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
185 |
+ |
186 |
+ elog "To manage Tomcat instances, run:" |
187 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
188 |
+ |
189 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
190 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
191 |
+ |
192 |
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
193 |
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
194 |
+} |