1 |
commit: 5b190076392db59b4c908decbd40065a392604b3 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sat Feb 27 15:28:44 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 15:37:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b190076 |
7 |
|
8 |
www-servers/tomcat: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/19687 |
11 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../tomcat/files/tomcat-9.0.37-build.xml.patch | 284 --------------------- |
16 |
1 file changed, 284 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch |
19 |
deleted file mode 100644 |
20 |
index ea902b4b922..00000000000 |
21 |
--- a/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch |
22 |
+++ /dev/null |
23 |
@@ -1,284 +0,0 @@ |
24 |
-diff --git a/build.xml b/build.xml |
25 |
-index 8e02cb5..9007e8b 100644 |
26 |
---- a/build.xml |
27 |
-+++ b/build.xml |
28 |
-@@ -760,6 +760,7 @@ |
29 |
- addOSGi="true" /> |
30 |
- |
31 |
- <!-- Servlet 4.0 Implementation JAR File --> |
32 |
-+<!-- |
33 |
- <jarIt jarfile="${servlet-api.jar}" |
34 |
- filesDir="${tomcat.classes}" |
35 |
- filesId="files.servlet-api" |
36 |
-@@ -767,21 +768,23 @@ |
37 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
38 |
- license="${tomcat.manifests}/servlet-api.jar.license" |
39 |
- addOSGi="true" /> |
40 |
-- |
41 |
-+--> |
42 |
- <!-- EL Implementation JAR File --> |
43 |
-+<!-- |
44 |
- <jarIt jarfile="${el-api.jar}" |
45 |
- filesDir="${tomcat.classes}" |
46 |
- filesId="files.el-api" |
47 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" |
48 |
- addOSGi="true" /> |
49 |
-- |
50 |
-+--> |
51 |
- <!-- JSP Implementation JAR File --> |
52 |
-+<!-- |
53 |
- <jarIt jarfile="${jsp-api.jar}" |
54 |
- filesDir="${tomcat.classes}" |
55 |
- filesId="files.jsp-api" |
56 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
57 |
- addOSGi="true" /> |
58 |
-- |
59 |
-+--> |
60 |
- <!-- WebSocket API JAR File --> |
61 |
- <jarIt jarfile="${websocket-api.jar}" |
62 |
- filesDir="${tomcat.classes}" |
63 |
-@@ -894,10 +897,10 @@ |
64 |
- addOSGi="true" /> |
65 |
- |
66 |
- <!-- Re-packaged Apache Commons DBCP 2--> |
67 |
-- <jarIt jarfile="${tomcat-dbcp.jar}" |
68 |
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
69 |
- filesDir="${tomcat.classes}" |
70 |
- filesId="files.tomcat-dbcp" |
71 |
-- addOSGi="true" /> |
72 |
-+ addOSGi="true" /> --> |
73 |
- |
74 |
- <!-- i18n JARs --> |
75 |
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" |
76 |
-@@ -1139,9 +1142,9 @@ |
77 |
- |
78 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
79 |
- description="Default. Builds a working Tomcat instance"> |
80 |
-- |
81 |
-+<!-- |
82 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
83 |
-- |
84 |
-+--> |
85 |
- <!-- Copy scripts --> |
86 |
- <copy todir="${tomcat.build}/bin"> |
87 |
- <fileset dir="bin"> |
88 |
-@@ -1201,7 +1204,7 @@ |
89 |
- <exclude name="${jdt.jar.filename}"/> |
90 |
- </fileset> |
91 |
- </delete> |
92 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
93 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
94 |
- |
95 |
- <!-- Add sources for examples --> |
96 |
- <antcall target="examples-sources" /> |
97 |
-@@ -1244,7 +1247,7 @@ |
98 |
- |
99 |
- </target> |
100 |
- |
101 |
-- <target name="build-tomcat-jdbc" depends="package"> |
102 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
103 |
- <!-- build the jdbc-pool jar and source jar--> |
104 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
105 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
106 |
-@@ -1259,7 +1262,7 @@ |
107 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
108 |
- </target> |
109 |
- |
110 |
-- <target name="build-tomcat-jdbc-src"> |
111 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
112 |
- <!-- build the jdbc-pool source jar--> |
113 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
114 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
115 |
-@@ -1362,9 +1365,11 @@ |
116 |
- |
117 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
118 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
119 |
-+<!-- |
120 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
121 |
- failonerror="false"/> |
122 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
123 |
-+--> |
124 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
125 |
- |
126 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
127 |
-@@ -1863,11 +1868,12 @@ |
128 |
- </copy> |
129 |
- |
130 |
- <!-- Source bundles for native components --> |
131 |
-+<!-- |
132 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
133 |
- file="${tomcat-native.tar.gz}" /> |
134 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
135 |
- file="${commons-daemon.native.src.tgz}" /> |
136 |
-- |
137 |
-+--> |
138 |
- <!-- platform README files --> |
139 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
140 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
141 |
-@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
142 |
- <path location="${ant.core.lib}"/> |
143 |
- </classpath> |
144 |
- </javadoc> |
145 |
-+<!-- |
146 |
- <javadoc packagenames="javax.servlet.*" |
147 |
- excludepackagenames="javax.servlet.jsp.*" |
148 |
- sourcepath="${tomcat.dist}/src/java" |
149 |
-@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
150 |
- <path location="${ant.core.lib}"/> |
151 |
- </classpath> |
152 |
- </javadoc> |
153 |
-+--> |
154 |
- <javadoc packagenames="javax.websocket.*" |
155 |
- sourcepath="${tomcat.dist}/src/java" |
156 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
157 |
-@@ -2023,13 +2031,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
158 |
- <path location="${ant.core.lib}"/> |
159 |
- </classpath> |
160 |
- <link href="../annotationapi"/> |
161 |
-+<!-- |
162 |
- <link href="../servletapi"/> |
163 |
- <link href="../jspapi"/> |
164 |
- <link href="../elapi"/> |
165 |
-+--> |
166 |
- <link href="../websocketapi"/> |
167 |
- <link href="../jaspicapi"/> |
168 |
-+<!-- |
169 |
- <link href="https://docs.oracle.com/javase/8/docs/api/"/> |
170 |
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/> |
171 |
-+--> |
172 |
- <packageset dir="${tomcat.dist}/src/java/"> |
173 |
- <include name="org/**"/> |
174 |
- <exclude name="org/apache/el/parser/**"/> |
175 |
-@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" /> |
176 |
- </target> |
177 |
- |
178 |
- <target name="download-compile" |
179 |
-- description="Download components necessary to compile" > |
180 |
-+ description="Download components necessary to compile" unless="noget" > |
181 |
- |
182 |
- <!-- Download Commons Daemon --> |
183 |
- <antcall target="downloadgz-2"> |
184 |
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" /> |
185 |
- </target> |
186 |
- |
187 |
- <target name="download-test-compile" |
188 |
-- description="Download additional components for the tests" > |
189 |
-+ description="Download additional components for the tests" unless="noget"> |
190 |
- |
191 |
- <antcall target="downloadfile"> |
192 |
- <param name="sourcefile" value="${junit.loc}"/> |
193 |
-@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" /> |
194 |
- </target> |
195 |
- |
196 |
- <target name="download-dist" |
197 |
-- description="Download additional components for a distribution" > |
198 |
-+ description="Download additional components for a distribution" unless="noget"> |
199 |
- |
200 |
- <antcall target="downloadfile-2"> |
201 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
202 |
-@@ -2944,13 +2956,13 @@ skip.installer property in build.properties" /> |
203 |
- |
204 |
- <!-- =============== Utility Targets to support downloads ================ --> |
205 |
- |
206 |
-- <target name="setproxy" if="${proxy.use}"> |
207 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
208 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
209 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
210 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
211 |
- </target> |
212 |
- |
213 |
-- <target name="testexist"> |
214 |
-+ <target name="testexist" unless="noget"> |
215 |
- <echo message="Testing for ${destfile}"/> |
216 |
- <available file="${destfile}" property="exist"/> |
217 |
- </target> |
218 |
-@@ -3072,7 +3084,7 @@ skip.installer property in build.properties" /> |
219 |
- </sequential> |
220 |
- </macrodef> |
221 |
- |
222 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
223 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
224 |
- <!-- Download and extract the package --> |
225 |
- <local name="temp.file"/> |
226 |
- <mkdir dir="${base.path}"/> |
227 |
-@@ -3089,7 +3101,7 @@ skip.installer property in build.properties" /> |
228 |
- <delete file="${temp.file}.tar.gz"/> |
229 |
- </target> |
230 |
- |
231 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
232 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
233 |
- <!-- Download and extract the package from the two alternative locations --> |
234 |
- <local name="temp.file"/> |
235 |
- <mkdir dir="${base.path}"/> |
236 |
-@@ -3114,7 +3126,7 @@ skip.installer property in build.properties" /> |
237 |
- <delete file="${temp.file}.tar.gz"/> |
238 |
- </target> |
239 |
- |
240 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
241 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
242 |
- <!-- Download and extract the package --> |
243 |
- <local name="temp.file"/> |
244 |
- <mkdir dir="${base.path}"/> |
245 |
-@@ -3130,7 +3142,7 @@ skip.installer property in build.properties" /> |
246 |
- <delete file="${temp.file}"/> |
247 |
- </target> |
248 |
- |
249 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
250 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
251 |
- <!-- Download and extract the package from the two alternative locations --> |
252 |
- <local name="temp.file"/> |
253 |
- <mkdir dir="${base.path}"/> |
254 |
-@@ -3154,7 +3166,7 @@ skip.installer property in build.properties" /> |
255 |
- <delete file="${temp.file}"/> |
256 |
- </target> |
257 |
- |
258 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
259 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
260 |
- <!-- Download the file --> |
261 |
- <local name="temp.file"/> |
262 |
- <mkdir dir="${base.path}"/> |
263 |
-@@ -3169,7 +3181,7 @@ skip.installer property in build.properties" /> |
264 |
- <move file="${temp.file}" tofile="${destfile}"/> |
265 |
- </target> |
266 |
- |
267 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
268 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
269 |
- <!-- Download the file from the two alternative locations --> |
270 |
- <local name="temp.file"/> |
271 |
- <mkdir dir="${base.path}"/> |
272 |
-@@ -3197,7 +3209,7 @@ skip.installer property in build.properties" /> |
273 |
- <move file="${temp.file}" tofile="${destfile}"/> |
274 |
- </target> |
275 |
- |
276 |
-- <target name="trydownload.check" depends="setproxy"> |
277 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
278 |
- <condition property="trydownload.run"> |
279 |
- <and> |
280 |
- <not> |
281 |
-@@ -3208,7 +3220,7 @@ skip.installer property in build.properties" /> |
282 |
- </condition> |
283 |
- </target> |
284 |
- |
285 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
286 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
287 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
288 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
289 |
- </target> |
290 |
-@@ -3219,7 +3231,7 @@ skip.installer property in build.properties" /> |
291 |
- |
292 |
- <target name="ide-eclipse" |
293 |
- depends="download-compile, download-test-compile" |
294 |
-- description="Prepares the source tree to be built in Eclipse"> |
295 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
296 |
- |
297 |
- <!-- Copy the sample project files into the root directory --> |
298 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
299 |
-@@ -3237,7 +3249,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho |
300 |
- |
301 |
- <target name="ide-intellij" |
302 |
- depends="download-compile, download-test-compile" |
303 |
-- description="Creates project directory .idea for IntelliJ IDEA"> |
304 |
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> |
305 |
- |
306 |
- <copy todir="${tomcat.home}/.idea"> |
307 |
- <fileset dir="${tomcat.home}/res/ide-support/idea"/> |