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