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