1 |
commit: fdfd796061bea1aee965be0d125cdd77041668b0 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 15 16:59:00 2018 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 15 16:59:59 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfd7960 |
7 |
|
8 |
www-servers/tomcat: version bump for slot 7 and 8 |
9 |
|
10 |
www-servers/tomcat/Manifest | 2 + |
11 |
.../tomcat/files/tomcat-7.0.85-build.xml.patch | 161 +++++++++++++ |
12 |
.../tomcat/files/tomcat-8.0.50-build.xml.patch | 267 +++++++++++++++++++++ |
13 |
www-servers/tomcat/tomcat-7.0.85.ebuild | 146 +++++++++++ |
14 |
www-servers/tomcat/tomcat-8.0.50.ebuild | 157 ++++++++++++ |
15 |
5 files changed, 733 insertions(+) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index 7dff47cf2b3..e16d894bda4 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -1,7 +1,9 @@ |
22 |
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db |
23 |
DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74 |
24 |
+DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044 |
25 |
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841 |
26 |
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 |
27 |
+DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff |
28 |
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc |
29 |
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab |
30 |
DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5 |
31 |
|
32 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..aa40bd1564a |
35 |
--- /dev/null |
36 |
+++ b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch |
37 |
@@ -0,0 +1,161 @@ |
38 |
+diff --git a/build.xml b/build.xml |
39 |
+index 3f1229c..13894ed 100644 |
40 |
+--- a/build.xml |
41 |
++++ b/build.xml |
42 |
+@@ -671,12 +671,14 @@ |
43 |
+ </fileset> |
44 |
+ </copy> |
45 |
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
46 |
++<!-- |
47 |
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
48 |
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
49 |
+ <include name="*" /> |
50 |
+ <exclude name="jspxml*" /> |
51 |
+ </fileset> |
52 |
+ </copy> |
53 |
++--> |
54 |
+ |
55 |
+ </target> |
56 |
+ |
57 |
+@@ -733,26 +735,32 @@ |
58 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
59 |
+ |
60 |
+ <!-- Servlet 3.0 Implementation JAR File --> |
61 |
++<!-- |
62 |
+ <jarIt jarfile="${servlet-api.jar}" |
63 |
+ filesDir="${tomcat.classes}" |
64 |
+ filesId="files.servlet-api" |
65 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
66 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
67 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
68 |
++--> |
69 |
+ |
70 |
+ <!-- JSP 2.2 Implementation JAR File --> |
71 |
++<!-- |
72 |
+ <jarIt jarfile="${jsp-api.jar}" |
73 |
+ filesDir="${tomcat.classes}" |
74 |
+ filesId="files.jsp-api" |
75 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
76 |
+ notice="${tomcat.manifests}/jsp-api.jar.notice" |
77 |
+ license="${tomcat.manifests}/jsp-api.jar.license" /> |
78 |
++--> |
79 |
+ |
80 |
+ <!-- JSP 2.2 EL Implementation JAR File --> |
81 |
++<!-- |
82 |
+ <jarIt jarfile="${el-api.jar}" |
83 |
+ filesDir="${tomcat.classes}" |
84 |
+ filesId="files.el-api" |
85 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
86 |
++--> |
87 |
+ |
88 |
+ <!-- Bootstrap JAR File --> |
89 |
+ <jarIt jarfile="${bootstrap.jar}" |
90 |
+@@ -999,9 +1007,9 @@ |
91 |
+ |
92 |
+ <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
93 |
+ description="Default. Builds a working Tomcat instance"> |
94 |
+- |
95 |
++<!-- |
96 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
97 |
+- |
98 |
++--> |
99 |
+ <!-- Copy scripts --> |
100 |
+ <copy todir="${tomcat.build}/bin"> |
101 |
+ <fileset dir="bin"> |
102 |
+@@ -1060,14 +1068,15 @@ |
103 |
+ <exclude name="${jdt.jar.filename}"/> |
104 |
+ </fileset> |
105 |
+ </delete> |
106 |
++<!-- |
107 |
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
108 |
+- |
109 |
++--> |
110 |
+ <!-- Add sources for examples --> |
111 |
+ <antcall target="examples-sources" /> |
112 |
+- |
113 |
++<!-- |
114 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
115 |
+ failonerror="false"/> |
116 |
+- |
117 |
++--> |
118 |
+ <!-- build the jdbc-pool jar and source jar--> |
119 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
120 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
121 |
+@@ -1697,7 +1706,7 @@ |
122 |
+ |
123 |
+ <target name="extras-webservices-prepare" |
124 |
+ depends="extras-prepare" |
125 |
+- description="Prepare to build web services extras package"> |
126 |
++ description="Prepare to build web services extras package" unless="noget"> |
127 |
+ |
128 |
+ <antcall target="downloadfile"> |
129 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
130 |
+@@ -1886,11 +1895,12 @@ |
131 |
+ </copy> |
132 |
+ |
133 |
+ <!-- Source bundles for native components --> |
134 |
++<!-- |
135 |
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
136 |
+ file="${tomcat-native.tar.gz}" /> |
137 |
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
138 |
+ file="${commons-daemon.native.src.tgz}" /> |
139 |
+- |
140 |
++--> |
141 |
+ <!-- platform README files --> |
142 |
+ <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
143 |
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
144 |
+@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
145 |
+ description="Create the Tomcat javadoc" > |
146 |
+ <fail unless="java.7.home" |
147 |
+ message="The java.7.home property must be set for javadoc build"/> |
148 |
++<!-- |
149 |
+ <javadoc packagenames="javax.servlet.*" |
150 |
+ excludepackagenames="javax.servlet.jsp.*" |
151 |
+ sourcepath="${tomcat.dist}/src/java" |
152 |
+@@ -1966,6 +1977,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
153 |
+ <path location="${ant.core.lib}"/> |
154 |
+ </classpath> |
155 |
+ </javadoc> |
156 |
++--> |
157 |
+ <javadoc packagenames="javax.websocket.*" |
158 |
+ sourcepath="${tomcat.dist}/src/java" |
159 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
160 |
+@@ -2006,9 +2018,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
161 |
+ <path refid="tomcat.webservices.classpath"/> |
162 |
+ <path location="${ant.core.lib}"/> |
163 |
+ </classpath> |
164 |
++<!-- |
165 |
+ <link href="../servletapi"/> |
166 |
+ <link href="../jspapi"/> |
167 |
+ <link href="../elapi"/> |
168 |
++--> |
169 |
+ <link href="../websocketapi"/> |
170 |
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
171 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
172 |
+@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
173 |
+ </target> |
174 |
+ |
175 |
+ <target name="download-compile" |
176 |
+- description="Download (and build) components necessary to compile" > |
177 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
178 |
+ |
179 |
+ <!-- Download Commons Daemon --> |
180 |
+ <antcall target="downloadgz-2"> |
181 |
+@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
182 |
+ </target> |
183 |
+ |
184 |
+ <target name="download-test-compile" |
185 |
+- description="Download additional components for the tests" > |
186 |
++ description="Download additional components for the tests" unless="noget"> |
187 |
+ |
188 |
+ <antcall target="downloadfile"> |
189 |
+ <param name="sourcefile" value="${junit.loc}"/> |
190 |
+@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
191 |
+ </target> |
192 |
+ |
193 |
+ <target name="download-dist" |
194 |
+- description="Download additional components for a distribution" > |
195 |
++ description="Download additional components for a distribution" unless="noget"> |
196 |
+ |
197 |
+ <antcall target="downloadfile-2"> |
198 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
199 |
|
200 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch |
201 |
new file mode 100644 |
202 |
index 00000000000..b7e0a283fe2 |
203 |
--- /dev/null |
204 |
+++ b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch |
205 |
@@ -0,0 +1,267 @@ |
206 |
+diff --git a/build.xml b/build.xml |
207 |
+index 3152712..9e09384 100644 |
208 |
+--- a/build.xml |
209 |
++++ b/build.xml |
210 |
+@@ -718,24 +718,29 @@ |
211 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
212 |
+ |
213 |
+ <!-- Servlet 3.1 Implementation JAR File --> |
214 |
++<!-- |
215 |
+ <jarIt jarfile="${servlet-api.jar}" |
216 |
+ filesDir="${tomcat.classes}" |
217 |
+ filesId="files.servlet-api" |
218 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
219 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
220 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
221 |
+- |
222 |
++--> |
223 |
+ <!-- JSP 2.3 Implementation JAR File --> |
224 |
++<!-- |
225 |
+ <jarIt jarfile="${jsp-api.jar}" |
226 |
+ filesDir="${tomcat.classes}" |
227 |
+ filesId="files.jsp-api" |
228 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
229 |
++--> |
230 |
+ |
231 |
+ <!-- EL 3.0 Implementation JAR File --> |
232 |
++<!-- |
233 |
+ <jarIt jarfile="${el-api.jar}" |
234 |
+ filesDir="${tomcat.classes}" |
235 |
+ filesId="files.el-api" |
236 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
237 |
++--> |
238 |
+ |
239 |
+ <!-- WebSocket 1.1 API JAR File --> |
240 |
+ <jarIt jarfile="${websocket-api.jar}" |
241 |
+@@ -1005,9 +1010,9 @@ |
242 |
+ |
243 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
244 |
+ description="Default. Builds a working Tomcat instance"> |
245 |
+- |
246 |
++<!-- |
247 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
248 |
+- |
249 |
++--> |
250 |
+ <!-- Copy scripts --> |
251 |
+ <copy todir="${tomcat.build}/bin"> |
252 |
+ <fileset dir="bin"> |
253 |
+@@ -1067,7 +1072,7 @@ |
254 |
+ <exclude name="${jdt.jar.filename}"/> |
255 |
+ </fileset> |
256 |
+ </delete> |
257 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
258 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
259 |
+ |
260 |
+ <!-- Add sources for examples --> |
261 |
+ <antcall target="examples-sources" /> |
262 |
+@@ -1101,7 +1106,7 @@ |
263 |
+ </javac> |
264 |
+ </target> |
265 |
+ |
266 |
+- <target name="build-tomcat-jdbc" depends="package"> |
267 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
268 |
+ <!-- build the jdbc-pool jar and source jar--> |
269 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
270 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
271 |
+@@ -1116,7 +1121,7 @@ |
272 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
273 |
+ </target> |
274 |
+ |
275 |
+- <target name="build-tomcat-jdbc-src"> |
276 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
277 |
+ <!-- build the jdbc-pool source jar--> |
278 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
279 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
280 |
+@@ -1220,9 +1225,11 @@ |
281 |
+ |
282 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
283 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
284 |
++<!-- |
285 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
286 |
+ failonerror="false"/> |
287 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
288 |
++--> |
289 |
+ <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
290 |
+ |
291 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
292 |
+@@ -1615,7 +1622,7 @@ |
293 |
+ |
294 |
+ <target name="extras-commons-logging-prepare" |
295 |
+ depends="extras-prepare" |
296 |
+- description="Prepare to build web services extras package"> |
297 |
++ description="Prepare to build web services extras package" unless="noget"> |
298 |
+ |
299 |
+ <antcall target="downloadfile-2"> |
300 |
+ <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
301 |
+@@ -1754,7 +1761,7 @@ |
302 |
+ |
303 |
+ <target name="extras-webservices-prepare" |
304 |
+ depends="extras-prepare" |
305 |
+- description="Prepare to build web services extras package"> |
306 |
++ description="Prepare to build web services extras package" unless="noget"> |
307 |
+ |
308 |
+ <antcall target="downloadfile"> |
309 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
310 |
+@@ -1941,11 +1948,12 @@ |
311 |
+ </copy> |
312 |
+ |
313 |
+ <!-- Source bundles for native components --> |
314 |
++<!-- |
315 |
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
316 |
+ file="${tomcat-native.tar.gz}" /> |
317 |
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
318 |
+ file="${commons-daemon.native.src.tgz}" /> |
319 |
+- |
320 |
++--> |
321 |
+ <!-- platform README files --> |
322 |
+ <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
323 |
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
324 |
+@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
325 |
+ |
326 |
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
327 |
+ description="Create the Tomcat javadoc" > |
328 |
++<!-- |
329 |
+ <javadoc packagenames="javax.servlet.*" |
330 |
+ excludepackagenames="javax.servlet.jsp.*" |
331 |
+ sourcepath="${tomcat.dist}/src/java" |
332 |
+@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
333 |
+ <path location="${ant.core.lib}"/> |
334 |
+ </classpath> |
335 |
+ </javadoc> |
336 |
++--> |
337 |
+ <javadoc packagenames="javax.websocket.*" |
338 |
+ sourcepath="${tomcat.dist}/src/java" |
339 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
340 |
+@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
341 |
+ <path refid="tomcat.webservices.classpath"/> |
342 |
+ <path location="${ant.core.lib}"/> |
343 |
+ </classpath> |
344 |
++<!-- |
345 |
+ <link href="../servletapi"/> |
346 |
+ <link href="../jspapi"/> |
347 |
+ <link href="../elapi"/> |
348 |
++--> |
349 |
+ <link href="../websocketapi"/> |
350 |
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
351 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
352 |
+@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" /> |
353 |
+ </target> |
354 |
+ |
355 |
+ <target name="download-compile" |
356 |
+- description="Download (and build) components necessary to compile" > |
357 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
358 |
+ |
359 |
+ <!-- Download Commons Daemon --> |
360 |
+ <antcall target="downloadgz-2"> |
361 |
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" /> |
362 |
+ </target> |
363 |
+ |
364 |
+ <target name="download-test-compile" |
365 |
+- description="Download additional components for the tests" > |
366 |
++ description="Download additional components for the tests" unless="noget"> |
367 |
+ |
368 |
+ <antcall target="downloadfile"> |
369 |
+ <param name="sourcefile" value="${junit.loc}"/> |
370 |
+@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" /> |
371 |
+ </target> |
372 |
+ |
373 |
+ <target name="download-dist" |
374 |
+- description="Download additional components for a distribution" > |
375 |
++ description="Download additional components for a distribution" unless="noget"> |
376 |
+ |
377 |
+ <antcall target="downloadfile-2"> |
378 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
379 |
+@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" /> |
380 |
+ |
381 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
382 |
+ |
383 |
+- <target name="setproxy" if="${proxy.use}"> |
384 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
385 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
386 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
387 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
388 |
+ </target> |
389 |
+ |
390 |
+- <target name="testexist"> |
391 |
++ <target name="testexist" unless="noget"> |
392 |
+ <echo message="Testing for ${destfile}"/> |
393 |
+ <available file="${destfile}" property="exist"/> |
394 |
+ </target> |
395 |
+ |
396 |
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
397 |
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
398 |
+ <!-- Download and extract the package --> |
399 |
+ <local name="temp.file"/> |
400 |
+ <mkdir dir="${base.path}"/> |
401 |
+@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" /> |
402 |
+ <delete file="${temp.file}.tar.gz"/> |
403 |
+ </target> |
404 |
+ |
405 |
+- <target name="downloadgz-2" unless="exist" depends="testexist"> |
406 |
++ <target name="downloadgz-2" unless="noget" depends="testexist"> |
407 |
+ <!-- Download and extract the package from the two alternative locations --> |
408 |
+ <local name="temp.file"/> |
409 |
+ <mkdir dir="${base.path}"/> |
410 |
+@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" /> |
411 |
+ <delete file="${temp.file}.tar.gz"/> |
412 |
+ </target> |
413 |
+ |
414 |
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
415 |
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
416 |
+ <!-- Download and extract the package --> |
417 |
+ <local name="temp.file"/> |
418 |
+ <mkdir dir="${base.path}"/> |
419 |
+@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" /> |
420 |
+ <delete file="${temp.file}"/> |
421 |
+ </target> |
422 |
+ |
423 |
+- <target name="downloadzip-2" unless="exist" depends="testexist"> |
424 |
++ <target name="downloadzip-2" unless="noget" depends="testexist"> |
425 |
+ <!-- Download and extract the package from the two alternative locations --> |
426 |
+ <local name="temp.file"/> |
427 |
+ <mkdir dir="${base.path}"/> |
428 |
+@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" /> |
429 |
+ <delete file="${temp.file}"/> |
430 |
+ </target> |
431 |
+ |
432 |
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
433 |
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
434 |
+ <!-- Download the file --> |
435 |
+ <local name="temp.file"/> |
436 |
+ <mkdir dir="${base.path}"/> |
437 |
+@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" /> |
438 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
439 |
+ </target> |
440 |
+ |
441 |
+- <target name="downloadfile-2" unless="exist" depends="testexist"> |
442 |
++ <target name="downloadfile-2" unless="noget" depends="testexist"> |
443 |
+ <!-- Download the file from the two alternative locations --> |
444 |
+ <local name="temp.file"/> |
445 |
+ <mkdir dir="${base.path}"/> |
446 |
+@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" /> |
447 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
448 |
+ </target> |
449 |
+ |
450 |
+- <target name="trydownload.check" depends="setproxy"> |
451 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
452 |
+ <condition property="trydownload.run"> |
453 |
+ <and> |
454 |
+ <not> |
455 |
+@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" /> |
456 |
+ </condition> |
457 |
+ </target> |
458 |
+ |
459 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
460 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
461 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
462 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
463 |
+ </target> |
464 |
+@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" /> |
465 |
+ |
466 |
+ <target name="ide-eclipse" |
467 |
+ depends="download-compile, extras-webservices-prepare, download-test-compile" |
468 |
+- description="Prepares the source tree to be built in Eclipse"> |
469 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
470 |
+ |
471 |
+ <!-- Copy the sample project files into the root directory --> |
472 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
473 |
|
474 |
diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild b/www-servers/tomcat/tomcat-7.0.85.ebuild |
475 |
new file mode 100644 |
476 |
index 00000000000..4ce5c4efd22 |
477 |
--- /dev/null |
478 |
+++ b/www-servers/tomcat/tomcat-7.0.85.ebuild |
479 |
@@ -0,0 +1,146 @@ |
480 |
+# Copyright 1999-2018 Gentoo Foundation |
481 |
+# Distributed under the terms of the GNU General Public License v2 |
482 |
+ |
483 |
+EAPI=6 |
484 |
+ |
485 |
+JAVA_PKG_IUSE="doc source test" |
486 |
+ |
487 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
488 |
+ |
489 |
+MY_P="apache-${P}-src" |
490 |
+ |
491 |
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
492 |
+HOMEPAGE="https://tomcat.apache.org/" |
493 |
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
494 |
+ |
495 |
+LICENSE="Apache-2.0" |
496 |
+SLOT="7" |
497 |
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
498 |
+IUSE="extra-webapps websockets" |
499 |
+ |
500 |
+RESTRICT="test" # can we run them on a production system? |
501 |
+ |
502 |
+ECJ_SLOT="4.5" |
503 |
+SAPI_SLOT="3.0" |
504 |
+ |
505 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
506 |
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
507 |
+RDEPEND="${COMMON_DEP} |
508 |
+ virtual/jre |
509 |
+ !<dev-java/tomcat-native-1.1.24" |
510 |
+DEPEND="${COMMON_DEP} |
511 |
+ virtual/jdk:1.8 |
512 |
+ test? ( dev-java/ant-junit:0 )" |
513 |
+ |
514 |
+S=${WORKDIR}/${MY_P} |
515 |
+ |
516 |
+pkg_setup() { |
517 |
+ java-pkg-2_pkg_setup |
518 |
+ enewgroup tomcat 265 |
519 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
520 |
+} |
521 |
+ |
522 |
+src_prepare() { |
523 |
+ default |
524 |
+ |
525 |
+ # Remove bundled servlet-api |
526 |
+ rm -rv java/javax/{el,servlet} || die |
527 |
+ |
528 |
+ java-pkg_clean |
529 |
+ |
530 |
+ epatch "${FILESDIR}/${P}-build.xml.patch" |
531 |
+ |
532 |
+ # For use of catalina.sh in netbeans |
533 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
534 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
535 |
+ bin/catalina.sh || die |
536 |
+ |
537 |
+ java-pkg-2_src_prepare |
538 |
+} |
539 |
+ |
540 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
541 |
+ |
542 |
+EANT_BUILD_TARGET="deploy" |
543 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
544 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
545 |
+EANT_NEEDS_TOOLS="true" |
546 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
547 |
+ |
548 |
+# revisions of the scripts |
549 |
+IM_REV="-r1" |
550 |
+INIT_REV="-r1" |
551 |
+ |
552 |
+src_compile() { |
553 |
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
554 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
555 |
+ java-pkg-2_src_compile |
556 |
+} |
557 |
+ |
558 |
+src_test() { |
559 |
+ java-pkg-2_src_test |
560 |
+} |
561 |
+ |
562 |
+src_install() { |
563 |
+ local dest="/usr/share/${PN}-${SLOT}" |
564 |
+ |
565 |
+ java-pkg_jarinto "${dest}"/bin |
566 |
+ java-pkg_dojar output/build/bin/*.jar |
567 |
+ exeinto "${dest}"/bin |
568 |
+ doexe output/build/bin/*.sh |
569 |
+ |
570 |
+ java-pkg_jarinto "${dest}"/lib |
571 |
+ java-pkg_dojar output/build/lib/*.jar |
572 |
+ |
573 |
+ dodoc RELEASE-NOTES RUNNING.txt |
574 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
575 |
+ use source && java-pkg_dosrc java/* |
576 |
+ |
577 |
+ ### Webapps ### |
578 |
+ |
579 |
+ insinto "${dest}"/webapps |
580 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
581 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
582 |
+ |
583 |
+ ### Config ### |
584 |
+ |
585 |
+ # create "logs" directory in $CATALINA_BASE |
586 |
+ # and set correct perms, see #458890 |
587 |
+ dodir "${dest}"/logs |
588 |
+ fperms 0750 "${dest}"/logs |
589 |
+ |
590 |
+ # replace the default pw with a random one, see #92281 |
591 |
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
592 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
593 |
+ |
594 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
595 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
596 |
+ |
597 |
+ insinto "${dest}" |
598 |
+ doins -r output/build/conf |
599 |
+ |
600 |
+ ### rc ### |
601 |
+ |
602 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
603 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
604 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
605 |
+ |
606 |
+ insinto "${dest}"/gentoo |
607 |
+ doins "${T}"/tomcat.conf |
608 |
+ exeinto "${dest}"/gentoo |
609 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
610 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
611 |
+} |
612 |
+ |
613 |
+pkg_postinst() { |
614 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
615 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
616 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
617 |
+ |
618 |
+ elog "To manage Tomcat instances, run:" |
619 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
620 |
+ |
621 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
622 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
623 |
+ |
624 |
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
625 |
+} |
626 |
|
627 |
diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild b/www-servers/tomcat/tomcat-8.0.50.ebuild |
628 |
new file mode 100644 |
629 |
index 00000000000..badb0b2ee12 |
630 |
--- /dev/null |
631 |
+++ b/www-servers/tomcat/tomcat-8.0.50.ebuild |
632 |
@@ -0,0 +1,157 @@ |
633 |
+# Copyright 1999-2018 Gentoo Foundation |
634 |
+# Distributed under the terms of the GNU General Public License v2 |
635 |
+ |
636 |
+EAPI=6 |
637 |
+ |
638 |
+JAVA_PKG_IUSE="doc source test" |
639 |
+ |
640 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
641 |
+ |
642 |
+MY_P="apache-${P}-src" |
643 |
+ |
644 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
645 |
+HOMEPAGE="https://tomcat.apache.org/" |
646 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
647 |
+ |
648 |
+LICENSE="Apache-2.0" |
649 |
+SLOT="8" |
650 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
651 |
+IUSE="extra-webapps" |
652 |
+ |
653 |
+RESTRICT="test" # can we run them on a production system? |
654 |
+ |
655 |
+ECJ_SLOT="4.5" |
656 |
+SAPI_SLOT="3.1" |
657 |
+ |
658 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
659 |
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
660 |
+RDEPEND="${COMMON_DEP} |
661 |
+ !<dev-java/tomcat-native-1.1.24 |
662 |
+ >=virtual/jre-1.7" |
663 |
+DEPEND="${COMMON_DEP} |
664 |
+ app-admin/pwgen |
665 |
+ >=virtual/jdk-1.7 |
666 |
+ test? ( |
667 |
+ >=dev-java/ant-junit-1.9:0 |
668 |
+ dev-java/easymock:3.2 |
669 |
+ )" |
670 |
+ |
671 |
+S=${WORKDIR}/${MY_P} |
672 |
+ |
673 |
+pkg_setup() { |
674 |
+ java-pkg-2_pkg_setup |
675 |
+ enewgroup tomcat 265 |
676 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
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 |
+ epatch "${FILESDIR}/${P}-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 --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}" |
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" |
705 |
+ |
706 |
+# revisions of the scripts |
707 |
+IM_REV="-r2" |
708 |
+INIT_REV="-r1" |
709 |
+ |
710 |
+src_compile() { |
711 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
712 |
+ java-pkg-2_src_compile |
713 |
+} |
714 |
+ |
715 |
+src_test() { |
716 |
+ java-pkg-2_src_test |
717 |
+} |
718 |
+ |
719 |
+src_install() { |
720 |
+ local dest="/usr/share/${PN}-${SLOT}" |
721 |
+ |
722 |
+ java-pkg_jarinto "${dest}"/bin |
723 |
+ java-pkg_dojar output/build/bin/*.jar |
724 |
+ exeinto "${dest}"/bin |
725 |
+ doexe output/build/bin/*.sh |
726 |
+ |
727 |
+ java-pkg_jarinto "${dest}"/lib |
728 |
+ java-pkg_dojar output/build/lib/*.jar |
729 |
+ |
730 |
+ dodoc RELEASE-NOTES RUNNING.txt |
731 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
732 |
+ use source && java-pkg_dosrc java/* |
733 |
+ |
734 |
+ ### Webapps ### |
735 |
+ |
736 |
+ # add missing docBase |
737 |
+ local apps="host-manager manager" |
738 |
+ for app in ${apps}; do |
739 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
740 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
741 |
+ done |
742 |
+ |
743 |
+ insinto "${dest}"/webapps |
744 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
745 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
746 |
+ |
747 |
+ ### Config ### |
748 |
+ |
749 |
+ # create "logs" directory in $CATALINA_BASE |
750 |
+ # and set correct perms, see #458890 |
751 |
+ dodir "${dest}"/logs |
752 |
+ fperms 0750 "${dest}"/logs |
753 |
+ |
754 |
+ # replace the default pw with a random one, see #92281 |
755 |
+ local randpw="$(pwgen -s -B 15 1)" |
756 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
757 |
+ |
758 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
759 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
760 |
+ |
761 |
+ insinto "${dest}" |
762 |
+ doins -r output/build/conf |
763 |
+ |
764 |
+ ### rc ### |
765 |
+ |
766 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
767 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
768 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
769 |
+ |
770 |
+ insinto "${dest}"/gentoo |
771 |
+ doins "${T}"/tomcat.conf |
772 |
+ exeinto "${dest}"/gentoo |
773 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
774 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
775 |
+} |
776 |
+ |
777 |
+pkg_postinst() { |
778 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
779 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
780 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
781 |
+ |
782 |
+ elog "To manage Tomcat instances, run:" |
783 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
784 |
+ |
785 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
786 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
787 |
+ |
788 |
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
789 |
+} |