1 |
commit: 60ab67e0482342fa658b1a58a85672d515bd1b02 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 21 09:50:18 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 21 10:02:21 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ab67e0 |
7 |
|
8 |
www-servers/tomcat: bump to 10.0.16 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831383 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
www-servers/tomcat/Manifest | 1 + |
15 |
.../tomcat-10.0.16-build.xml-strip-html5.patch | 31 ++ |
16 |
.../tomcat/files/tomcat-10.0.16-build.xml.patch | 349 +++++++++++++++++++++ |
17 |
www-servers/tomcat/tomcat-10.0.16.ebuild | 193 ++++++++++++ |
18 |
4 files changed, 574 insertions(+) |
19 |
|
20 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
21 |
index c1b548a49a99..8e4b7c3e894f 100644 |
22 |
--- a/www-servers/tomcat/Manifest |
23 |
+++ b/www-servers/tomcat/Manifest |
24 |
@@ -1,4 +1,5 @@ |
25 |
DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1 |
26 |
+DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8 |
27 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
28 |
DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6 |
29 |
DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5 |
30 |
|
31 |
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch |
32 |
new file mode 100644 |
33 |
index 000000000000..44f629ec29b0 |
34 |
--- /dev/null |
35 |
+++ b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch |
36 |
@@ -0,0 +1,31 @@ |
37 |
+diff --git a/build.xml b/build.xml |
38 |
+index 6b2b5d5..16d55c2 100644 |
39 |
+--- a/build.xml |
40 |
++++ b/build.xml |
41 |
+@@ -2148,7 +2148,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
42 |
+ encoding="UTF-8" |
43 |
+ docencoding="UTF-8" |
44 |
+ charset="UTF-8" |
45 |
+- additionalparam="-breakiterator -notimestamp -html5" |
46 |
++ additionalparam="-breakiterator -notimestamp" |
47 |
+ source="${compile.release}" |
48 |
+ maxmemory="512m" |
49 |
+ failonerror="true"> |
50 |
+@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
51 |
+ encoding="UTF-8" |
52 |
+ docencoding="UTF-8" |
53 |
+ charset="UTF-8" |
54 |
+- additionalparam="-breakiterator -notimestamp -html5" |
55 |
++ additionalparam="-breakiterator -notimestamp" |
56 |
+ source="${compile.release}" |
57 |
+ maxmemory="512m" |
58 |
+ failonerror="true"> |
59 |
+@@ -2269,7 +2269,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
60 |
+ encoding="UTF-8" |
61 |
+ docencoding="UTF-8" |
62 |
+ charset="UTF-8" |
63 |
+- additionalparam="-breakiterator -notimestamp -html5" |
64 |
++ additionalparam="-breakiterator -notimestamp" |
65 |
+ source="${compile.release}" |
66 |
+ maxmemory="512m" |
67 |
+ failonerror="true"> |
68 |
|
69 |
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch |
70 |
new file mode 100644 |
71 |
index 000000000000..38b3a335eca6 |
72 |
--- /dev/null |
73 |
+++ b/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch |
74 |
@@ -0,0 +1,349 @@ |
75 |
+diff --git a/build.xml b/build.xml |
76 |
+index 33a4fde..6b2b5d5 100644 |
77 |
+--- a/build.xml |
78 |
++++ b/build.xml |
79 |
+@@ -1012,6 +1012,7 @@ |
80 |
+ addOSGi="true" /> |
81 |
+ |
82 |
+ <!-- Servlet Implementation JAR File --> |
83 |
++<!-- |
84 |
+ <jarIt jarfile="${servlet-api.jar}" |
85 |
+ filesDir="${tomcat.classes}" |
86 |
+ filesId="files.servlet-api" |
87 |
+@@ -1019,21 +1020,23 @@ |
88 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
89 |
+ license="${tomcat.manifests}/servlet-api.jar.license" |
90 |
+ addOSGi="true" /> |
91 |
+- |
92 |
++--> |
93 |
+ <!-- EL Implementation JAR File --> |
94 |
++<!-- |
95 |
+ <jarIt jarfile="${el-api.jar}" |
96 |
+ filesDir="${tomcat.classes}" |
97 |
+ filesId="files.el-api" |
98 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" |
99 |
+ addOSGi="true" /> |
100 |
+- |
101 |
++--> |
102 |
+ <!-- JSP Implementation JAR File --> |
103 |
++<!-- |
104 |
+ <jarIt jarfile="${jsp-api.jar}" |
105 |
+ filesDir="${tomcat.classes}" |
106 |
+ filesId="files.jsp-api" |
107 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
108 |
+ addOSGi="true" /> |
109 |
+- |
110 |
++--> |
111 |
+ <!-- WebSocket API JAR File --> |
112 |
+ <jarIt jarfile="${websocket-api.jar}" |
113 |
+ filesDir="${tomcat.classes}" |
114 |
+@@ -1146,10 +1149,10 @@ |
115 |
+ addOSGi="true" /> |
116 |
+ |
117 |
+ <!-- Re-packaged Apache Commons DBCP 2--> |
118 |
+- <jarIt jarfile="${tomcat-dbcp.jar}" |
119 |
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
120 |
+ filesDir="${tomcat.classes}" |
121 |
+ filesId="files.tomcat-dbcp" |
122 |
+- addOSGi="true" /> |
123 |
++ addOSGi="true" /> --> |
124 |
+ |
125 |
+ <!-- i18n JARs --> |
126 |
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" |
127 |
+@@ -1386,9 +1389,9 @@ |
128 |
+ |
129 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
130 |
+ description="Default. Builds a working Tomcat instance"> |
131 |
+- |
132 |
++<!-- |
133 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
134 |
+- |
135 |
++--> |
136 |
+ <!-- Copy scripts --> |
137 |
+ <copy todir="${tomcat.build}/bin"> |
138 |
+ <fileset dir="bin"> |
139 |
+@@ -1448,7 +1451,7 @@ |
140 |
+ <exclude name="${jdt.jar.filename}"/> |
141 |
+ </fileset> |
142 |
+ </delete> |
143 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
144 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
145 |
+ |
146 |
+ <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one --> |
147 |
+ <local name="migration.jar.filename" /> |
148 |
+@@ -1459,7 +1462,7 @@ |
149 |
+ <exclude name="${migration-lib.jar.filename}"/> |
150 |
+ </fileset> |
151 |
+ </delete> |
152 |
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> |
153 |
++<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> --> |
154 |
+ |
155 |
+ <!-- Add sources for examples --> |
156 |
+ <antcall target="examples-sources" /> |
157 |
+@@ -1498,7 +1501,7 @@ |
158 |
+ |
159 |
+ </target> |
160 |
+ |
161 |
+- <target name="build-tomcat-jdbc" depends="package"> |
162 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
163 |
+ <!-- build the jdbc-pool jar and source jar--> |
164 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
165 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
166 |
+@@ -1514,7 +1517,7 @@ |
167 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
168 |
+ </target> |
169 |
+ |
170 |
+- <target name="build-tomcat-jdbc-src"> |
171 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
172 |
+ <!-- build the jdbc-pool source jar--> |
173 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
174 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
175 |
+@@ -1617,9 +1620,11 @@ |
176 |
+ |
177 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
178 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
179 |
++<!-- |
180 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
181 |
+ failonerror="false"/> |
182 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
183 |
++--> |
184 |
+ <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
185 |
+ |
186 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
187 |
+@@ -2117,11 +2122,12 @@ |
188 |
+ </copy> |
189 |
+ |
190 |
+ <!-- Source bundles for native components --> |
191 |
++<!-- |
192 |
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
193 |
+ file="${tomcat-native.tar.gz}" /> |
194 |
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
195 |
+ file="${commons-daemon.native.src.tgz}" /> |
196 |
+- |
197 |
++--> |
198 |
+ <!-- platform README files --> |
199 |
+ <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
200 |
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
201 |
+@@ -2145,13 +2151,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
202 |
+ additionalparam="-breakiterator -notimestamp -html5" |
203 |
+ source="${compile.release}" |
204 |
+ maxmemory="512m" |
205 |
+- failonerror="true" |
206 |
+- failonwarning="true"> |
207 |
++ failonerror="true"> |
208 |
+ <classpath> |
209 |
+ <path refid="compile.classpath"/> |
210 |
+ <path location="${ant.core.lib}"/> |
211 |
+ </classpath> |
212 |
+ </javadoc> |
213 |
++<!-- |
214 |
+ <javadoc packagenames="jakarta.servlet.*" |
215 |
+ excludepackagenames="jakarta.servlet.jsp.*" |
216 |
+ sourcepath="${tomcat.dist}/src/java" |
217 |
+@@ -2167,8 +2173,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
218 |
+ additionalparam="-breakiterator -notimestamp -html5" |
219 |
+ source="${compile.release}" |
220 |
+ maxmemory="512m" |
221 |
+- failonerror="true" |
222 |
+- failonwarning="true"> |
223 |
++ failonerror="true"> |
224 |
+ <classpath> |
225 |
+ <path refid="compile.classpath"/> |
226 |
+ <path location="${ant.core.lib}"/> |
227 |
+@@ -2188,8 +2193,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
228 |
+ additionalparam="-breakiterator -notimestamp -html5" |
229 |
+ source="${compile.release}" |
230 |
+ maxmemory="512m" |
231 |
+- failonerror="true" |
232 |
+- failonwarning="true"> |
233 |
++ failonerror="true"> |
234 |
+ <classpath> |
235 |
+ <path refid="compile.classpath"/> |
236 |
+ <path location="${ant.core.lib}"/> |
237 |
+@@ -2209,13 +2213,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
238 |
+ additionalparam="-breakiterator -notimestamp -html5" |
239 |
+ source="${compile.release}" |
240 |
+ maxmemory="512m" |
241 |
+- failonerror="true" |
242 |
+- failonwarning="true"> |
243 |
++ failonerror="true"> |
244 |
+ <classpath> |
245 |
+ <path refid="compile.classpath"/> |
246 |
+ <path location="${ant.core.lib}"/> |
247 |
+ </classpath> |
248 |
+ </javadoc> |
249 |
++--> |
250 |
+ <javadoc packagenames="jakarta.websocket.*" |
251 |
+ sourcepath="${tomcat.dist}/src/java" |
252 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
253 |
+@@ -2230,8 +2234,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
254 |
+ additionalparam="-breakiterator -notimestamp -html5" |
255 |
+ source="${compile.release}" |
256 |
+ maxmemory="512m" |
257 |
+- failonerror="true" |
258 |
+- failonwarning="true"> |
259 |
++ failonerror="true"> |
260 |
+ <classpath> |
261 |
+ <path refid="compile.classpath"/> |
262 |
+ <path location="${ant.core.lib}"/> |
263 |
+@@ -2250,8 +2253,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
264 |
+ charset="UTF-8" |
265 |
+ additionalparam="-breakiterator -notimestamp" |
266 |
+ maxmemory="512m" |
267 |
+- failonerror="true" |
268 |
+- failonwarning="true"> |
269 |
++ failonerror="true"> |
270 |
+ <classpath> |
271 |
+ <path refid="compile.classpath"/> |
272 |
+ <path location="${ant.core.lib}"/> |
273 |
+@@ -2270,21 +2272,24 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
274 |
+ additionalparam="-breakiterator -notimestamp -html5" |
275 |
+ source="${compile.release}" |
276 |
+ maxmemory="512m" |
277 |
+- failonerror="true" |
278 |
+- failonwarning="true"> |
279 |
++ failonerror="true"> |
280 |
+ <classpath> |
281 |
+ <path refid="compile.classpath"/> |
282 |
+ <path location="${ant.core.lib}"/> |
283 |
+ <path location="${osgi-annotations.jar}"/> |
284 |
+ </classpath> |
285 |
+ <link href="../annotationapi"/> |
286 |
++<!-- |
287 |
+ <link href="../servletapi"/> |
288 |
+ <link href="../jspapi"/> |
289 |
+ <link href="../elapi"/> |
290 |
++--> |
291 |
+ <link href="../websocketapi"/> |
292 |
+ <link href="../jaspicapi"/> |
293 |
++<!-- |
294 |
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/> |
295 |
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/> |
296 |
++--> |
297 |
+ <packageset dir="${tomcat.dist}/src/java/"> |
298 |
+ <include name="org/**"/> |
299 |
+ <exclude name="org/apache/el/parser/**"/> |
300 |
+@@ -3103,7 +3108,7 @@ skip.installer property in build.properties" /> |
301 |
+ </target> |
302 |
+ |
303 |
+ <target name="download-test-compile" |
304 |
+- description="Download additional components for the tests" > |
305 |
++ description="Download additional components for the tests"> |
306 |
+ |
307 |
+ <antcall target="downloadfile"> |
308 |
+ <param name="sourcefile" value="${junit.loc}"/> |
309 |
+@@ -3222,7 +3227,7 @@ skip.installer property in build.properties" /> |
310 |
+ </target> |
311 |
+ |
312 |
+ <target name="download-dist" |
313 |
+- description="Download additional components for a distribution" > |
314 |
++ description="Download additional components for a distribution"> |
315 |
+ |
316 |
+ <antcall target="downloadfile-2"> |
317 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
318 |
+@@ -3277,13 +3282,13 @@ skip.installer property in build.properties" /> |
319 |
+ |
320 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
321 |
+ |
322 |
+- <target name="setproxy" if="${proxy.use}"> |
323 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
324 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
325 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
326 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
327 |
+ </target> |
328 |
+ |
329 |
+- <target name="testexist"> |
330 |
++ <target name="testexist" unless="noget"> |
331 |
+ <echo message="Testing for ${destfile}"/> |
332 |
+ <available file="${destfile}" property="exist"/> |
333 |
+ </target> |
334 |
+@@ -3405,7 +3410,7 @@ skip.installer property in build.properties" /> |
335 |
+ </sequential> |
336 |
+ </macrodef> |
337 |
+ |
338 |
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
339 |
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
340 |
+ <!-- Download and extract the package --> |
341 |
+ <local name="temp.file"/> |
342 |
+ <mkdir dir="${base.path}"/> |
343 |
+@@ -3422,7 +3427,7 @@ skip.installer property in build.properties" /> |
344 |
+ <delete file="${temp.file}.tar.gz"/> |
345 |
+ </target> |
346 |
+ |
347 |
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> |
348 |
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> |
349 |
+ <!-- Download and extract the package from the two alternative locations --> |
350 |
+ <local name="temp.file"/> |
351 |
+ <mkdir dir="${base.path}"/> |
352 |
+@@ -3447,7 +3452,7 @@ skip.installer property in build.properties" /> |
353 |
+ <delete file="${temp.file}.tar.gz"/> |
354 |
+ </target> |
355 |
+ |
356 |
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
357 |
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
358 |
+ <!-- Download and extract the package --> |
359 |
+ <local name="temp.file"/> |
360 |
+ <mkdir dir="${base.path}"/> |
361 |
+@@ -3463,7 +3468,7 @@ skip.installer property in build.properties" /> |
362 |
+ <delete file="${temp.file}"/> |
363 |
+ </target> |
364 |
+ |
365 |
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> |
366 |
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> |
367 |
+ <!-- Download and extract the package from the two alternative locations --> |
368 |
+ <local name="temp.file"/> |
369 |
+ <mkdir dir="${base.path}"/> |
370 |
+@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" /> |
371 |
+ <delete file="${temp.file}"/> |
372 |
+ </target> |
373 |
+ |
374 |
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
375 |
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
376 |
+ <!-- Download the file --> |
377 |
+ <local name="temp.file"/> |
378 |
+ <mkdir dir="${base.path}"/> |
379 |
+@@ -3502,7 +3507,7 @@ skip.installer property in build.properties" /> |
380 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
381 |
+ </target> |
382 |
+ |
383 |
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> |
384 |
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> |
385 |
+ <!-- Download the file from the two alternative locations --> |
386 |
+ <local name="temp.file"/> |
387 |
+ <mkdir dir="${base.path}"/> |
388 |
+@@ -3530,7 +3535,7 @@ skip.installer property in build.properties" /> |
389 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
390 |
+ </target> |
391 |
+ |
392 |
+- <target name="trydownload.check" depends="setproxy"> |
393 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
394 |
+ <condition property="trydownload.run"> |
395 |
+ <and> |
396 |
+ <not> |
397 |
+@@ -3541,7 +3546,7 @@ skip.installer property in build.properties" /> |
398 |
+ </condition> |
399 |
+ </target> |
400 |
+ |
401 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
402 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
403 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
404 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
405 |
+ </target> |
406 |
+@@ -3552,7 +3557,7 @@ skip.installer property in build.properties" /> |
407 |
+ |
408 |
+ <target name="ide-eclipse" |
409 |
+ depends="download-compile, download-test-compile" |
410 |
+- description="Prepares the source tree to be built in Eclipse"> |
411 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
412 |
+ |
413 |
+ <!-- Copy the sample project files into the root directory --> |
414 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
415 |
+@@ -3570,7 +3575,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho |
416 |
+ |
417 |
+ <target name="ide-intellij" |
418 |
+ depends="download-compile, download-test-compile" |
419 |
+- description="Creates project directory .idea for IntelliJ IDEA"> |
420 |
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> |
421 |
+ |
422 |
+ <copy todir="${tomcat.home}/.idea"> |
423 |
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/> |
424 |
|
425 |
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.16.ebuild |
426 |
new file mode 100644 |
427 |
index 000000000000..d629e593150b |
428 |
--- /dev/null |
429 |
+++ b/www-servers/tomcat/tomcat-10.0.16.ebuild |
430 |
@@ -0,0 +1,193 @@ |
431 |
+# Copyright 1999-2022 Gentoo Authors |
432 |
+# Distributed under the terms of the GNU General Public License v2 |
433 |
+ |
434 |
+EAPI=8 |
435 |
+ |
436 |
+JAVA_PKG_IUSE="doc source test" |
437 |
+ |
438 |
+inherit java-pkg-2 java-ant-2 prefix |
439 |
+ |
440 |
+MY_P="apache-${PN}-${PV}-src" |
441 |
+ |
442 |
+# Currently we bundle binary versions of bnd.jar and bndlib.jar |
443 |
+# See bugs #203080 and #676116 |
444 |
+BND_VERSION="5.1.1" |
445 |
+BND="biz.aQute.bnd-${BND_VERSION}.jar" |
446 |
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
447 |
+ |
448 |
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
449 |
+HOMEPAGE="https://tomcat.apache.org/" |
450 |
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
451 |
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
452 |
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
453 |
+ |
454 |
+LICENSE="Apache-2.0" |
455 |
+SLOT="10" |
456 |
+KEYWORDS="~amd64 ~amd64-linux" |
457 |
+IUSE="extra-webapps" |
458 |
+ |
459 |
+RESTRICT="test" # can we run them on a production system? |
460 |
+ |
461 |
+ECJ_SLOT="4.15" |
462 |
+SAPI_SLOT="5.0" |
463 |
+ |
464 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
465 |
+ dev-java/glassfish-xmlrpc-api:0 |
466 |
+ dev-java/jakartaee-migration:0 |
467 |
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
468 |
+ dev-java/wsdl4j:0" |
469 |
+RDEPEND="${COMMON_DEP} |
470 |
+ acct-group/tomcat |
471 |
+ acct-user/tomcat |
472 |
+ virtual/jre" |
473 |
+DEPEND="${COMMON_DEP} |
474 |
+ app-admin/pwgen |
475 |
+ dev-java/ant-core |
476 |
+ virtual/jdk:1.8 |
477 |
+ test? ( |
478 |
+ dev-java/ant-junit:0 |
479 |
+ dev-java/easymock:3.2 |
480 |
+ )" |
481 |
+ |
482 |
+S=${WORKDIR}/${MY_P} |
483 |
+ |
484 |
+PATCHES=( |
485 |
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
486 |
+) |
487 |
+ |
488 |
+BND_HOME="${S}/tomcat-build-libs/bnd" |
489 |
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
490 |
+BND_JAR="${BND_HOME}/${BND}" |
491 |
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
492 |
+ |
493 |
+src_unpack() { |
494 |
+ unpack ${MY_P}.tar.gz |
495 |
+ |
496 |
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
497 |
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
498 |
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
499 |
+} |
500 |
+ |
501 |
+src_prepare() { |
502 |
+ default |
503 |
+ |
504 |
+ find -name '*.jar' -type f -delete -print || die |
505 |
+ |
506 |
+ # Remove bundled servlet-api |
507 |
+ rm -rv java/jakarta/{el,servlet} || die |
508 |
+ |
509 |
+ eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch" |
510 |
+ java-pkg_is-vm-version-eq 1.8 && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
511 |
+ |
512 |
+ # For use of catalina.sh in netbeans |
513 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
514 |
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
515 |
+ bin/catalina.sh || die |
516 |
+ |
517 |
+ java-pkg-2_src_prepare |
518 |
+} |
519 |
+ |
520 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
521 |
+ |
522 |
+EANT_BUILD_TARGET="deploy" |
523 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
524 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
525 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
526 |
+EANT_NEEDS_TOOLS="true" |
527 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
528 |
+ |
529 |
+# revisions of the scripts |
530 |
+IM_REV="-r2" |
531 |
+INIT_REV="-r1" |
532 |
+ |
533 |
+src_configure() { |
534 |
+ java-ant-2_src_configure |
535 |
+ |
536 |
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
537 |
+} |
538 |
+ |
539 |
+src_compile() { |
540 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
541 |
+ LC_ALL=C java-pkg-2_src_compile |
542 |
+} |
543 |
+ |
544 |
+src_test() { |
545 |
+ java-pkg-2_src_test |
546 |
+} |
547 |
+ |
548 |
+src_install() { |
549 |
+ local dest="/usr/share/${PN}-${SLOT}" |
550 |
+ |
551 |
+ java-pkg_jarinto "${dest}"/bin |
552 |
+ java-pkg_dojar output/build/bin/*.jar |
553 |
+ exeinto "${dest}"/bin |
554 |
+ doexe output/build/bin/*.sh |
555 |
+ |
556 |
+ java-pkg_jarinto "${dest}"/lib |
557 |
+ java-pkg_dojar output/build/lib/*.jar |
558 |
+ |
559 |
+ dodoc RELEASE-NOTES RUNNING.txt |
560 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
561 |
+ use source && java-pkg_dosrc java/* |
562 |
+ |
563 |
+ ### Webapps ### |
564 |
+ |
565 |
+ # add missing docBase |
566 |
+ local apps="host-manager manager" |
567 |
+ for app in ${apps}; do |
568 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
569 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
570 |
+ done |
571 |
+ |
572 |
+ insinto "${dest}"/webapps |
573 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
574 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
575 |
+ |
576 |
+ ### Config ### |
577 |
+ |
578 |
+ # create "logs" directory in $CATALINA_BASE |
579 |
+ # and set correct perms, see #458890 |
580 |
+ dodir "${dest}"/logs |
581 |
+ fperms 0750 "${dest}"/logs |
582 |
+ |
583 |
+ # replace the default pw with a random one, see #92281 |
584 |
+ local randpw="$(pwgen -s -B 15 1)" |
585 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
586 |
+ |
587 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
588 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
589 |
+ |
590 |
+ insinto "${dest}" |
591 |
+ doins -r output/build/conf |
592 |
+ |
593 |
+ ### rc ### |
594 |
+ |
595 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
596 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
597 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
598 |
+ |
599 |
+ insinto "${dest}"/gentoo |
600 |
+ doins "${T}"/tomcat.conf |
601 |
+ exeinto "${dest}"/gentoo |
602 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
603 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
604 |
+} |
605 |
+ |
606 |
+pkg_postinst() { |
607 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
608 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
609 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
610 |
+ |
611 |
+ elog "To manage Tomcat instances, run:" |
612 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
613 |
+ |
614 |
+ ewarn "Please note that since version 10 the primary package for all implemented APIs" |
615 |
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
616 |
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
617 |
+ |
618 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
619 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
620 |
+ |
621 |
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
622 |
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
623 |
+} |