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