1 |
commit: 96b634bd2d58335c66299b60325ec5d70f608b6f |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 10 06:20:46 2017 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 10 06:20:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b634bd |
7 |
|
8 |
www-servers/tomcat: removed old security affected versions |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
www-servers/tomcat/Manifest | 2 - |
13 |
.../tomcat/files/tomcat-7.0.77-build.xml.patch | 149 ------------ |
14 |
.../tomcat/files/tomcat-8.0.43-build.xml.patch | 259 --------------------- |
15 |
www-servers/tomcat/tomcat-7.0.77.ebuild | 148 ------------ |
16 |
www-servers/tomcat/tomcat-8.0.43.ebuild | 157 ------------- |
17 |
5 files changed, 715 deletions(-) |
18 |
|
19 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
20 |
index 195b548a628..0c3d6bb41e8 100644 |
21 |
--- a/www-servers/tomcat/Manifest |
22 |
+++ b/www-servers/tomcat/Manifest |
23 |
@@ -1,7 +1,5 @@ |
24 |
-DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6 |
25 |
DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2 |
26 |
DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487 |
27 |
-DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414 |
28 |
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0 |
29 |
DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9 |
30 |
DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253 |
31 |
|
32 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch |
33 |
deleted file mode 100644 |
34 |
index 481591fb6ff..00000000000 |
35 |
--- a/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch |
36 |
+++ /dev/null |
37 |
@@ -1,149 +0,0 @@ |
38 |
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml |
39 |
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 |
40 |
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 |
41 |
-@@ -660,12 +660,14 @@ |
42 |
- </fileset> |
43 |
- </copy> |
44 |
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
45 |
-+<!-- |
46 |
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
47 |
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
48 |
- <include name="*" /> |
49 |
- <exclude name="jspxml*" /> |
50 |
- </fileset> |
51 |
- </copy> |
52 |
-+--> |
53 |
- |
54 |
- </target> |
55 |
- |
56 |
-@@ -721,26 +723,32 @@ |
57 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
58 |
- |
59 |
- <!-- Servlet 3.0 Implementation JAR File --> |
60 |
-+<!-- |
61 |
- <jarIt jarfile="${servlet-api.jar}" |
62 |
- filesDir="${tomcat.classes}" |
63 |
- filesId="files.servlet-api" |
64 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
65 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
66 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
67 |
-+--> |
68 |
- |
69 |
- <!-- JSP 2.2 Implementation JAR File --> |
70 |
-+<!-- |
71 |
- <jarIt jarfile="${jsp-api.jar}" |
72 |
- filesDir="${tomcat.classes}" |
73 |
- filesId="files.jsp-api" |
74 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
75 |
- notice="${tomcat.manifests}/jsp-api.jar.notice" |
76 |
- license="${tomcat.manifests}/jsp-api.jar.license" /> |
77 |
-+--> |
78 |
- |
79 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
80 |
-+<!-- |
81 |
- <jarIt jarfile="${el-api.jar}" |
82 |
- filesDir="${tomcat.classes}" |
83 |
- filesId="files.el-api" |
84 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
85 |
-+--> |
86 |
- |
87 |
- <!-- Bootstrap JAR File --> |
88 |
- <jarIt jarfile="${bootstrap.jar}" |
89 |
-@@ -986,12 +994,14 @@ |
90 |
- <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
91 |
- description="Default. Builds a working Tomcat instance"> |
92 |
- |
93 |
-+<!-- |
94 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
95 |
- file="${tomcat-native.tar.gz}" /> |
96 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
97 |
- file="${commons-daemon.native.src.tgz}" /> |
98 |
- |
99 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
100 |
-+--> |
101 |
- |
102 |
- <!-- Copy scripts --> |
103 |
- <copy todir="${tomcat.build}/bin"> |
104 |
-@@ -1051,14 +1061,15 @@ |
105 |
- <exclude name="${jdt.jar.filename}"/> |
106 |
- </fileset> |
107 |
- </delete> |
108 |
-+<!-- |
109 |
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
110 |
-- |
111 |
-+--> |
112 |
- <!-- Add sources for examples --> |
113 |
- <antcall target="examples-sources" /> |
114 |
-- |
115 |
-+<!-- |
116 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
117 |
- failonerror="false"/> |
118 |
-- |
119 |
-+--> |
120 |
- <!-- build the jdbc-pool jar and source jar--> |
121 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
122 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
123 |
-@@ -1681,7 +1692,7 @@ |
124 |
- |
125 |
- <target name="extras-webservices-prepare" |
126 |
- depends="extras-prepare" |
127 |
-- description="Prepare to build web services extras package"> |
128 |
-+ description="Prepare to build web services extras package" unless="noget"> |
129 |
- |
130 |
- <antcall target="downloadfile"> |
131 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
132 |
-@@ -1886,6 +1897,7 @@ |
133 |
- description="Create the Tomcat javadoc" > |
134 |
- <fail unless="java.7.home" |
135 |
- message="The java.7.home property must be set for javadoc build"/> |
136 |
-+<!-- |
137 |
- <javadoc packagenames="javax.servlet.*" |
138 |
- excludepackagenames="javax.servlet.jsp.*" |
139 |
- sourcepath="${tomcat.dist}/src/java" |
140 |
-@@ -1947,6 +1959,7 @@ |
141 |
- <path location="${ant.core.lib}"/> |
142 |
- </classpath> |
143 |
- </javadoc> |
144 |
-+--> |
145 |
- <javadoc packagenames="javax.websocket.*" |
146 |
- sourcepath="${tomcat.dist}/src/java" |
147 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
148 |
-@@ -1985,9 +1998,11 @@ |
149 |
- <path refid="tomcat.webservices.classpath"/> |
150 |
- <path location="${ant.core.lib}"/> |
151 |
- </classpath> |
152 |
-+<!-- |
153 |
- <link href="../servletapi"/> |
154 |
- <link href="../jspapi"/> |
155 |
- <link href="../elapi"/> |
156 |
-+--> |
157 |
- <link href="../websocketapi"/> |
158 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
159 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
160 |
-@@ -2642,7 +2657,7 @@ |
161 |
- </target> |
162 |
- |
163 |
- <target name="download-compile" |
164 |
-- description="Download (and build) components necessary to compile" > |
165 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
166 |
- |
167 |
- <antcall target="downloadfile-2"> |
168 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
169 |
-@@ -2699,7 +2714,7 @@ |
170 |
- </target> |
171 |
- |
172 |
- <target name="download-test-compile" |
173 |
-- description="Download additional components for the tests" > |
174 |
-+ description="Download additional components for the tests" unless="noget"> |
175 |
- |
176 |
- <antcall target="downloadfile"> |
177 |
- <param name="sourcefile" value="${junit.loc}"/> |
178 |
-@@ -2727,7 +2742,7 @@ |
179 |
- </target> |
180 |
- |
181 |
- <target name="download-dist" |
182 |
-- description="Download additional components for a distribution" > |
183 |
-+ description="Download additional components for a distribution" unless="noget"> |
184 |
- |
185 |
- <antcall target="downloadzip-2"> |
186 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
187 |
|
188 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch |
189 |
deleted file mode 100644 |
190 |
index cefd59f55ae..00000000000 |
191 |
--- a/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch |
192 |
+++ /dev/null |
193 |
@@ -1,259 +0,0 @@ |
194 |
-diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml |
195 |
-index 1ba0dae..81a0a2c 100644 |
196 |
---- a/apache-tomcat-8.0.36-src/build.xml |
197 |
-+++ b/apache-tomcat-8.0.36-src/build.xml |
198 |
-@@ -701,24 +701,29 @@ |
199 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
200 |
- |
201 |
- <!-- Servlet 3.1 Implementation JAR File --> |
202 |
-+<!-- |
203 |
- <jarIt jarfile="${servlet-api.jar}" |
204 |
- filesDir="${tomcat.classes}" |
205 |
- filesId="files.servlet-api" |
206 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
207 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
208 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
209 |
-- |
210 |
-+--> |
211 |
- <!-- JSP 2.3 Implementation JAR File --> |
212 |
-+<!-- |
213 |
- <jarIt jarfile="${jsp-api.jar}" |
214 |
- filesDir="${tomcat.classes}" |
215 |
- filesId="files.jsp-api" |
216 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
217 |
-+--> |
218 |
- |
219 |
- <!-- EL 3.0 Implementation JAR File --> |
220 |
-+<!-- |
221 |
- <jarIt jarfile="${el-api.jar}" |
222 |
- filesDir="${tomcat.classes}" |
223 |
- filesId="files.el-api" |
224 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
225 |
-+--> |
226 |
- |
227 |
- <!-- WebSocket 1.1 API JAR File --> |
228 |
- <jarIt jarfile="${websocket-api.jar}" |
229 |
-@@ -986,14 +991,14 @@ |
230 |
- |
231 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
232 |
- description="Default. Builds a working Tomcat instance"> |
233 |
-- |
234 |
-+<!-- |
235 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
236 |
- file="${tomcat-native.tar.gz}" /> |
237 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
238 |
- file="${commons-daemon.native.src.tgz}" /> |
239 |
- |
240 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
241 |
-- |
242 |
-+--> |
243 |
- <!-- Copy scripts --> |
244 |
- <copy todir="${tomcat.build}/bin"> |
245 |
- <fileset dir="bin"> |
246 |
-@@ -1053,7 +1058,7 @@ |
247 |
- <exclude name="${jdt.jar.filename}"/> |
248 |
- </fileset> |
249 |
- </delete> |
250 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
251 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
252 |
- |
253 |
- <!-- Add sources for examples --> |
254 |
- <antcall target="examples-sources" /> |
255 |
-@@ -1087,7 +1092,7 @@ |
256 |
- </javac> |
257 |
- </target> |
258 |
- |
259 |
-- <target name="build-tomcat-jdbc" depends="package"> |
260 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
261 |
- <!-- build the jdbc-pool jar and source jar--> |
262 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
263 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
264 |
-@@ -1102,7 +1107,7 @@ |
265 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
266 |
- </target> |
267 |
- |
268 |
-- <target name="build-tomcat-jdbc-src"> |
269 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
270 |
- <!-- build the jdbc-pool source jar--> |
271 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
272 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
273 |
-@@ -1206,10 +1211,11 @@ |
274 |
- |
275 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
276 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
277 |
-+<!-- |
278 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
279 |
- failonerror="false"/> |
280 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
281 |
-- |
282 |
-+--> |
283 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
284 |
- that needs to add entries. If there is more than one a more complex |
285 |
- solution will be required. --> |
286 |
-@@ -1594,7 +1600,7 @@ |
287 |
- |
288 |
- <target name="extras-commons-logging-prepare" |
289 |
- depends="extras-prepare" |
290 |
-- description="Prepare to build web services extras package"> |
291 |
-+ description="Prepare to build web services extras package" unless="noget"> |
292 |
- |
293 |
- <antcall target="downloadfile-2"> |
294 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
295 |
-@@ -1733,7 +1739,7 @@ |
296 |
- |
297 |
- <target name="extras-webservices-prepare" |
298 |
- depends="extras-prepare" |
299 |
-- description="Prepare to build web services extras package"> |
300 |
-+ description="Prepare to build web services extras package" unless="noget"> |
301 |
- |
302 |
- <antcall target="downloadfile"> |
303 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
304 |
-@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
305 |
- |
306 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
307 |
- description="Create the Tomcat javadoc" > |
308 |
-+<!-- |
309 |
- <javadoc packagenames="javax.servlet.*" |
310 |
- excludepackagenames="javax.servlet.jsp.*" |
311 |
- sourcepath="${tomcat.dist}/src/java" |
312 |
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
313 |
- <path location="${ant.core.lib}"/> |
314 |
- </classpath> |
315 |
- </javadoc> |
316 |
-+--> |
317 |
- <javadoc packagenames="javax.websocket.*" |
318 |
- sourcepath="${tomcat.dist}/src/java" |
319 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
320 |
-@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
321 |
- <path refid="tomcat.webservices.classpath"/> |
322 |
- <path location="${ant.core.lib}"/> |
323 |
- </classpath> |
324 |
-+<!-- |
325 |
- <link href="../servletapi"/> |
326 |
- <link href="../jspapi"/> |
327 |
- <link href="../elapi"/> |
328 |
-+--> |
329 |
- <link href="../websocketapi"/> |
330 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
331 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
332 |
-@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> |
333 |
- </target> |
334 |
- |
335 |
- <target name="download-compile" |
336 |
-- description="Download (and build) components necessary to compile" > |
337 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
338 |
- |
339 |
- <antcall target="downloadfile-2"> |
340 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
341 |
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> |
342 |
- </target> |
343 |
- |
344 |
- <target name="download-test-compile" |
345 |
-- description="Download additional components for the tests" > |
346 |
-+ description="Download additional components for the tests" unless="noget"> |
347 |
- |
348 |
- <antcall target="downloadfile"> |
349 |
- <param name="sourcefile" value="${junit.loc}"/> |
350 |
-@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> |
351 |
- </target> |
352 |
- |
353 |
- <target name="download-dist" |
354 |
-- description="Download additional components for a distribution" > |
355 |
-+ description="Download additional components for a distribution" unless="noget"> |
356 |
- |
357 |
- <antcall target="downloadzip-2"> |
358 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
359 |
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> |
360 |
- |
361 |
- <!-- =============== Utility Targets to support downloads ================ --> |
362 |
- |
363 |
-- <target name="setproxy" if="${proxy.use}"> |
364 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
365 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
366 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
367 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
368 |
- </target> |
369 |
- |
370 |
-- <target name="testexist"> |
371 |
-+ <target name="testexist" unless="noget"> |
372 |
- <echo message="Testing for ${destfile}"/> |
373 |
- <available file="${destfile}" property="exist"/> |
374 |
- </target> |
375 |
- |
376 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
377 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
378 |
- <!-- Download and extract the package --> |
379 |
- <local name="temp.file"/> |
380 |
- <mkdir dir="${base.path}"/> |
381 |
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> |
382 |
- <delete file="${temp.file}.tar.gz"/> |
383 |
- </target> |
384 |
- |
385 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
386 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
387 |
- <!-- Download and extract the package from the two alternative locations --> |
388 |
- <local name="temp.file"/> |
389 |
- <mkdir dir="${base.path}"/> |
390 |
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> |
391 |
- <delete file="${temp.file}.tar.gz"/> |
392 |
- </target> |
393 |
- |
394 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
395 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
396 |
- <!-- Download and extract the package --> |
397 |
- <local name="temp.file"/> |
398 |
- <mkdir dir="${base.path}"/> |
399 |
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> |
400 |
- <delete file="${temp.file}"/> |
401 |
- </target> |
402 |
- |
403 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
404 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
405 |
- <!-- Download and extract the package from the two alternative locations --> |
406 |
- <local name="temp.file"/> |
407 |
- <mkdir dir="${base.path}"/> |
408 |
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> |
409 |
- <delete file="${temp.file}"/> |
410 |
- </target> |
411 |
- |
412 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
413 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
414 |
- <!-- Download the file --> |
415 |
- <local name="temp.file"/> |
416 |
- <mkdir dir="${base.path}"/> |
417 |
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> |
418 |
- <move file="${temp.file}" tofile="${destfile}"/> |
419 |
- </target> |
420 |
- |
421 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
422 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
423 |
- <!-- Download the file from the two alternative locations --> |
424 |
- <local name="temp.file"/> |
425 |
- <mkdir dir="${base.path}"/> |
426 |
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> |
427 |
- <move file="${temp.file}" tofile="${destfile}"/> |
428 |
- </target> |
429 |
- |
430 |
-- <target name="trydownload.check" depends="setproxy"> |
431 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
432 |
- <condition property="trydownload.run"> |
433 |
- <and> |
434 |
- <not> |
435 |
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> |
436 |
- </condition> |
437 |
- </target> |
438 |
- |
439 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
440 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
441 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
442 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
443 |
- </target> |
444 |
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> |
445 |
- |
446 |
- <target name="ide-eclipse" |
447 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
448 |
-- description="Prepares the source tree to be built in Eclipse"> |
449 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
450 |
- |
451 |
- <!-- Copy the sample project files into the root directory --> |
452 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
453 |
|
454 |
diff --git a/www-servers/tomcat/tomcat-7.0.77.ebuild b/www-servers/tomcat/tomcat-7.0.77.ebuild |
455 |
deleted file mode 100644 |
456 |
index 0d01aa49b31..00000000000 |
457 |
--- a/www-servers/tomcat/tomcat-7.0.77.ebuild |
458 |
+++ /dev/null |
459 |
@@ -1,148 +0,0 @@ |
460 |
-# Copyright 1999-2017 Gentoo Foundation |
461 |
-# Distributed under the terms of the GNU General Public License v2 |
462 |
- |
463 |
-EAPI=6 |
464 |
- |
465 |
-JAVA_PKG_IUSE="doc source test" |
466 |
- |
467 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
468 |
- |
469 |
-MY_P="apache-${P}-src" |
470 |
- |
471 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
472 |
-HOMEPAGE="http://tomcat.apache.org/" |
473 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
474 |
- |
475 |
-LICENSE="Apache-2.0" |
476 |
-SLOT="7" |
477 |
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" |
478 |
-IUSE="extra-webapps websockets" |
479 |
- |
480 |
-RESTRICT="test" # can we run them on a production system? |
481 |
- |
482 |
-ECJ_SLOT="4.5" |
483 |
-SAPI_SLOT="3.0" |
484 |
- |
485 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
486 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
487 |
-RDEPEND="${COMMON_DEP} |
488 |
- websockets? ( >=virtual/jre-1.7 ) |
489 |
- !websockets? ( >=virtual/jre-1.6 ) |
490 |
- !<dev-java/tomcat-native-1.1.24" |
491 |
-DEPEND="${COMMON_DEP} |
492 |
- websockets? ( >=virtual/jdk-1.7 ) |
493 |
- !websockets? ( >=virtual/jdk-1.6 ) |
494 |
- test? ( dev-java/ant-junit:0 )" |
495 |
- |
496 |
-S=${WORKDIR}/${MY_P} |
497 |
- |
498 |
-pkg_setup() { |
499 |
- java-pkg-2_pkg_setup |
500 |
- enewgroup tomcat 265 |
501 |
- enewuser tomcat 265 -1 /dev/null tomcat |
502 |
-} |
503 |
- |
504 |
-src_prepare() { |
505 |
- default |
506 |
- |
507 |
- # Remove bundled servlet-api |
508 |
- rm -rv java/javax/{el,servlet} || die |
509 |
- |
510 |
- java-pkg_clean |
511 |
- |
512 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
513 |
- |
514 |
- # For use of catalina.sh in netbeans |
515 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
516 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
517 |
- bin/catalina.sh || die |
518 |
- |
519 |
- java-pkg-2_src_prepare |
520 |
-} |
521 |
- |
522 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
523 |
- |
524 |
-EANT_BUILD_TARGET="deploy" |
525 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
526 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
527 |
-EANT_NEEDS_TOOLS="true" |
528 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
529 |
- |
530 |
-# revisions of the scripts |
531 |
-IM_REV="-r1" |
532 |
-INIT_REV="-r1" |
533 |
- |
534 |
-src_compile() { |
535 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
536 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
537 |
- java-pkg-2_src_compile |
538 |
-} |
539 |
- |
540 |
-src_test() { |
541 |
- java-pkg-2_src_test |
542 |
-} |
543 |
- |
544 |
-src_install() { |
545 |
- local dest="/usr/share/${PN}-${SLOT}" |
546 |
- |
547 |
- java-pkg_jarinto "${dest}"/bin |
548 |
- java-pkg_dojar output/build/bin/*.jar |
549 |
- exeinto "${dest}"/bin |
550 |
- doexe output/build/bin/*.sh |
551 |
- |
552 |
- java-pkg_jarinto "${dest}"/lib |
553 |
- java-pkg_dojar output/build/lib/*.jar |
554 |
- |
555 |
- dodoc RELEASE-NOTES RUNNING.txt |
556 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
557 |
- use source && java-pkg_dosrc java/* |
558 |
- |
559 |
- ### Webapps ### |
560 |
- |
561 |
- insinto "${dest}"/webapps |
562 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
563 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
564 |
- |
565 |
- ### Config ### |
566 |
- |
567 |
- # create "logs" directory in $CATALINA_BASE |
568 |
- # and set correct perms, see #458890 |
569 |
- dodir "${dest}"/logs |
570 |
- fperms 0750 "${dest}"/logs |
571 |
- |
572 |
- # replace the default pw with a random one, see #92281 |
573 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
574 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
575 |
- |
576 |
- # prepend gentoo.classpath to common.loader, see #453212 |
577 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
578 |
- |
579 |
- insinto "${dest}" |
580 |
- doins -r output/build/conf |
581 |
- |
582 |
- ### rc ### |
583 |
- |
584 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
585 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
586 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
587 |
- |
588 |
- insinto "${dest}"/gentoo |
589 |
- doins "${T}"/tomcat.conf |
590 |
- exeinto "${dest}"/gentoo |
591 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
592 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
593 |
-} |
594 |
- |
595 |
-pkg_postinst() { |
596 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
597 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
598 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
599 |
- |
600 |
- elog "To manage Tomcat instances, run:" |
601 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
602 |
- |
603 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
604 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
605 |
- |
606 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
607 |
-} |
608 |
|
609 |
diff --git a/www-servers/tomcat/tomcat-8.0.43.ebuild b/www-servers/tomcat/tomcat-8.0.43.ebuild |
610 |
deleted file mode 100644 |
611 |
index 1e01093d259..00000000000 |
612 |
--- a/www-servers/tomcat/tomcat-8.0.43.ebuild |
613 |
+++ /dev/null |
614 |
@@ -1,157 +0,0 @@ |
615 |
-# Copyright 1999-2017 Gentoo Foundation |
616 |
-# Distributed under the terms of the GNU General Public License v2 |
617 |
- |
618 |
-EAPI=6 |
619 |
- |
620 |
-JAVA_PKG_IUSE="doc source test" |
621 |
- |
622 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
623 |
- |
624 |
-MY_P="apache-${P}-src" |
625 |
- |
626 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
627 |
-HOMEPAGE="http://tomcat.apache.org/" |
628 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
629 |
- |
630 |
-LICENSE="Apache-2.0" |
631 |
-SLOT="8" |
632 |
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
633 |
-IUSE="extra-webapps" |
634 |
- |
635 |
-RESTRICT="test" # can we run them on a production system? |
636 |
- |
637 |
-ECJ_SLOT="4.5" |
638 |
-SAPI_SLOT="3.1" |
639 |
- |
640 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
641 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
642 |
-RDEPEND="${COMMON_DEP} |
643 |
- !<dev-java/tomcat-native-1.1.24 |
644 |
- >=virtual/jre-1.7" |
645 |
-DEPEND="${COMMON_DEP} |
646 |
- app-admin/pwgen |
647 |
- >=virtual/jdk-1.7 |
648 |
- test? ( |
649 |
- >=dev-java/ant-junit-1.9:0 |
650 |
- dev-java/easymock:3.2 |
651 |
- )" |
652 |
- |
653 |
-S=${WORKDIR}/${MY_P} |
654 |
- |
655 |
-pkg_setup() { |
656 |
- java-pkg-2_pkg_setup |
657 |
- enewgroup tomcat 265 |
658 |
- enewuser tomcat 265 -1 /dev/null tomcat |
659 |
-} |
660 |
- |
661 |
-src_prepare() { |
662 |
- default |
663 |
- |
664 |
- find -name '*.jar' -type f -delete -print || die |
665 |
- |
666 |
- # Remove bundled servlet-api |
667 |
- rm -rv java/javax/{el,servlet} || die |
668 |
- |
669 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
670 |
- |
671 |
- # For use of catalina.sh in netbeans |
672 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
673 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
674 |
- bin/catalina.sh || die |
675 |
- |
676 |
- java-pkg-2_src_prepare |
677 |
-} |
678 |
- |
679 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
680 |
- |
681 |
-EANT_BUILD_TARGET="deploy" |
682 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
683 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
684 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
685 |
-EANT_NEEDS_TOOLS="true" |
686 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
687 |
- |
688 |
-# revisions of the scripts |
689 |
-IM_REV="-r2" |
690 |
-INIT_REV="-r1" |
691 |
- |
692 |
-src_compile() { |
693 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
694 |
- java-pkg-2_src_compile |
695 |
-} |
696 |
- |
697 |
-src_test() { |
698 |
- java-pkg-2_src_test |
699 |
-} |
700 |
- |
701 |
-src_install() { |
702 |
- local dest="/usr/share/${PN}-${SLOT}" |
703 |
- |
704 |
- java-pkg_jarinto "${dest}"/bin |
705 |
- java-pkg_dojar output/build/bin/*.jar |
706 |
- exeinto "${dest}"/bin |
707 |
- doexe output/build/bin/*.sh |
708 |
- |
709 |
- java-pkg_jarinto "${dest}"/lib |
710 |
- java-pkg_dojar output/build/lib/*.jar |
711 |
- |
712 |
- dodoc RELEASE-NOTES RUNNING.txt |
713 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
714 |
- use source && java-pkg_dosrc java/* |
715 |
- |
716 |
- ### Webapps ### |
717 |
- |
718 |
- # add missing docBase |
719 |
- local apps="host-manager manager" |
720 |
- for app in ${apps}; do |
721 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
722 |
- output/build/webapps/${app}/META-INF/context.xml || die |
723 |
- done |
724 |
- |
725 |
- insinto "${dest}"/webapps |
726 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
727 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
728 |
- |
729 |
- ### Config ### |
730 |
- |
731 |
- # create "logs" directory in $CATALINA_BASE |
732 |
- # and set correct perms, see #458890 |
733 |
- dodir "${dest}"/logs |
734 |
- fperms 0750 "${dest}"/logs |
735 |
- |
736 |
- # replace the default pw with a random one, see #92281 |
737 |
- local randpw="$(pwgen -s -B 15 1)" |
738 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
739 |
- |
740 |
- # prepend gentoo.classpath to common.loader, see #453212 |
741 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
742 |
- |
743 |
- insinto "${dest}" |
744 |
- doins -r output/build/conf |
745 |
- |
746 |
- ### rc ### |
747 |
- |
748 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
749 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
750 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
751 |
- |
752 |
- insinto "${dest}"/gentoo |
753 |
- doins "${T}"/tomcat.conf |
754 |
- exeinto "${dest}"/gentoo |
755 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
756 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
757 |
-} |
758 |
- |
759 |
-pkg_postinst() { |
760 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
761 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
762 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
763 |
- |
764 |
- elog "To manage Tomcat instances, run:" |
765 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
766 |
- |
767 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
768 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
769 |
- |
770 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
771 |
-} |