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: Mon, 19 Aug 2019 08:47:23
Message-Id: 1566204432.d7fde3dc6727c2cd15d2f4bdcf3bded7da297cbe.fordfrog@gentoo
1 commit: d7fde3dc6727c2cd15d2f4bdcf3bded7da297cbe
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 19 08:46:46 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 19 08:47:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fde3dc
7
8 www-servers/tomcat-9.0.24: bump
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 www-servers/tomcat/Manifest | 1 +
14 www-servers/tomcat/tomcat-9.0.24.ebuild | 182 ++++++++++++++++++++++++++++++++
15 2 files changed, 183 insertions(+)
16
17 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
18 index 48235d259ff..ac5bada1ffc 100644
19 --- a/www-servers/tomcat/Manifest
20 +++ b/www-servers/tomcat/Manifest
21 @@ -5,6 +5,7 @@ DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3
22 DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
23 DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
24 DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
25 +DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
26 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
27 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
28 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
29
30 diff --git a/www-servers/tomcat/tomcat-9.0.24.ebuild b/www-servers/tomcat/tomcat-9.0.24.ebuild
31 new file mode 100644
32 index 00000000000..653707b85ff
33 --- /dev/null
34 +++ b/www-servers/tomcat/tomcat-9.0.24.ebuild
35 @@ -0,0 +1,182 @@
36 +# Copyright 1999-2019 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=6
40 +
41 +JAVA_PKG_IUSE="doc source test"
42 +
43 +inherit eutils java-pkg-2 java-ant-2 prefix user
44 +
45 +MY_P="apache-${PN}-${PV}-src"
46 +
47 +# Currently we bundle binary versions of bnd.jar and bndlib.jar
48 +# See bugs #203080 and #676116
49 +BND_VERSION="4.1.0"
50 +BND="biz.aQute.bnd-${BND_VERSION}.jar"
51 +BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
52 +
53 +DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
54 +HOMEPAGE="https://tomcat.apache.org/"
55 +SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
56 + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
57 + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
58 +
59 +LICENSE="Apache-2.0"
60 +SLOT="9"
61 +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
62 +IUSE="extra-webapps"
63 +
64 +RESTRICT="test" # can we run them on a production system?
65 +
66 +ECJ_SLOT="4.10"
67 +SAPI_SLOT="4.0"
68 +
69 +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
70 + dev-java/glassfish-xmlrpc-api:0
71 + dev-java/tomcat-servlet-api:${SAPI_SLOT}
72 + dev-java/wsdl4j:0"
73 +RDEPEND="${COMMON_DEP}
74 + !<dev-java/tomcat-native-1.1.24
75 + >=virtual/jre-11"
76 +DEPEND="${COMMON_DEP}
77 + app-admin/pwgen
78 + >=dev-java/ant-core-1.9.13
79 + >=virtual/jdk-11
80 + test? (
81 + >=dev-java/ant-junit-1.9:0
82 + dev-java/easymock:3.2
83 + )"
84 +
85 +S=${WORKDIR}/${MY_P}
86 +
87 +BND_HOME="${S}/tomcat-build-libs/bnd"
88 +BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
89 +BND_JAR="${BND_HOME}/${BND}"
90 +BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
91 +
92 +src_unpack() {
93 + unpack ${MY_P}.tar.gz
94 +
95 + mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
96 + ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
97 + ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
98 +}
99 +
100 +pkg_setup() {
101 + java-pkg-2_pkg_setup
102 + enewgroup tomcat 265
103 + enewuser tomcat 265 -1 /dev/null tomcat
104 +}
105 +
106 +src_prepare() {
107 + default
108 +
109 + find -name '*.jar' -type f -delete -print || die
110 +
111 + # Remove bundled servlet-api
112 + rm -rv java/javax/{el,servlet} || die
113 +
114 + eapply "${FILESDIR}/${PN}-9.0.19-build.xml.patch"
115 +
116 + # For use of catalina.sh in netbeans
117 + sed -i -e "/^# ----- Execute The Requested Command/ a\
118 + CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
119 + bin/catalina.sh || die
120 +
121 + java-pkg-2_src_prepare
122 +}
123 +
124 +JAVA_ANT_REWRITE_CLASSPATH="true"
125 +
126 +EANT_BUILD_TARGET="deploy"
127 +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
128 +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
129 +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
130 +EANT_NEEDS_TOOLS="true"
131 +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
132 +
133 +# revisions of the scripts
134 +IM_REV="-r2"
135 +INIT_REV="-r1"
136 +
137 +src_compile() {
138 + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
139 + java-pkg-2_src_compile
140 +}
141 +
142 +src_test() {
143 + java-pkg-2_src_test
144 +}
145 +
146 +src_install() {
147 + local dest="/usr/share/${PN}-${SLOT}"
148 +
149 + java-pkg_jarinto "${dest}"/bin
150 + java-pkg_dojar output/build/bin/*.jar
151 + exeinto "${dest}"/bin
152 + doexe output/build/bin/*.sh
153 +
154 + java-pkg_jarinto "${dest}"/lib
155 + java-pkg_dojar output/build/lib/*.jar
156 +
157 + dodoc RELEASE-NOTES RUNNING.txt
158 + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
159 + use source && java-pkg_dosrc java/*
160 +
161 + ### Webapps ###
162 +
163 + # add missing docBase
164 + local apps="host-manager manager"
165 + for app in ${apps}; do
166 + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
167 + output/build/webapps/${app}/META-INF/context.xml || die
168 + done
169 +
170 + insinto "${dest}"/webapps
171 + doins -r output/build/webapps/{host-manager,manager,ROOT}
172 + use extra-webapps && doins -r output/build/webapps/{docs,examples}
173 +
174 + ### Config ###
175 +
176 + # create "logs" directory in $CATALINA_BASE
177 + # and set correct perms, see #458890
178 + dodir "${dest}"/logs
179 + fperms 0750 "${dest}"/logs
180 +
181 + # replace the default pw with a random one, see #92281
182 + local randpw="$(pwgen -s -B 15 1)"
183 + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
184 +
185 + # prepend gentoo.classpath to common.loader, see #453212
186 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
187 +
188 + insinto "${dest}"
189 + doins -r output/build/conf
190 +
191 + ### rc ###
192 +
193 + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
194 + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
195 + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
196 +
197 + insinto "${dest}"/gentoo
198 + doins "${T}"/tomcat.conf
199 + exeinto "${dest}"/gentoo
200 + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
201 + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
202 +}
203 +
204 +pkg_postinst() {
205 + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
206 + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
207 + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
208 +
209 + elog "To manage Tomcat instances, run:"
210 + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
211 +
212 + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
213 + ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
214 +
215 + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
216 + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
217 +}