1 |
commit: a50a82307a43905f0f663dfa0c3e7e024c875dac |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 14 16:23:21 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 14 16:24:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50a8230 |
7 |
|
8 |
www-servers/tomcat: removed security affected versions |
9 |
|
10 |
Bug: https://bugs.gentoo.org/818160 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
www-servers/tomcat/Manifest | 5 - |
15 |
www-servers/tomcat/tomcat-10.0.10.ebuild | 192 ------------------------------- |
16 |
www-servers/tomcat/tomcat-10.0.11.ebuild | 192 ------------------------------- |
17 |
www-servers/tomcat/tomcat-8.5.71.ebuild | 159 ------------------------- |
18 |
www-servers/tomcat/tomcat-9.0.52.ebuild | 187 ------------------------------ |
19 |
www-servers/tomcat/tomcat-9.0.53.ebuild | 187 ------------------------------ |
20 |
6 files changed, 922 deletions(-) |
21 |
|
22 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
23 |
index 9029a01d003..468e90ceb9d 100644 |
24 |
--- a/www-servers/tomcat/Manifest |
25 |
+++ b/www-servers/tomcat/Manifest |
26 |
@@ -1,12 +1,7 @@ |
27 |
-DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658 |
28 |
-DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f SHA512 c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b |
29 |
DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b |
30 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
31 |
DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133 |
32 |
-DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba |
33 |
DIST apache-tomcat-8.5.72-src.tar.gz 5954383 BLAKE2B ddf342e3bb604ffd5d70e9b822a110654434aac0da0bd28e8649a0ce312706c202f48077ee18f43398d91bc000ea5287d87e0fd2bda9d2c8493e1b6b012945fc SHA512 69c27076d193a874416c83a1dcb80f71af78cb201b0990795d389f0a389e0537749b62256408c6249031abd2e62f268c8b451328284dbbff50a457937cfa6f6d |
34 |
-DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d |
35 |
-DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26 SHA512 f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 |
36 |
DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b |
37 |
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
38 |
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b |
39 |
|
40 |
diff --git a/www-servers/tomcat/tomcat-10.0.10.ebuild b/www-servers/tomcat/tomcat-10.0.10.ebuild |
41 |
deleted file mode 100644 |
42 |
index 0b16b403fb0..00000000000 |
43 |
--- a/www-servers/tomcat/tomcat-10.0.10.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,192 +0,0 @@ |
46 |
-# Copyright 1999-2021 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=7 |
50 |
- |
51 |
-JAVA_PKG_IUSE="doc source test" |
52 |
- |
53 |
-inherit java-pkg-2 java-ant-2 prefix |
54 |
- |
55 |
-MY_P="apache-${PN}-${PV}-src" |
56 |
- |
57 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
58 |
-# See bugs #203080 and #676116 |
59 |
-BND_VERSION="5.1.1" |
60 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
61 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
62 |
- |
63 |
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
64 |
-HOMEPAGE="https://tomcat.apache.org/" |
65 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
66 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
67 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
68 |
- |
69 |
-LICENSE="Apache-2.0" |
70 |
-SLOT="10" |
71 |
-KEYWORDS="~amd64 ~amd64-linux" |
72 |
-IUSE="extra-webapps" |
73 |
- |
74 |
-RESTRICT="test" # can we run them on a production system? |
75 |
- |
76 |
-ECJ_SLOT="4.15" |
77 |
-SAPI_SLOT="5.0" |
78 |
- |
79 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
80 |
- dev-java/glassfish-xmlrpc-api:0 |
81 |
- dev-java/jakartaee-migration:0 |
82 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
83 |
- dev-java/wsdl4j:0" |
84 |
-RDEPEND="${COMMON_DEP} |
85 |
- acct-group/tomcat |
86 |
- acct-user/tomcat |
87 |
- virtual/jre" |
88 |
-DEPEND="${COMMON_DEP} |
89 |
- app-admin/pwgen |
90 |
- dev-java/ant-core |
91 |
- virtual/jdk:1.8 |
92 |
- test? ( |
93 |
- dev-java/ant-junit:0 |
94 |
- dev-java/easymock:3.2 |
95 |
- )" |
96 |
- |
97 |
-S=${WORKDIR}/${MY_P} |
98 |
- |
99 |
-PATCHES=( |
100 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
101 |
-) |
102 |
- |
103 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
104 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
105 |
-BND_JAR="${BND_HOME}/${BND}" |
106 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
107 |
- |
108 |
-src_unpack() { |
109 |
- unpack ${MY_P}.tar.gz |
110 |
- |
111 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
112 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
113 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
114 |
-} |
115 |
- |
116 |
-src_prepare() { |
117 |
- default |
118 |
- |
119 |
- find -name '*.jar' -type f -delete -print || die |
120 |
- |
121 |
- # Remove bundled servlet-api |
122 |
- rm -rv java/jakarta/{el,servlet} || die |
123 |
- |
124 |
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch" |
125 |
- |
126 |
- # For use of catalina.sh in netbeans |
127 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
128 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
129 |
- bin/catalina.sh || die |
130 |
- |
131 |
- java-pkg-2_src_prepare |
132 |
-} |
133 |
- |
134 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
135 |
- |
136 |
-EANT_BUILD_TARGET="deploy" |
137 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
138 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
139 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
140 |
-EANT_NEEDS_TOOLS="true" |
141 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
142 |
- |
143 |
-# revisions of the scripts |
144 |
-IM_REV="-r2" |
145 |
-INIT_REV="-r1" |
146 |
- |
147 |
-src_configure() { |
148 |
- java-ant-2_src_configure |
149 |
- |
150 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
151 |
-} |
152 |
- |
153 |
-src_compile() { |
154 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
155 |
- LC_ALL=C java-pkg-2_src_compile |
156 |
-} |
157 |
- |
158 |
-src_test() { |
159 |
- java-pkg-2_src_test |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- local dest="/usr/share/${PN}-${SLOT}" |
164 |
- |
165 |
- java-pkg_jarinto "${dest}"/bin |
166 |
- java-pkg_dojar output/build/bin/*.jar |
167 |
- exeinto "${dest}"/bin |
168 |
- doexe output/build/bin/*.sh |
169 |
- |
170 |
- java-pkg_jarinto "${dest}"/lib |
171 |
- java-pkg_dojar output/build/lib/*.jar |
172 |
- |
173 |
- dodoc RELEASE-NOTES RUNNING.txt |
174 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
175 |
- use source && java-pkg_dosrc java/* |
176 |
- |
177 |
- ### Webapps ### |
178 |
- |
179 |
- # add missing docBase |
180 |
- local apps="host-manager manager" |
181 |
- for app in ${apps}; do |
182 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
183 |
- output/build/webapps/${app}/META-INF/context.xml || die |
184 |
- done |
185 |
- |
186 |
- insinto "${dest}"/webapps |
187 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
188 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
189 |
- |
190 |
- ### Config ### |
191 |
- |
192 |
- # create "logs" directory in $CATALINA_BASE |
193 |
- # and set correct perms, see #458890 |
194 |
- dodir "${dest}"/logs |
195 |
- fperms 0750 "${dest}"/logs |
196 |
- |
197 |
- # replace the default pw with a random one, see #92281 |
198 |
- local randpw="$(pwgen -s -B 15 1)" |
199 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
200 |
- |
201 |
- # prepend gentoo.classpath to common.loader, see #453212 |
202 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
203 |
- |
204 |
- insinto "${dest}" |
205 |
- doins -r output/build/conf |
206 |
- |
207 |
- ### rc ### |
208 |
- |
209 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
210 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
211 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
212 |
- |
213 |
- insinto "${dest}"/gentoo |
214 |
- doins "${T}"/tomcat.conf |
215 |
- exeinto "${dest}"/gentoo |
216 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
217 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
218 |
-} |
219 |
- |
220 |
-pkg_postinst() { |
221 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
222 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
223 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
224 |
- |
225 |
- elog "To manage Tomcat instances, run:" |
226 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
227 |
- |
228 |
- ewarn "Please note that since version 10 the primary package for all implemented APIs" |
229 |
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
230 |
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
231 |
- |
232 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
233 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
234 |
- |
235 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
236 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
237 |
-} |
238 |
|
239 |
diff --git a/www-servers/tomcat/tomcat-10.0.11.ebuild b/www-servers/tomcat/tomcat-10.0.11.ebuild |
240 |
deleted file mode 100644 |
241 |
index 0b16b403fb0..00000000000 |
242 |
--- a/www-servers/tomcat/tomcat-10.0.11.ebuild |
243 |
+++ /dev/null |
244 |
@@ -1,192 +0,0 @@ |
245 |
-# Copyright 1999-2021 Gentoo Authors |
246 |
-# Distributed under the terms of the GNU General Public License v2 |
247 |
- |
248 |
-EAPI=7 |
249 |
- |
250 |
-JAVA_PKG_IUSE="doc source test" |
251 |
- |
252 |
-inherit java-pkg-2 java-ant-2 prefix |
253 |
- |
254 |
-MY_P="apache-${PN}-${PV}-src" |
255 |
- |
256 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
257 |
-# See bugs #203080 and #676116 |
258 |
-BND_VERSION="5.1.1" |
259 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
260 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
261 |
- |
262 |
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
263 |
-HOMEPAGE="https://tomcat.apache.org/" |
264 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
265 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
266 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
267 |
- |
268 |
-LICENSE="Apache-2.0" |
269 |
-SLOT="10" |
270 |
-KEYWORDS="~amd64 ~amd64-linux" |
271 |
-IUSE="extra-webapps" |
272 |
- |
273 |
-RESTRICT="test" # can we run them on a production system? |
274 |
- |
275 |
-ECJ_SLOT="4.15" |
276 |
-SAPI_SLOT="5.0" |
277 |
- |
278 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
279 |
- dev-java/glassfish-xmlrpc-api:0 |
280 |
- dev-java/jakartaee-migration:0 |
281 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
282 |
- dev-java/wsdl4j:0" |
283 |
-RDEPEND="${COMMON_DEP} |
284 |
- acct-group/tomcat |
285 |
- acct-user/tomcat |
286 |
- virtual/jre" |
287 |
-DEPEND="${COMMON_DEP} |
288 |
- app-admin/pwgen |
289 |
- dev-java/ant-core |
290 |
- virtual/jdk:1.8 |
291 |
- test? ( |
292 |
- dev-java/ant-junit:0 |
293 |
- dev-java/easymock:3.2 |
294 |
- )" |
295 |
- |
296 |
-S=${WORKDIR}/${MY_P} |
297 |
- |
298 |
-PATCHES=( |
299 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
300 |
-) |
301 |
- |
302 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
303 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
304 |
-BND_JAR="${BND_HOME}/${BND}" |
305 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
306 |
- |
307 |
-src_unpack() { |
308 |
- unpack ${MY_P}.tar.gz |
309 |
- |
310 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
311 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
312 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
313 |
-} |
314 |
- |
315 |
-src_prepare() { |
316 |
- default |
317 |
- |
318 |
- find -name '*.jar' -type f -delete -print || die |
319 |
- |
320 |
- # Remove bundled servlet-api |
321 |
- rm -rv java/jakarta/{el,servlet} || die |
322 |
- |
323 |
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch" |
324 |
- |
325 |
- # For use of catalina.sh in netbeans |
326 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
327 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
328 |
- bin/catalina.sh || die |
329 |
- |
330 |
- java-pkg-2_src_prepare |
331 |
-} |
332 |
- |
333 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
334 |
- |
335 |
-EANT_BUILD_TARGET="deploy" |
336 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
337 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
338 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
339 |
-EANT_NEEDS_TOOLS="true" |
340 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
341 |
- |
342 |
-# revisions of the scripts |
343 |
-IM_REV="-r2" |
344 |
-INIT_REV="-r1" |
345 |
- |
346 |
-src_configure() { |
347 |
- java-ant-2_src_configure |
348 |
- |
349 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
350 |
-} |
351 |
- |
352 |
-src_compile() { |
353 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
354 |
- LC_ALL=C java-pkg-2_src_compile |
355 |
-} |
356 |
- |
357 |
-src_test() { |
358 |
- java-pkg-2_src_test |
359 |
-} |
360 |
- |
361 |
-src_install() { |
362 |
- local dest="/usr/share/${PN}-${SLOT}" |
363 |
- |
364 |
- java-pkg_jarinto "${dest}"/bin |
365 |
- java-pkg_dojar output/build/bin/*.jar |
366 |
- exeinto "${dest}"/bin |
367 |
- doexe output/build/bin/*.sh |
368 |
- |
369 |
- java-pkg_jarinto "${dest}"/lib |
370 |
- java-pkg_dojar output/build/lib/*.jar |
371 |
- |
372 |
- dodoc RELEASE-NOTES RUNNING.txt |
373 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
374 |
- use source && java-pkg_dosrc java/* |
375 |
- |
376 |
- ### Webapps ### |
377 |
- |
378 |
- # add missing docBase |
379 |
- local apps="host-manager manager" |
380 |
- for app in ${apps}; do |
381 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
382 |
- output/build/webapps/${app}/META-INF/context.xml || die |
383 |
- done |
384 |
- |
385 |
- insinto "${dest}"/webapps |
386 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
387 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
388 |
- |
389 |
- ### Config ### |
390 |
- |
391 |
- # create "logs" directory in $CATALINA_BASE |
392 |
- # and set correct perms, see #458890 |
393 |
- dodir "${dest}"/logs |
394 |
- fperms 0750 "${dest}"/logs |
395 |
- |
396 |
- # replace the default pw with a random one, see #92281 |
397 |
- local randpw="$(pwgen -s -B 15 1)" |
398 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
399 |
- |
400 |
- # prepend gentoo.classpath to common.loader, see #453212 |
401 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
402 |
- |
403 |
- insinto "${dest}" |
404 |
- doins -r output/build/conf |
405 |
- |
406 |
- ### rc ### |
407 |
- |
408 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
409 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
410 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
411 |
- |
412 |
- insinto "${dest}"/gentoo |
413 |
- doins "${T}"/tomcat.conf |
414 |
- exeinto "${dest}"/gentoo |
415 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
416 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
417 |
-} |
418 |
- |
419 |
-pkg_postinst() { |
420 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
421 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
422 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
423 |
- |
424 |
- elog "To manage Tomcat instances, run:" |
425 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
426 |
- |
427 |
- ewarn "Please note that since version 10 the primary package for all implemented APIs" |
428 |
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
429 |
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
430 |
- |
431 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
432 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
433 |
- |
434 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
435 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
436 |
-} |
437 |
|
438 |
diff --git a/www-servers/tomcat/tomcat-8.5.71.ebuild b/www-servers/tomcat/tomcat-8.5.71.ebuild |
439 |
deleted file mode 100644 |
440 |
index ce92130bddc..00000000000 |
441 |
--- a/www-servers/tomcat/tomcat-8.5.71.ebuild |
442 |
+++ /dev/null |
443 |
@@ -1,159 +0,0 @@ |
444 |
-# Copyright 1999-2021 Gentoo Authors |
445 |
-# Distributed under the terms of the GNU General Public License v2 |
446 |
- |
447 |
-EAPI=7 |
448 |
- |
449 |
-JAVA_PKG_IUSE="doc source test" |
450 |
- |
451 |
-inherit java-pkg-2 java-ant-2 prefix |
452 |
- |
453 |
-MY_P="apache-${P}-src" |
454 |
- |
455 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
456 |
-HOMEPAGE="https://tomcat.apache.org/" |
457 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
458 |
- |
459 |
-LICENSE="Apache-2.0" |
460 |
-SLOT="8.5" |
461 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
462 |
-IUSE="extra-webapps" |
463 |
- |
464 |
-RESTRICT="test" # can we run them on a production system? |
465 |
- |
466 |
-ECJ_SLOT="4.5" |
467 |
-SAPI_SLOT="3.1" |
468 |
- |
469 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
470 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
471 |
-RDEPEND="${COMMON_DEP} |
472 |
- acct-group/tomcat |
473 |
- acct-user/tomcat |
474 |
- virtual/jre" |
475 |
-DEPEND="${COMMON_DEP} |
476 |
- app-admin/pwgen |
477 |
- dev-java/ant-core |
478 |
- virtual/jdk:1.8 |
479 |
- doc? ( |
480 |
- dev-java/glassfish-xmlrpc-api:0 |
481 |
- dev-java/wsdl4j:0 |
482 |
- ) |
483 |
- test? ( |
484 |
- >=dev-java/ant-junit-1.9:0 |
485 |
- dev-java/easymock:3.2 |
486 |
- )" |
487 |
- |
488 |
-S=${WORKDIR}/${MY_P} |
489 |
- |
490 |
-src_prepare() { |
491 |
- default |
492 |
- |
493 |
- find -name '*.jar' -type f -delete -print || die |
494 |
- |
495 |
- # Remove bundled servlet-api |
496 |
- rm -rv java/javax/{el,servlet} || die |
497 |
- |
498 |
- eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch" |
499 |
- |
500 |
- # For use of catalina.sh in netbeans |
501 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
502 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
503 |
- bin/catalina.sh || die |
504 |
- |
505 |
- java-pkg-2_src_prepare |
506 |
-} |
507 |
- |
508 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
509 |
- |
510 |
-EANT_BUILD_TARGET="deploy" |
511 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
512 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
513 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
514 |
-EANT_NEEDS_TOOLS="true" |
515 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
516 |
- |
517 |
-# revisions of the scripts |
518 |
-IM_REV="-r2" |
519 |
-INIT_REV="-r1" |
520 |
- |
521 |
-src_compile() { |
522 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
523 |
- use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)" |
524 |
- LC_ALL=C java-pkg-2_src_compile |
525 |
-} |
526 |
- |
527 |
-src_test() { |
528 |
- java-pkg-2_src_test |
529 |
-} |
530 |
- |
531 |
-src_install() { |
532 |
- local dest="/usr/share/${PN}-${SLOT}" |
533 |
- |
534 |
- java-pkg_jarinto "${dest}"/bin |
535 |
- java-pkg_dojar output/build/bin/*.jar |
536 |
- exeinto "${dest}"/bin |
537 |
- doexe output/build/bin/*.sh |
538 |
- |
539 |
- java-pkg_jarinto "${dest}"/lib |
540 |
- java-pkg_dojar output/build/lib/*.jar |
541 |
- |
542 |
- dodoc RELEASE-NOTES RUNNING.txt |
543 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
544 |
- use source && java-pkg_dosrc java/* |
545 |
- |
546 |
- ### Webapps ### |
547 |
- |
548 |
- # add missing docBase |
549 |
- local apps="host-manager manager" |
550 |
- for app in ${apps}; do |
551 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
552 |
- output/build/webapps/${app}/META-INF/context.xml || die |
553 |
- done |
554 |
- |
555 |
- insinto "${dest}"/webapps |
556 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
557 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
558 |
- |
559 |
- ### Config ### |
560 |
- |
561 |
- # create "logs" directory in $CATALINA_BASE |
562 |
- # and set correct perms, see #458890 |
563 |
- dodir "${dest}"/logs |
564 |
- fperms 0750 "${dest}"/logs |
565 |
- |
566 |
- # replace the default pw with a random one, see #92281 |
567 |
- local randpw="$(pwgen -s -B 15 1)" |
568 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
569 |
- |
570 |
- # prepend gentoo.classpath to common.loader, see #453212 |
571 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
572 |
- |
573 |
- insinto "${dest}" |
574 |
- doins -r output/build/conf |
575 |
- |
576 |
- ### rc ### |
577 |
- |
578 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
579 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
580 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
581 |
- |
582 |
- insinto "${dest}"/gentoo |
583 |
- doins "${T}"/tomcat.conf |
584 |
- exeinto "${dest}"/gentoo |
585 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
586 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
587 |
-} |
588 |
- |
589 |
-pkg_postinst() { |
590 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
591 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
592 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
593 |
- |
594 |
- elog "To manage Tomcat instances, run:" |
595 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
596 |
- |
597 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
598 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
599 |
- |
600 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
601 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
602 |
-} |
603 |
|
604 |
diff --git a/www-servers/tomcat/tomcat-9.0.52.ebuild b/www-servers/tomcat/tomcat-9.0.52.ebuild |
605 |
deleted file mode 100644 |
606 |
index 8905e0fad24..00000000000 |
607 |
--- a/www-servers/tomcat/tomcat-9.0.52.ebuild |
608 |
+++ /dev/null |
609 |
@@ -1,187 +0,0 @@ |
610 |
-# Copyright 1999-2021 Gentoo Authors |
611 |
-# Distributed under the terms of the GNU General Public License v2 |
612 |
- |
613 |
-EAPI=7 |
614 |
- |
615 |
-JAVA_PKG_IUSE="doc source test" |
616 |
- |
617 |
-inherit java-pkg-2 java-ant-2 prefix |
618 |
- |
619 |
-MY_P="apache-${PN}-${PV}-src" |
620 |
- |
621 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
622 |
-# See bugs #203080 and #676116 |
623 |
-BND_VERSION="5.1.1" |
624 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
625 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
626 |
- |
627 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
628 |
-HOMEPAGE="https://tomcat.apache.org/" |
629 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
630 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
631 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
632 |
- |
633 |
-LICENSE="Apache-2.0" |
634 |
-SLOT="9" |
635 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
636 |
-IUSE="extra-webapps" |
637 |
- |
638 |
-RESTRICT="test" # can we run them on a production system? |
639 |
- |
640 |
-ECJ_SLOT="4.15" |
641 |
-SAPI_SLOT="4.0" |
642 |
- |
643 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
644 |
- dev-java/glassfish-xmlrpc-api:0 |
645 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
646 |
- dev-java/wsdl4j:0" |
647 |
-RDEPEND="${COMMON_DEP} |
648 |
- acct-group/tomcat |
649 |
- acct-user/tomcat |
650 |
- virtual/jre" |
651 |
-DEPEND="${COMMON_DEP} |
652 |
- app-admin/pwgen |
653 |
- >=dev-java/ant-core-1.9.13 |
654 |
- virtual/jdk:1.8 |
655 |
- test? ( |
656 |
- >=dev-java/ant-junit-1.9:0 |
657 |
- dev-java/easymock:3.2 |
658 |
- )" |
659 |
- |
660 |
-S=${WORKDIR}/${MY_P} |
661 |
- |
662 |
-PATCHES=( |
663 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
664 |
-) |
665 |
- |
666 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
667 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
668 |
-BND_JAR="${BND_HOME}/${BND}" |
669 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
670 |
- |
671 |
-src_unpack() { |
672 |
- unpack ${MY_P}.tar.gz |
673 |
- |
674 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
675 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
676 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
677 |
-} |
678 |
- |
679 |
-src_prepare() { |
680 |
- default |
681 |
- |
682 |
- find -name '*.jar' -type f -delete -print || die |
683 |
- |
684 |
- # Remove bundled servlet-api |
685 |
- rm -rv java/javax/{el,servlet} || die |
686 |
- |
687 |
- eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch" |
688 |
- |
689 |
- # For use of catalina.sh in netbeans |
690 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
691 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
692 |
- bin/catalina.sh || die |
693 |
- |
694 |
- java-pkg-2_src_prepare |
695 |
-} |
696 |
- |
697 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
698 |
- |
699 |
-EANT_BUILD_TARGET="deploy" |
700 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
701 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
702 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
703 |
-EANT_NEEDS_TOOLS="true" |
704 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
705 |
- |
706 |
-# revisions of the scripts |
707 |
-IM_REV="-r2" |
708 |
-INIT_REV="-r1" |
709 |
- |
710 |
-src_configure() { |
711 |
- java-ant-2_src_configure |
712 |
- |
713 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
714 |
-} |
715 |
- |
716 |
-src_compile() { |
717 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
718 |
- LC_ALL=C java-pkg-2_src_compile |
719 |
-} |
720 |
- |
721 |
-src_test() { |
722 |
- java-pkg-2_src_test |
723 |
-} |
724 |
- |
725 |
-src_install() { |
726 |
- local dest="/usr/share/${PN}-${SLOT}" |
727 |
- |
728 |
- java-pkg_jarinto "${dest}"/bin |
729 |
- java-pkg_dojar output/build/bin/*.jar |
730 |
- exeinto "${dest}"/bin |
731 |
- doexe output/build/bin/*.sh |
732 |
- |
733 |
- java-pkg_jarinto "${dest}"/lib |
734 |
- java-pkg_dojar output/build/lib/*.jar |
735 |
- |
736 |
- dodoc RELEASE-NOTES RUNNING.txt |
737 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
738 |
- use source && java-pkg_dosrc java/* |
739 |
- |
740 |
- ### Webapps ### |
741 |
- |
742 |
- # add missing docBase |
743 |
- local apps="host-manager manager" |
744 |
- for app in ${apps}; do |
745 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
746 |
- output/build/webapps/${app}/META-INF/context.xml || die |
747 |
- done |
748 |
- |
749 |
- insinto "${dest}"/webapps |
750 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
751 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
752 |
- |
753 |
- ### Config ### |
754 |
- |
755 |
- # create "logs" directory in $CATALINA_BASE |
756 |
- # and set correct perms, see #458890 |
757 |
- dodir "${dest}"/logs |
758 |
- fperms 0750 "${dest}"/logs |
759 |
- |
760 |
- # replace the default pw with a random one, see #92281 |
761 |
- local randpw="$(pwgen -s -B 15 1)" |
762 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
763 |
- |
764 |
- # prepend gentoo.classpath to common.loader, see #453212 |
765 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
766 |
- |
767 |
- insinto "${dest}" |
768 |
- doins -r output/build/conf |
769 |
- |
770 |
- ### rc ### |
771 |
- |
772 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
773 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
774 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
775 |
- |
776 |
- insinto "${dest}"/gentoo |
777 |
- doins "${T}"/tomcat.conf |
778 |
- exeinto "${dest}"/gentoo |
779 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
780 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
781 |
-} |
782 |
- |
783 |
-pkg_postinst() { |
784 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
785 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
786 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
787 |
- |
788 |
- elog "To manage Tomcat instances, run:" |
789 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
790 |
- |
791 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
792 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
793 |
- |
794 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
795 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
796 |
-} |
797 |
|
798 |
diff --git a/www-servers/tomcat/tomcat-9.0.53.ebuild b/www-servers/tomcat/tomcat-9.0.53.ebuild |
799 |
deleted file mode 100644 |
800 |
index 8905e0fad24..00000000000 |
801 |
--- a/www-servers/tomcat/tomcat-9.0.53.ebuild |
802 |
+++ /dev/null |
803 |
@@ -1,187 +0,0 @@ |
804 |
-# Copyright 1999-2021 Gentoo Authors |
805 |
-# Distributed under the terms of the GNU General Public License v2 |
806 |
- |
807 |
-EAPI=7 |
808 |
- |
809 |
-JAVA_PKG_IUSE="doc source test" |
810 |
- |
811 |
-inherit java-pkg-2 java-ant-2 prefix |
812 |
- |
813 |
-MY_P="apache-${PN}-${PV}-src" |
814 |
- |
815 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
816 |
-# See bugs #203080 and #676116 |
817 |
-BND_VERSION="5.1.1" |
818 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
819 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
820 |
- |
821 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
822 |
-HOMEPAGE="https://tomcat.apache.org/" |
823 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
824 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
825 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
826 |
- |
827 |
-LICENSE="Apache-2.0" |
828 |
-SLOT="9" |
829 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
830 |
-IUSE="extra-webapps" |
831 |
- |
832 |
-RESTRICT="test" # can we run them on a production system? |
833 |
- |
834 |
-ECJ_SLOT="4.15" |
835 |
-SAPI_SLOT="4.0" |
836 |
- |
837 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
838 |
- dev-java/glassfish-xmlrpc-api:0 |
839 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
840 |
- dev-java/wsdl4j:0" |
841 |
-RDEPEND="${COMMON_DEP} |
842 |
- acct-group/tomcat |
843 |
- acct-user/tomcat |
844 |
- virtual/jre" |
845 |
-DEPEND="${COMMON_DEP} |
846 |
- app-admin/pwgen |
847 |
- >=dev-java/ant-core-1.9.13 |
848 |
- virtual/jdk:1.8 |
849 |
- test? ( |
850 |
- >=dev-java/ant-junit-1.9:0 |
851 |
- dev-java/easymock:3.2 |
852 |
- )" |
853 |
- |
854 |
-S=${WORKDIR}/${MY_P} |
855 |
- |
856 |
-PATCHES=( |
857 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
858 |
-) |
859 |
- |
860 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
861 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
862 |
-BND_JAR="${BND_HOME}/${BND}" |
863 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
864 |
- |
865 |
-src_unpack() { |
866 |
- unpack ${MY_P}.tar.gz |
867 |
- |
868 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
869 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
870 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
871 |
-} |
872 |
- |
873 |
-src_prepare() { |
874 |
- default |
875 |
- |
876 |
- find -name '*.jar' -type f -delete -print || die |
877 |
- |
878 |
- # Remove bundled servlet-api |
879 |
- rm -rv java/javax/{el,servlet} || die |
880 |
- |
881 |
- eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch" |
882 |
- |
883 |
- # For use of catalina.sh in netbeans |
884 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
885 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
886 |
- bin/catalina.sh || die |
887 |
- |
888 |
- java-pkg-2_src_prepare |
889 |
-} |
890 |
- |
891 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
892 |
- |
893 |
-EANT_BUILD_TARGET="deploy" |
894 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
895 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
896 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
897 |
-EANT_NEEDS_TOOLS="true" |
898 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
899 |
- |
900 |
-# revisions of the scripts |
901 |
-IM_REV="-r2" |
902 |
-INIT_REV="-r1" |
903 |
- |
904 |
-src_configure() { |
905 |
- java-ant-2_src_configure |
906 |
- |
907 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
908 |
-} |
909 |
- |
910 |
-src_compile() { |
911 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
912 |
- LC_ALL=C java-pkg-2_src_compile |
913 |
-} |
914 |
- |
915 |
-src_test() { |
916 |
- java-pkg-2_src_test |
917 |
-} |
918 |
- |
919 |
-src_install() { |
920 |
- local dest="/usr/share/${PN}-${SLOT}" |
921 |
- |
922 |
- java-pkg_jarinto "${dest}"/bin |
923 |
- java-pkg_dojar output/build/bin/*.jar |
924 |
- exeinto "${dest}"/bin |
925 |
- doexe output/build/bin/*.sh |
926 |
- |
927 |
- java-pkg_jarinto "${dest}"/lib |
928 |
- java-pkg_dojar output/build/lib/*.jar |
929 |
- |
930 |
- dodoc RELEASE-NOTES RUNNING.txt |
931 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
932 |
- use source && java-pkg_dosrc java/* |
933 |
- |
934 |
- ### Webapps ### |
935 |
- |
936 |
- # add missing docBase |
937 |
- local apps="host-manager manager" |
938 |
- for app in ${apps}; do |
939 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
940 |
- output/build/webapps/${app}/META-INF/context.xml || die |
941 |
- done |
942 |
- |
943 |
- insinto "${dest}"/webapps |
944 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
945 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
946 |
- |
947 |
- ### Config ### |
948 |
- |
949 |
- # create "logs" directory in $CATALINA_BASE |
950 |
- # and set correct perms, see #458890 |
951 |
- dodir "${dest}"/logs |
952 |
- fperms 0750 "${dest}"/logs |
953 |
- |
954 |
- # replace the default pw with a random one, see #92281 |
955 |
- local randpw="$(pwgen -s -B 15 1)" |
956 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
957 |
- |
958 |
- # prepend gentoo.classpath to common.loader, see #453212 |
959 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
960 |
- |
961 |
- insinto "${dest}" |
962 |
- doins -r output/build/conf |
963 |
- |
964 |
- ### rc ### |
965 |
- |
966 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
967 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
968 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
969 |
- |
970 |
- insinto "${dest}"/gentoo |
971 |
- doins "${T}"/tomcat.conf |
972 |
- exeinto "${dest}"/gentoo |
973 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
974 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
975 |
-} |
976 |
- |
977 |
-pkg_postinst() { |
978 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
979 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
980 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
981 |
- |
982 |
- elog "To manage Tomcat instances, run:" |
983 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
984 |
- |
985 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
986 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
987 |
- |
988 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
989 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
990 |
-} |