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