1 |
commit: 9c25d93ce8052dafeeb18787424467d00e4e872b |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 19 07:40:45 2017 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 19 07:41:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c25d93c |
7 |
|
8 |
www-servers/tomcat: removed x86 stable version 7.0.79 per bug #631420 |
9 |
|
10 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
11 |
|
12 |
www-servers/tomcat/Manifest | 1 - |
13 |
.../tomcat/files/tomcat-7.0.79-build.xml.patch | 149 --------------------- |
14 |
www-servers/tomcat/tomcat-7.0.79.ebuild | 148 -------------------- |
15 |
3 files changed, 298 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index 1e5c7f1d781..f53fd96b2d5 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2 |
23 |
DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487 |
24 |
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1 |
25 |
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0 |
26 |
|
27 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch |
28 |
deleted file mode 100644 |
29 |
index 481591fb6ff..00000000000 |
30 |
--- a/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch |
31 |
+++ /dev/null |
32 |
@@ -1,149 +0,0 @@ |
33 |
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml |
34 |
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 |
35 |
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 |
36 |
-@@ -660,12 +660,14 @@ |
37 |
- </fileset> |
38 |
- </copy> |
39 |
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
40 |
-+<!-- |
41 |
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
42 |
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
43 |
- <include name="*" /> |
44 |
- <exclude name="jspxml*" /> |
45 |
- </fileset> |
46 |
- </copy> |
47 |
-+--> |
48 |
- |
49 |
- </target> |
50 |
- |
51 |
-@@ -721,26 +723,32 @@ |
52 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
53 |
- |
54 |
- <!-- Servlet 3.0 Implementation JAR File --> |
55 |
-+<!-- |
56 |
- <jarIt jarfile="${servlet-api.jar}" |
57 |
- filesDir="${tomcat.classes}" |
58 |
- filesId="files.servlet-api" |
59 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
60 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
61 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
62 |
-+--> |
63 |
- |
64 |
- <!-- JSP 2.2 Implementation JAR File --> |
65 |
-+<!-- |
66 |
- <jarIt jarfile="${jsp-api.jar}" |
67 |
- filesDir="${tomcat.classes}" |
68 |
- filesId="files.jsp-api" |
69 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
70 |
- notice="${tomcat.manifests}/jsp-api.jar.notice" |
71 |
- license="${tomcat.manifests}/jsp-api.jar.license" /> |
72 |
-+--> |
73 |
- |
74 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
75 |
-+<!-- |
76 |
- <jarIt jarfile="${el-api.jar}" |
77 |
- filesDir="${tomcat.classes}" |
78 |
- filesId="files.el-api" |
79 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
80 |
-+--> |
81 |
- |
82 |
- <!-- Bootstrap JAR File --> |
83 |
- <jarIt jarfile="${bootstrap.jar}" |
84 |
-@@ -986,12 +994,14 @@ |
85 |
- <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
86 |
- description="Default. Builds a working Tomcat instance"> |
87 |
- |
88 |
-+<!-- |
89 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
90 |
- file="${tomcat-native.tar.gz}" /> |
91 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
92 |
- file="${commons-daemon.native.src.tgz}" /> |
93 |
- |
94 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
95 |
-+--> |
96 |
- |
97 |
- <!-- Copy scripts --> |
98 |
- <copy todir="${tomcat.build}/bin"> |
99 |
-@@ -1051,14 +1061,15 @@ |
100 |
- <exclude name="${jdt.jar.filename}"/> |
101 |
- </fileset> |
102 |
- </delete> |
103 |
-+<!-- |
104 |
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
105 |
-- |
106 |
-+--> |
107 |
- <!-- Add sources for examples --> |
108 |
- <antcall target="examples-sources" /> |
109 |
-- |
110 |
-+<!-- |
111 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
112 |
- failonerror="false"/> |
113 |
-- |
114 |
-+--> |
115 |
- <!-- build the jdbc-pool jar and source jar--> |
116 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
117 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
118 |
-@@ -1681,7 +1692,7 @@ |
119 |
- |
120 |
- <target name="extras-webservices-prepare" |
121 |
- depends="extras-prepare" |
122 |
-- description="Prepare to build web services extras package"> |
123 |
-+ description="Prepare to build web services extras package" unless="noget"> |
124 |
- |
125 |
- <antcall target="downloadfile"> |
126 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
127 |
-@@ -1886,6 +1897,7 @@ |
128 |
- description="Create the Tomcat javadoc" > |
129 |
- <fail unless="java.7.home" |
130 |
- message="The java.7.home property must be set for javadoc build"/> |
131 |
-+<!-- |
132 |
- <javadoc packagenames="javax.servlet.*" |
133 |
- excludepackagenames="javax.servlet.jsp.*" |
134 |
- sourcepath="${tomcat.dist}/src/java" |
135 |
-@@ -1947,6 +1959,7 @@ |
136 |
- <path location="${ant.core.lib}"/> |
137 |
- </classpath> |
138 |
- </javadoc> |
139 |
-+--> |
140 |
- <javadoc packagenames="javax.websocket.*" |
141 |
- sourcepath="${tomcat.dist}/src/java" |
142 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
143 |
-@@ -1985,9 +1998,11 @@ |
144 |
- <path refid="tomcat.webservices.classpath"/> |
145 |
- <path location="${ant.core.lib}"/> |
146 |
- </classpath> |
147 |
-+<!-- |
148 |
- <link href="../servletapi"/> |
149 |
- <link href="../jspapi"/> |
150 |
- <link href="../elapi"/> |
151 |
-+--> |
152 |
- <link href="../websocketapi"/> |
153 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
154 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
155 |
-@@ -2642,7 +2657,7 @@ |
156 |
- </target> |
157 |
- |
158 |
- <target name="download-compile" |
159 |
-- description="Download (and build) components necessary to compile" > |
160 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
161 |
- |
162 |
- <antcall target="downloadfile-2"> |
163 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
164 |
-@@ -2699,7 +2714,7 @@ |
165 |
- </target> |
166 |
- |
167 |
- <target name="download-test-compile" |
168 |
-- description="Download additional components for the tests" > |
169 |
-+ description="Download additional components for the tests" unless="noget"> |
170 |
- |
171 |
- <antcall target="downloadfile"> |
172 |
- <param name="sourcefile" value="${junit.loc}"/> |
173 |
-@@ -2727,7 +2742,7 @@ |
174 |
- </target> |
175 |
- |
176 |
- <target name="download-dist" |
177 |
-- description="Download additional components for a distribution" > |
178 |
-+ description="Download additional components for a distribution" unless="noget"> |
179 |
- |
180 |
- <antcall target="downloadzip-2"> |
181 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
182 |
|
183 |
diff --git a/www-servers/tomcat/tomcat-7.0.79.ebuild b/www-servers/tomcat/tomcat-7.0.79.ebuild |
184 |
deleted file mode 100644 |
185 |
index 0d01aa49b31..00000000000 |
186 |
--- a/www-servers/tomcat/tomcat-7.0.79.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,148 +0,0 @@ |
189 |
-# Copyright 1999-2017 Gentoo Foundation |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI=6 |
193 |
- |
194 |
-JAVA_PKG_IUSE="doc source test" |
195 |
- |
196 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
197 |
- |
198 |
-MY_P="apache-${P}-src" |
199 |
- |
200 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
201 |
-HOMEPAGE="http://tomcat.apache.org/" |
202 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
203 |
- |
204 |
-LICENSE="Apache-2.0" |
205 |
-SLOT="7" |
206 |
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" |
207 |
-IUSE="extra-webapps websockets" |
208 |
- |
209 |
-RESTRICT="test" # can we run them on a production system? |
210 |
- |
211 |
-ECJ_SLOT="4.5" |
212 |
-SAPI_SLOT="3.0" |
213 |
- |
214 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
215 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
216 |
-RDEPEND="${COMMON_DEP} |
217 |
- websockets? ( >=virtual/jre-1.7 ) |
218 |
- !websockets? ( >=virtual/jre-1.6 ) |
219 |
- !<dev-java/tomcat-native-1.1.24" |
220 |
-DEPEND="${COMMON_DEP} |
221 |
- websockets? ( >=virtual/jdk-1.7 ) |
222 |
- !websockets? ( >=virtual/jdk-1.6 ) |
223 |
- test? ( dev-java/ant-junit:0 )" |
224 |
- |
225 |
-S=${WORKDIR}/${MY_P} |
226 |
- |
227 |
-pkg_setup() { |
228 |
- java-pkg-2_pkg_setup |
229 |
- enewgroup tomcat 265 |
230 |
- enewuser tomcat 265 -1 /dev/null tomcat |
231 |
-} |
232 |
- |
233 |
-src_prepare() { |
234 |
- default |
235 |
- |
236 |
- # Remove bundled servlet-api |
237 |
- rm -rv java/javax/{el,servlet} || die |
238 |
- |
239 |
- java-pkg_clean |
240 |
- |
241 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
242 |
- |
243 |
- # For use of catalina.sh in netbeans |
244 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
245 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
246 |
- bin/catalina.sh || die |
247 |
- |
248 |
- java-pkg-2_src_prepare |
249 |
-} |
250 |
- |
251 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
252 |
- |
253 |
-EANT_BUILD_TARGET="deploy" |
254 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
255 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
256 |
-EANT_NEEDS_TOOLS="true" |
257 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
258 |
- |
259 |
-# revisions of the scripts |
260 |
-IM_REV="-r1" |
261 |
-INIT_REV="-r1" |
262 |
- |
263 |
-src_compile() { |
264 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
265 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
266 |
- java-pkg-2_src_compile |
267 |
-} |
268 |
- |
269 |
-src_test() { |
270 |
- java-pkg-2_src_test |
271 |
-} |
272 |
- |
273 |
-src_install() { |
274 |
- local dest="/usr/share/${PN}-${SLOT}" |
275 |
- |
276 |
- java-pkg_jarinto "${dest}"/bin |
277 |
- java-pkg_dojar output/build/bin/*.jar |
278 |
- exeinto "${dest}"/bin |
279 |
- doexe output/build/bin/*.sh |
280 |
- |
281 |
- java-pkg_jarinto "${dest}"/lib |
282 |
- java-pkg_dojar output/build/lib/*.jar |
283 |
- |
284 |
- dodoc RELEASE-NOTES RUNNING.txt |
285 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
286 |
- use source && java-pkg_dosrc java/* |
287 |
- |
288 |
- ### Webapps ### |
289 |
- |
290 |
- insinto "${dest}"/webapps |
291 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
292 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
293 |
- |
294 |
- ### Config ### |
295 |
- |
296 |
- # create "logs" directory in $CATALINA_BASE |
297 |
- # and set correct perms, see #458890 |
298 |
- dodir "${dest}"/logs |
299 |
- fperms 0750 "${dest}"/logs |
300 |
- |
301 |
- # replace the default pw with a random one, see #92281 |
302 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
303 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
304 |
- |
305 |
- # prepend gentoo.classpath to common.loader, see #453212 |
306 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
307 |
- |
308 |
- insinto "${dest}" |
309 |
- doins -r output/build/conf |
310 |
- |
311 |
- ### rc ### |
312 |
- |
313 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
314 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
315 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
316 |
- |
317 |
- insinto "${dest}"/gentoo |
318 |
- doins "${T}"/tomcat.conf |
319 |
- exeinto "${dest}"/gentoo |
320 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
321 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
322 |
-} |
323 |
- |
324 |
-pkg_postinst() { |
325 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
326 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
327 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
328 |
- |
329 |
- elog "To manage Tomcat instances, run:" |
330 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
331 |
- |
332 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
333 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
334 |
- |
335 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
336 |
-} |