1 |
commit: 7e32e1535a3bd366f4a61f4ed02881db4f1d1d28 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 17 07:27:34 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 07:27:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e32e153 |
7 |
|
8 |
www-servers/tomcat: bump to 8.5.68 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 1 + |
14 |
www-servers/tomcat/tomcat-8.5.68.ebuild | 159 ++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 160 insertions(+) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index 5325e3686e5..eda822311f6 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -1,6 +1,7 @@ |
22 |
DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100 |
23 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
24 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
25 |
+DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066 |
26 |
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 |
27 |
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
28 |
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b |
29 |
|
30 |
diff --git a/www-servers/tomcat/tomcat-8.5.68.ebuild b/www-servers/tomcat/tomcat-8.5.68.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..ce92130bddc |
33 |
--- /dev/null |
34 |
+++ b/www-servers/tomcat/tomcat-8.5.68.ebuild |
35 |
@@ -0,0 +1,159 @@ |
36 |
+# Copyright 1999-2021 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+JAVA_PKG_IUSE="doc source test" |
42 |
+ |
43 |
+inherit java-pkg-2 java-ant-2 prefix |
44 |
+ |
45 |
+MY_P="apache-${P}-src" |
46 |
+ |
47 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
48 |
+HOMEPAGE="https://tomcat.apache.org/" |
49 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
50 |
+ |
51 |
+LICENSE="Apache-2.0" |
52 |
+SLOT="8.5" |
53 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
54 |
+IUSE="extra-webapps" |
55 |
+ |
56 |
+RESTRICT="test" # can we run them on a production system? |
57 |
+ |
58 |
+ECJ_SLOT="4.5" |
59 |
+SAPI_SLOT="3.1" |
60 |
+ |
61 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
62 |
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
63 |
+RDEPEND="${COMMON_DEP} |
64 |
+ acct-group/tomcat |
65 |
+ acct-user/tomcat |
66 |
+ virtual/jre" |
67 |
+DEPEND="${COMMON_DEP} |
68 |
+ app-admin/pwgen |
69 |
+ dev-java/ant-core |
70 |
+ virtual/jdk:1.8 |
71 |
+ doc? ( |
72 |
+ dev-java/glassfish-xmlrpc-api:0 |
73 |
+ dev-java/wsdl4j:0 |
74 |
+ ) |
75 |
+ test? ( |
76 |
+ >=dev-java/ant-junit-1.9:0 |
77 |
+ dev-java/easymock:3.2 |
78 |
+ )" |
79 |
+ |
80 |
+S=${WORKDIR}/${MY_P} |
81 |
+ |
82 |
+src_prepare() { |
83 |
+ default |
84 |
+ |
85 |
+ find -name '*.jar' -type f -delete -print || die |
86 |
+ |
87 |
+ # Remove bundled servlet-api |
88 |
+ rm -rv java/javax/{el,servlet} || die |
89 |
+ |
90 |
+ eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch" |
91 |
+ |
92 |
+ # For use of catalina.sh in netbeans |
93 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
94 |
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
95 |
+ bin/catalina.sh || die |
96 |
+ |
97 |
+ java-pkg-2_src_prepare |
98 |
+} |
99 |
+ |
100 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
101 |
+ |
102 |
+EANT_BUILD_TARGET="deploy" |
103 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
104 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
105 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
106 |
+EANT_NEEDS_TOOLS="true" |
107 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
108 |
+ |
109 |
+# revisions of the scripts |
110 |
+IM_REV="-r2" |
111 |
+INIT_REV="-r1" |
112 |
+ |
113 |
+src_compile() { |
114 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
115 |
+ use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)" |
116 |
+ LC_ALL=C java-pkg-2_src_compile |
117 |
+} |
118 |
+ |
119 |
+src_test() { |
120 |
+ java-pkg-2_src_test |
121 |
+} |
122 |
+ |
123 |
+src_install() { |
124 |
+ local dest="/usr/share/${PN}-${SLOT}" |
125 |
+ |
126 |
+ java-pkg_jarinto "${dest}"/bin |
127 |
+ java-pkg_dojar output/build/bin/*.jar |
128 |
+ exeinto "${dest}"/bin |
129 |
+ doexe output/build/bin/*.sh |
130 |
+ |
131 |
+ java-pkg_jarinto "${dest}"/lib |
132 |
+ java-pkg_dojar output/build/lib/*.jar |
133 |
+ |
134 |
+ dodoc RELEASE-NOTES RUNNING.txt |
135 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
136 |
+ use source && java-pkg_dosrc java/* |
137 |
+ |
138 |
+ ### Webapps ### |
139 |
+ |
140 |
+ # add missing docBase |
141 |
+ local apps="host-manager manager" |
142 |
+ for app in ${apps}; do |
143 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
144 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
145 |
+ done |
146 |
+ |
147 |
+ insinto "${dest}"/webapps |
148 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
149 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
150 |
+ |
151 |
+ ### Config ### |
152 |
+ |
153 |
+ # create "logs" directory in $CATALINA_BASE |
154 |
+ # and set correct perms, see #458890 |
155 |
+ dodir "${dest}"/logs |
156 |
+ fperms 0750 "${dest}"/logs |
157 |
+ |
158 |
+ # replace the default pw with a random one, see #92281 |
159 |
+ local randpw="$(pwgen -s -B 15 1)" |
160 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
161 |
+ |
162 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
163 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
164 |
+ |
165 |
+ insinto "${dest}" |
166 |
+ doins -r output/build/conf |
167 |
+ |
168 |
+ ### rc ### |
169 |
+ |
170 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
171 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
172 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
173 |
+ |
174 |
+ insinto "${dest}"/gentoo |
175 |
+ doins "${T}"/tomcat.conf |
176 |
+ exeinto "${dest}"/gentoo |
177 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
178 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
179 |
+} |
180 |
+ |
181 |
+pkg_postinst() { |
182 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
183 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
184 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
185 |
+ |
186 |
+ elog "To manage Tomcat instances, run:" |
187 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
188 |
+ |
189 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
190 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
191 |
+ |
192 |
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
193 |
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
194 |
+} |