1 |
commit: 492fed03d2aa1f1d39a9b16d0b0ebba73ae7bc6c |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 1 11:48:27 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 11:48:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492fed03 |
7 |
|
8 |
www-servers/tomcat: bump to 8.5.78 |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
www-servers/tomcat/Manifest | 1 + |
13 |
www-servers/tomcat/tomcat-8.5.78.ebuild | 159 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 160 insertions(+) |
15 |
|
16 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
17 |
index 01d590f0b07f..b96dcd3d82c4 100644 |
18 |
--- a/www-servers/tomcat/Manifest |
19 |
+++ b/www-servers/tomcat/Manifest |
20 |
@@ -6,6 +6,7 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88 |
21 |
DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad |
22 |
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9 |
23 |
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 |
24 |
+DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 |
25 |
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
26 |
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 |
27 |
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
28 |
|
29 |
diff --git a/www-servers/tomcat/tomcat-8.5.78.ebuild b/www-servers/tomcat/tomcat-8.5.78.ebuild |
30 |
new file mode 100644 |
31 |
index 000000000000..67b6462910bf |
32 |
--- /dev/null |
33 |
+++ b/www-servers/tomcat/tomcat-8.5.78.ebuild |
34 |
@@ -0,0 +1,159 @@ |
35 |
+# Copyright 1999-2022 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=8 |
39 |
+ |
40 |
+JAVA_PKG_IUSE="doc source test" |
41 |
+ |
42 |
+inherit 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-1.8:*" |
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.66-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 |
+ LC_ALL=C 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 |
+} |