1 |
commit: 5bcc9c6d58cdb866b780a7d3adcc536ba19862c8 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 27 22:11:40 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 27 22:11:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcc9c6d |
7 |
|
8 |
www-servers/tomcat: bump to 8.5.51 |
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 | 1 + |
14 |
www-servers/tomcat/tomcat-8.5.51.ebuild | 158 ++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 159 insertions(+) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index ac01790144f..b05144c0369 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d |
22 |
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 |
23 |
DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 |
24 |
DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 |
25 |
+DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592 |
26 |
DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 |
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-8.5.51.ebuild b/www-servers/tomcat/tomcat-8.5.51.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..4bdde891a68 |
33 |
--- /dev/null |
34 |
+++ b/www-servers/tomcat/tomcat-8.5.51.ebuild |
35 |
@@ -0,0 +1,158 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
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-${P}-src" |
46 |
+ |
47 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
48 |
+HOMEPAGE="https://tomcat.apache.org/" |
49 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
50 |
+ |
51 |
+LICENSE="Apache-2.0" |
52 |
+SLOT="8.5" |
53 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
54 |
+IUSE="extra-webapps" |
55 |
+ |
56 |
+RESTRICT="test" # can we run them on a production system? |
57 |
+ |
58 |
+ECJ_SLOT="4.5" |
59 |
+SAPI_SLOT="3.1" |
60 |
+ |
61 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
62 |
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
63 |
+RDEPEND="${COMMON_DEP} |
64 |
+ virtual/jre" |
65 |
+DEPEND="${COMMON_DEP} |
66 |
+ app-admin/pwgen |
67 |
+ >=dev-java/ant-core-1.9.13 |
68 |
+ virtual/jdk:1.8 |
69 |
+ test? ( |
70 |
+ >=dev-java/ant-junit-1.9:0 |
71 |
+ dev-java/easymock:3.2 |
72 |
+ )" |
73 |
+ |
74 |
+S=${WORKDIR}/${MY_P} |
75 |
+ |
76 |
+pkg_setup() { |
77 |
+ java-pkg-2_pkg_setup |
78 |
+ enewgroup tomcat 265 |
79 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
80 |
+} |
81 |
+ |
82 |
+src_prepare() { |
83 |
+ default |
84 |
+ |
85 |
+ find -name '*.jar' -type f -delete -print || die |
86 |
+ |
87 |
+ # Remove bundled servlet-api |
88 |
+ rm -rv java/javax/{el,servlet} || die |
89 |
+ |
90 |
+ eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch" |
91 |
+ |
92 |
+ # For use of catalina.sh in netbeans |
93 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
94 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
95 |
+ bin/catalina.sh || die |
96 |
+ |
97 |
+ java-pkg-2_src_prepare |
98 |
+} |
99 |
+ |
100 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
101 |
+ |
102 |
+EANT_BUILD_TARGET="deploy" |
103 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
104 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
105 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
106 |
+EANT_NEEDS_TOOLS="true" |
107 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
108 |
+ |
109 |
+# revisions of the scripts |
110 |
+IM_REV="-r2" |
111 |
+INIT_REV="-r1" |
112 |
+ |
113 |
+src_compile() { |
114 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.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 |
+} |