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