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