1 |
commit: 060de4ace6f2d732b38df20f2c871b860314c061 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 14 18:08:09 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 14 18:08:09 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060de4ac |
7 |
|
8 |
www-servers/tomcat: removed security affected version |
9 |
|
10 |
Bug: https://bugs.gentoo.org/818160 |
11 |
Package-Manager: Portage-3.0.28, 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.70.ebuild | 159 -------------------------------- |
16 |
2 files changed, 160 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
19 |
index 468e90ceb9d..fff8845126b 100644 |
20 |
--- a/www-servers/tomcat/Manifest |
21 |
+++ b/www-servers/tomcat/Manifest |
22 |
@@ -1,6 +1,5 @@ |
23 |
DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b |
24 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
25 |
-DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133 |
26 |
DIST apache-tomcat-8.5.72-src.tar.gz 5954383 BLAKE2B ddf342e3bb604ffd5d70e9b822a110654434aac0da0bd28e8649a0ce312706c202f48077ee18f43398d91bc000ea5287d87e0fd2bda9d2c8493e1b6b012945fc SHA512 69c27076d193a874416c83a1dcb80f71af78cb201b0990795d389f0a389e0537749b62256408c6249031abd2e62f268c8b451328284dbbff50a457937cfa6f6d |
27 |
DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b |
28 |
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
29 |
|
30 |
diff --git a/www-servers/tomcat/tomcat-8.5.70.ebuild b/www-servers/tomcat/tomcat-8.5.70.ebuild |
31 |
deleted file mode 100644 |
32 |
index 0d566b00a7b..00000000000 |
33 |
--- a/www-servers/tomcat/tomcat-8.5.70.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,159 +0,0 @@ |
36 |
-# Copyright 1999-2021 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 java-pkg-2 java-ant-2 prefix |
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 |
- acct-group/tomcat |
65 |
- acct-user/tomcat |
66 |
- virtual/jre" |
67 |
-DEPEND="${COMMON_DEP} |
68 |
- app-admin/pwgen |
69 |
- dev-java/ant-core |
70 |
- virtual/jdk:1.8 |
71 |
- doc? ( |
72 |
- dev-java/glassfish-xmlrpc-api:0 |
73 |
- dev-java/wsdl4j:0 |
74 |
- ) |
75 |
- test? ( |
76 |
- >=dev-java/ant-junit-1.9:0 |
77 |
- dev-java/easymock:3.2 |
78 |
- )" |
79 |
- |
80 |
-S=${WORKDIR}/${MY_P} |
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.66-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 --with-dependencies --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 |
- 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)" |
116 |
- LC_ALL=C java-pkg-2_src_compile |
117 |
-} |
118 |
- |
119 |
-src_test() { |
120 |
- java-pkg-2_src_test |
121 |
-} |
122 |
- |
123 |
-src_install() { |
124 |
- local dest="/usr/share/${PN}-${SLOT}" |
125 |
- |
126 |
- java-pkg_jarinto "${dest}"/bin |
127 |
- java-pkg_dojar output/build/bin/*.jar |
128 |
- exeinto "${dest}"/bin |
129 |
- doexe output/build/bin/*.sh |
130 |
- |
131 |
- java-pkg_jarinto "${dest}"/lib |
132 |
- java-pkg_dojar output/build/lib/*.jar |
133 |
- |
134 |
- dodoc RELEASE-NOTES RUNNING.txt |
135 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
136 |
- use source && java-pkg_dosrc java/* |
137 |
- |
138 |
- ### Webapps ### |
139 |
- |
140 |
- # add missing docBase |
141 |
- local apps="host-manager manager" |
142 |
- for app in ${apps}; do |
143 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
144 |
- output/build/webapps/${app}/META-INF/context.xml || die |
145 |
- done |
146 |
- |
147 |
- insinto "${dest}"/webapps |
148 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
149 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
150 |
- |
151 |
- ### Config ### |
152 |
- |
153 |
- # create "logs" directory in $CATALINA_BASE |
154 |
- # and set correct perms, see #458890 |
155 |
- dodir "${dest}"/logs |
156 |
- fperms 0750 "${dest}"/logs |
157 |
- |
158 |
- # replace the default pw with a random one, see #92281 |
159 |
- local randpw="$(pwgen -s -B 15 1)" |
160 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
161 |
- |
162 |
- # prepend gentoo.classpath to common.loader, see #453212 |
163 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
164 |
- |
165 |
- insinto "${dest}" |
166 |
- doins -r output/build/conf |
167 |
- |
168 |
- ### rc ### |
169 |
- |
170 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
171 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
172 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
173 |
- |
174 |
- insinto "${dest}"/gentoo |
175 |
- doins "${T}"/tomcat.conf |
176 |
- exeinto "${dest}"/gentoo |
177 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
178 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
179 |
-} |
180 |
- |
181 |
-pkg_postinst() { |
182 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
183 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
184 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
185 |
- |
186 |
- elog "To manage Tomcat instances, run:" |
187 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
188 |
- |
189 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
190 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
191 |
- |
192 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
193 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
194 |
-} |