Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/
Date: Thu, 27 Feb 2020 22:46:59
Message-Id: 1582843372.14c55e079658684cc203818bead12dafbdb1307f.fordfrog@gentoo
1 commit: 14c55e079658684cc203818bead12dafbdb1307f
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 27 22:42:52 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 27 22:42:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c55e07
7
8 www-servers/tomcat: removed unstable vulnerable
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 www-servers/tomcat/Manifest | 2 -
14 www-servers/tomcat/tomcat-7.0.99.ebuild | 146 --------------------------
15 www-servers/tomcat/tomcat-9.0.27.ebuild | 181 --------------------------------
16 3 files changed, 329 deletions(-)
17
18 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
19 index 347df409317..adf4e36cc3a 100644
20 --- a/www-servers/tomcat/Manifest
21 +++ b/www-servers/tomcat/Manifest
22 @@ -1,9 +1,7 @@
23 DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
24 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
25 -DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
26 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
27 DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
28 -DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
29 DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
30 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
31 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
32
33 diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
34 deleted file mode 100644
35 index 4df8f1204b9..00000000000
36 --- a/www-servers/tomcat/tomcat-7.0.99.ebuild
37 +++ /dev/null
38 @@ -1,146 +0,0 @@
39 -# Copyright 1999-2020 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -JAVA_PKG_IUSE="doc source test"
45 -
46 -inherit eutils java-pkg-2 java-ant-2 prefix user
47 -
48 -MY_P="apache-${P}-src"
49 -
50 -DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
51 -HOMEPAGE="https://tomcat.apache.org/"
52 -SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
53 -
54 -LICENSE="Apache-2.0"
55 -SLOT="7"
56 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
57 -IUSE="extra-webapps websockets"
58 -
59 -RESTRICT="test" # can we run them on a production system?
60 -
61 -ECJ_SLOT="4.5"
62 -SAPI_SLOT="3.0"
63 -
64 -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
65 - ~dev-java/tomcat-servlet-api-${PV}"
66 -RDEPEND="${COMMON_DEP}
67 - virtual/jre"
68 -DEPEND="${COMMON_DEP}
69 - virtual/jdk:1.8
70 - test? ( dev-java/ant-junit:0 )"
71 -
72 -S=${WORKDIR}/${MY_P}
73 -
74 -pkg_setup() {
75 - java-pkg-2_pkg_setup
76 - enewgroup tomcat 265
77 - enewuser tomcat 265 -1 /dev/null tomcat
78 -}
79 -
80 -src_prepare() {
81 - default
82 -
83 - # Remove bundled servlet-api
84 - rm -rv java/javax/{el,servlet} || die
85 -
86 - java-pkg_clean
87 -
88 - eapply "${FILESDIR}/${P}-build.xml.patch"
89 -
90 - # For use of catalina.sh in netbeans
91 - sed -i -e "/^# ----- Execute The Requested Command/ a\
92 - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
93 - bin/catalina.sh || die
94 -
95 - java-pkg-2_src_prepare
96 -}
97 -
98 -JAVA_ANT_REWRITE_CLASSPATH="true"
99 -
100 -EANT_BUILD_TARGET="deploy"
101 -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
102 -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
103 -EANT_NEEDS_TOOLS="true"
104 -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
105 -
106 -# revisions of the scripts
107 -IM_REV="-r1"
108 -INIT_REV="-r1"
109 -
110 -src_compile() {
111 - use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
112 - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
113 - java-pkg-2_src_compile
114 -}
115 -
116 -src_test() {
117 - java-pkg-2_src_test
118 -}
119 -
120 -src_install() {
121 - local dest="/usr/share/${PN}-${SLOT}"
122 -
123 - java-pkg_jarinto "${dest}"/bin
124 - java-pkg_dojar output/build/bin/*.jar
125 - exeinto "${dest}"/bin
126 - doexe output/build/bin/*.sh
127 -
128 - java-pkg_jarinto "${dest}"/lib
129 - java-pkg_dojar output/build/lib/*.jar
130 -
131 - dodoc RELEASE-NOTES RUNNING.txt
132 - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
133 - use source && java-pkg_dosrc java/*
134 -
135 - ### Webapps ###
136 -
137 - insinto "${dest}"/webapps
138 - doins -r output/build/webapps/{host-manager,manager,ROOT}
139 - use extra-webapps && doins -r output/build/webapps/{docs,examples}
140 -
141 - ### Config ###
142 -
143 - # create "logs" directory in $CATALINA_BASE
144 - # and set correct perms, see #458890
145 - dodir "${dest}"/logs
146 - fperms 0750 "${dest}"/logs
147 -
148 - # replace the default pw with a random one, see #92281
149 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
150 - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
151 -
152 - # prepend gentoo.classpath to common.loader, see #453212
153 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
154 -
155 - insinto "${dest}"
156 - doins -r output/build/conf
157 -
158 - ### rc ###
159 -
160 - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
161 - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
162 - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
163 -
164 - insinto "${dest}"/gentoo
165 - doins "${T}"/tomcat.conf
166 - exeinto "${dest}"/gentoo
167 - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
168 - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
169 -}
170 -
171 -pkg_postinst() {
172 - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
173 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
174 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
175 -
176 - elog "To manage Tomcat instances, run:"
177 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
178 -
179 - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
180 - ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
181 -
182 - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
183 - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
184 -}
185
186 diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild
187 deleted file mode 100644
188 index b8e080bf0d7..00000000000
189 --- a/www-servers/tomcat/tomcat-9.0.27.ebuild
190 +++ /dev/null
191 @@ -1,181 +0,0 @@
192 -# Copyright 1999-2020 Gentoo Authors
193 -# Distributed under the terms of the GNU General Public License v2
194 -
195 -EAPI=7
196 -
197 -JAVA_PKG_IUSE="doc source test"
198 -
199 -inherit eutils java-pkg-2 java-ant-2 prefix user
200 -
201 -MY_P="apache-${PN}-${PV}-src"
202 -
203 -# Currently we bundle binary versions of bnd.jar and bndlib.jar
204 -# See bugs #203080 and #676116
205 -BND_VERSION="4.1.0"
206 -BND="biz.aQute.bnd-${BND_VERSION}.jar"
207 -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
208 -
209 -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
210 -HOMEPAGE="https://tomcat.apache.org/"
211 -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
212 - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
213 - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
214 -
215 -LICENSE="Apache-2.0"
216 -SLOT="9"
217 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
218 -IUSE="extra-webapps"
219 -
220 -RESTRICT="test" # can we run them on a production system?
221 -
222 -ECJ_SLOT="4.13"
223 -SAPI_SLOT="4.0"
224 -
225 -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
226 - dev-java/glassfish-xmlrpc-api:0
227 - ~dev-java/tomcat-servlet-api-${PV}
228 - dev-java/wsdl4j:0"
229 -RDEPEND="${COMMON_DEP}
230 - >=virtual/jre-11"
231 -DEPEND="${COMMON_DEP}
232 - app-admin/pwgen
233 - >=dev-java/ant-core-1.9.13
234 - >=virtual/jdk-11
235 - test? (
236 - >=dev-java/ant-junit-1.9:0
237 - dev-java/easymock:3.2
238 - )"
239 -
240 -S=${WORKDIR}/${MY_P}
241 -
242 -BND_HOME="${S}/tomcat-build-libs/bnd"
243 -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
244 -BND_JAR="${BND_HOME}/${BND}"
245 -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
246 -
247 -src_unpack() {
248 - unpack ${MY_P}.tar.gz
249 -
250 - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
251 - ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
252 - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
253 -}
254 -
255 -pkg_setup() {
256 - java-pkg-2_pkg_setup
257 - enewgroup tomcat 265
258 - enewuser tomcat 265 -1 /dev/null tomcat
259 -}
260 -
261 -src_prepare() {
262 - default
263 -
264 - find -name '*.jar' -type f -delete -print || die
265 -
266 - # Remove bundled servlet-api
267 - rm -rv java/javax/{el,servlet} || die
268 -
269 - eapply "${FILESDIR}/${P}-build.xml.patch"
270 -
271 - # For use of catalina.sh in netbeans
272 - sed -i -e "/^# ----- Execute The Requested Command/ a\
273 - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
274 - bin/catalina.sh || die
275 -
276 - java-pkg-2_src_prepare
277 -}
278 -
279 -JAVA_ANT_REWRITE_CLASSPATH="true"
280 -
281 -EANT_BUILD_TARGET="deploy"
282 -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
283 -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
284 -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
285 -EANT_NEEDS_TOOLS="true"
286 -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
287 -
288 -# revisions of the scripts
289 -IM_REV="-r2"
290 -INIT_REV="-r1"
291 -
292 -src_compile() {
293 - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
294 - java-pkg-2_src_compile
295 -}
296 -
297 -src_test() {
298 - java-pkg-2_src_test
299 -}
300 -
301 -src_install() {
302 - local dest="/usr/share/${PN}-${SLOT}"
303 -
304 - java-pkg_jarinto "${dest}"/bin
305 - java-pkg_dojar output/build/bin/*.jar
306 - exeinto "${dest}"/bin
307 - doexe output/build/bin/*.sh
308 -
309 - java-pkg_jarinto "${dest}"/lib
310 - java-pkg_dojar output/build/lib/*.jar
311 -
312 - dodoc RELEASE-NOTES RUNNING.txt
313 - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
314 - use source && java-pkg_dosrc java/*
315 -
316 - ### Webapps ###
317 -
318 - # add missing docBase
319 - local apps="host-manager manager"
320 - for app in ${apps}; do
321 - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
322 - output/build/webapps/${app}/META-INF/context.xml || die
323 - done
324 -
325 - insinto "${dest}"/webapps
326 - doins -r output/build/webapps/{host-manager,manager,ROOT}
327 - use extra-webapps && doins -r output/build/webapps/{docs,examples}
328 -
329 - ### Config ###
330 -
331 - # create "logs" directory in $CATALINA_BASE
332 - # and set correct perms, see #458890
333 - dodir "${dest}"/logs
334 - fperms 0750 "${dest}"/logs
335 -
336 - # replace the default pw with a random one, see #92281
337 - local randpw="$(pwgen -s -B 15 1)"
338 - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
339 -
340 - # prepend gentoo.classpath to common.loader, see #453212
341 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
342 -
343 - insinto "${dest}"
344 - doins -r output/build/conf
345 -
346 - ### rc ###
347 -
348 - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
349 - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
350 - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
351 -
352 - insinto "${dest}"/gentoo
353 - doins "${T}"/tomcat.conf
354 - exeinto "${dest}"/gentoo
355 - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
356 - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
357 -}
358 -
359 -pkg_postinst() {
360 - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
361 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
362 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
363 -
364 - elog "To manage Tomcat instances, run:"
365 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
366 -
367 - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
368 - ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
369 -
370 - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
371 - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
372 -}