1 |
commit: 07dc5f698c5a7a14ccd7ad4574e50864de3bd589 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 2 20:52:31 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 2 20:52:56 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dc5f69 |
7 |
|
8 |
www-servers/tomcat: bump to 10.0.17 |
9 |
|
10 |
bumped bnd to 6.2.0 |
11 |
allowed compilation with java 1.8+ |
12 |
|
13 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
15 |
|
16 |
www-servers/tomcat/Manifest | 3 + |
17 |
www-servers/tomcat/tomcat-10.0.17.ebuild | 198 +++++++++++++++++++++++++++++++ |
18 |
2 files changed, 201 insertions(+) |
19 |
|
20 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
21 |
index 0afe9b0e02bb..1a9b38b2b9b6 100644 |
22 |
--- a/www-servers/tomcat/Manifest |
23 |
+++ b/www-servers/tomcat/Manifest |
24 |
@@ -1,6 +1,9 @@ |
25 |
DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8 |
26 |
+DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d |
27 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
28 |
DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad |
29 |
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
30 |
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
31 |
+DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f |
32 |
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b |
33 |
+DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a |
34 |
|
35 |
diff --git a/www-servers/tomcat/tomcat-10.0.17.ebuild b/www-servers/tomcat/tomcat-10.0.17.ebuild |
36 |
new file mode 100644 |
37 |
index 000000000000..2d8f92da7a35 |
38 |
--- /dev/null |
39 |
+++ b/www-servers/tomcat/tomcat-10.0.17.ebuild |
40 |
@@ -0,0 +1,198 @@ |
41 |
+# Copyright 1999-2022 Gentoo Authors |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+ |
44 |
+EAPI=8 |
45 |
+ |
46 |
+JAVA_PKG_IUSE="doc source test" |
47 |
+ |
48 |
+inherit java-pkg-2 java-ant-2 prefix |
49 |
+ |
50 |
+MY_P="apache-${PN}-${PV}-src" |
51 |
+ |
52 |
+# Currently we bundle binary versions of bnd.jar and bndlib.jar |
53 |
+# See bugs #203080 and #676116 |
54 |
+BND_VERSION="6.2.0" |
55 |
+BND="biz.aQute.bnd-${BND_VERSION}.jar" |
56 |
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
57 |
+ |
58 |
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
59 |
+HOMEPAGE="https://tomcat.apache.org/" |
60 |
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
61 |
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
62 |
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
63 |
+ |
64 |
+LICENSE="Apache-2.0" |
65 |
+SLOT="10" |
66 |
+KEYWORDS="~amd64 ~amd64-linux" |
67 |
+IUSE="extra-webapps" |
68 |
+ |
69 |
+RESTRICT="test" # can we run them on a production system? |
70 |
+ |
71 |
+# though it could work with 4.22 and upstream uses 4.20, |
72 |
+# we still use 4.15 because 4.20+ is currently built with java 11 |
73 |
+# and it would force Tomcat to use at least java 11 too |
74 |
+ECJ_SLOT="4.15" |
75 |
+SAPI_SLOT="5.0" |
76 |
+ |
77 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
78 |
+ dev-java/glassfish-xmlrpc-api:0 |
79 |
+ dev-java/jakartaee-migration:0 |
80 |
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
81 |
+ dev-java/wsdl4j:0" |
82 |
+RDEPEND="${COMMON_DEP} |
83 |
+ acct-group/tomcat |
84 |
+ acct-user/tomcat |
85 |
+ virtual/jre" |
86 |
+DEPEND="${COMMON_DEP} |
87 |
+ app-admin/pwgen |
88 |
+ dev-java/ant-core |
89 |
+ >=virtual/jdk-1.8:* |
90 |
+ test? ( |
91 |
+ dev-java/ant-junit:0 |
92 |
+ dev-java/easymock:3.2 |
93 |
+ )" |
94 |
+ |
95 |
+S=${WORKDIR}/${MY_P} |
96 |
+ |
97 |
+PATCHES=( |
98 |
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
99 |
+) |
100 |
+ |
101 |
+BND_HOME="${S}/tomcat-build-libs/bnd" |
102 |
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
103 |
+BND_JAR="${BND_HOME}/${BND}" |
104 |
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
105 |
+ |
106 |
+src_unpack() { |
107 |
+ unpack ${MY_P}.tar.gz |
108 |
+ |
109 |
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
110 |
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
111 |
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
112 |
+} |
113 |
+ |
114 |
+src_prepare() { |
115 |
+ default |
116 |
+ |
117 |
+ find -name '*.jar' -type f -delete -print || die |
118 |
+ |
119 |
+ # Remove bundled servlet-api |
120 |
+ rm -rv java/jakarta/{el,servlet} || die |
121 |
+ |
122 |
+ eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch" |
123 |
+ |
124 |
+ local vm_version="$(java-config -g PROVIDES_VERSION)" |
125 |
+ [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
126 |
+ |
127 |
+ # For use of catalina.sh in netbeans |
128 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
129 |
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
130 |
+ bin/catalina.sh || die |
131 |
+ |
132 |
+ java-pkg-2_src_prepare |
133 |
+} |
134 |
+ |
135 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
136 |
+ |
137 |
+EANT_BUILD_TARGET="deploy" |
138 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
139 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
140 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
141 |
+EANT_NEEDS_TOOLS="true" |
142 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
143 |
+ |
144 |
+# revisions of the scripts |
145 |
+IM_REV="-r2" |
146 |
+INIT_REV="-r1" |
147 |
+ |
148 |
+src_configure() { |
149 |
+ java-ant-2_src_configure |
150 |
+ |
151 |
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
152 |
+} |
153 |
+ |
154 |
+src_compile() { |
155 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
156 |
+ LC_ALL=C java-pkg-2_src_compile |
157 |
+} |
158 |
+ |
159 |
+src_test() { |
160 |
+ java-pkg-2_src_test |
161 |
+} |
162 |
+ |
163 |
+src_install() { |
164 |
+ local dest="/usr/share/${PN}-${SLOT}" |
165 |
+ |
166 |
+ java-pkg_jarinto "${dest}"/bin |
167 |
+ java-pkg_dojar output/build/bin/*.jar |
168 |
+ exeinto "${dest}"/bin |
169 |
+ doexe output/build/bin/*.sh |
170 |
+ |
171 |
+ java-pkg_jarinto "${dest}"/lib |
172 |
+ java-pkg_dojar output/build/lib/*.jar |
173 |
+ |
174 |
+ dodoc RELEASE-NOTES RUNNING.txt |
175 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
176 |
+ use source && java-pkg_dosrc java/* |
177 |
+ |
178 |
+ ### Webapps ### |
179 |
+ |
180 |
+ # add missing docBase |
181 |
+ local apps="host-manager manager" |
182 |
+ for app in ${apps}; do |
183 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
184 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
185 |
+ done |
186 |
+ |
187 |
+ insinto "${dest}"/webapps |
188 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
189 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
190 |
+ |
191 |
+ ### Config ### |
192 |
+ |
193 |
+ # create "logs" directory in $CATALINA_BASE |
194 |
+ # and set correct perms, see #458890 |
195 |
+ dodir "${dest}"/logs |
196 |
+ fperms 0750 "${dest}"/logs |
197 |
+ |
198 |
+ # replace the default pw with a random one, see #92281 |
199 |
+ local randpw="$(pwgen -s -B 15 1)" |
200 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
201 |
+ |
202 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
203 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
204 |
+ |
205 |
+ insinto "${dest}" |
206 |
+ doins -r output/build/conf |
207 |
+ |
208 |
+ ### rc ### |
209 |
+ |
210 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
211 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
212 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
213 |
+ |
214 |
+ insinto "${dest}"/gentoo |
215 |
+ doins "${T}"/tomcat.conf |
216 |
+ exeinto "${dest}"/gentoo |
217 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
218 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
219 |
+} |
220 |
+ |
221 |
+pkg_postinst() { |
222 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
223 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
224 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
225 |
+ |
226 |
+ elog "To manage Tomcat instances, run:" |
227 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
228 |
+ |
229 |
+ ewarn "Please note that since version 10 the primary package for all implemented APIs" |
230 |
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
231 |
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
232 |
+ |
233 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
234 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
235 |
+ |
236 |
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
237 |
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
238 |
+} |