1 |
commit: 0dd49a07f535a2880f54d39fc3d87e86572a47a2 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 17:00:34 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 17:00:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd49a07 |
7 |
|
8 |
www-servers/tomcat: removed vulnerable 8.5.57-r1 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/747970 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
www-servers/tomcat/Manifest | 1 - |
15 |
www-servers/tomcat/tomcat-8.5.57-r1.ebuild | 163 ----------------------------- |
16 |
2 files changed, 164 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
19 |
index 13f522bbfbc..135d5730598 100644 |
20 |
--- a/www-servers/tomcat/Manifest |
21 |
+++ b/www-servers/tomcat/Manifest |
22 |
@@ -1,6 +1,5 @@ |
23 |
DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2 |
24 |
DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573 |
25 |
-DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60 |
26 |
DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05 |
27 |
DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626 |
28 |
DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b |
29 |
|
30 |
diff --git a/www-servers/tomcat/tomcat-8.5.57-r1.ebuild b/www-servers/tomcat/tomcat-8.5.57-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 3ab7947a19c..00000000000 |
33 |
--- a/www-servers/tomcat/tomcat-8.5.57-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,163 +0,0 @@ |
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 |
- doc? ( |
70 |
- dev-java/glassfish-xmlrpc-api:0 |
71 |
- dev-java/wsdl4j:0 |
72 |
- ) |
73 |
- test? ( |
74 |
- >=dev-java/ant-junit-1.9:0 |
75 |
- dev-java/easymock:3.2 |
76 |
- )" |
77 |
- |
78 |
-S=${WORKDIR}/${MY_P} |
79 |
- |
80 |
-pkg_setup() { |
81 |
- java-pkg-2_pkg_setup |
82 |
- enewgroup tomcat 265 |
83 |
- enewuser tomcat 265 -1 /dev/null tomcat |
84 |
-} |
85 |
- |
86 |
-src_prepare() { |
87 |
- default |
88 |
- |
89 |
- find -name '*.jar' -type f -delete -print || die |
90 |
- |
91 |
- # Remove bundled servlet-api |
92 |
- rm -rv java/javax/{el,servlet} || die |
93 |
- |
94 |
- eapply "${FILESDIR}/${P}-build.xml.patch" |
95 |
- |
96 |
- # For use of catalina.sh in netbeans |
97 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
98 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
99 |
- bin/catalina.sh || die |
100 |
- |
101 |
- java-pkg-2_src_prepare |
102 |
-} |
103 |
- |
104 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
105 |
- |
106 |
-EANT_BUILD_TARGET="deploy" |
107 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
108 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
109 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
110 |
-EANT_NEEDS_TOOLS="true" |
111 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
112 |
- |
113 |
-# revisions of the scripts |
114 |
-IM_REV="-r2" |
115 |
-INIT_REV="-r1" |
116 |
- |
117 |
-src_compile() { |
118 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
119 |
- 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)" |
120 |
- java-pkg-2_src_compile |
121 |
-} |
122 |
- |
123 |
-src_test() { |
124 |
- java-pkg-2_src_test |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- local dest="/usr/share/${PN}-${SLOT}" |
129 |
- |
130 |
- java-pkg_jarinto "${dest}"/bin |
131 |
- java-pkg_dojar output/build/bin/*.jar |
132 |
- exeinto "${dest}"/bin |
133 |
- doexe output/build/bin/*.sh |
134 |
- |
135 |
- java-pkg_jarinto "${dest}"/lib |
136 |
- java-pkg_dojar output/build/lib/*.jar |
137 |
- |
138 |
- dodoc RELEASE-NOTES RUNNING.txt |
139 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
140 |
- use source && java-pkg_dosrc java/* |
141 |
- |
142 |
- ### Webapps ### |
143 |
- |
144 |
- # add missing docBase |
145 |
- local apps="host-manager manager" |
146 |
- for app in ${apps}; do |
147 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
148 |
- output/build/webapps/${app}/META-INF/context.xml || die |
149 |
- done |
150 |
- |
151 |
- insinto "${dest}"/webapps |
152 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
153 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
154 |
- |
155 |
- ### Config ### |
156 |
- |
157 |
- # create "logs" directory in $CATALINA_BASE |
158 |
- # and set correct perms, see #458890 |
159 |
- dodir "${dest}"/logs |
160 |
- fperms 0750 "${dest}"/logs |
161 |
- |
162 |
- # replace the default pw with a random one, see #92281 |
163 |
- local randpw="$(pwgen -s -B 15 1)" |
164 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
165 |
- |
166 |
- # prepend gentoo.classpath to common.loader, see #453212 |
167 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
168 |
- |
169 |
- insinto "${dest}" |
170 |
- doins -r output/build/conf |
171 |
- |
172 |
- ### rc ### |
173 |
- |
174 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
175 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
176 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
177 |
- |
178 |
- insinto "${dest}"/gentoo |
179 |
- doins "${T}"/tomcat.conf |
180 |
- exeinto "${dest}"/gentoo |
181 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
182 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
183 |
-} |
184 |
- |
185 |
-pkg_postinst() { |
186 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
187 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
188 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
189 |
- |
190 |
- elog "To manage Tomcat instances, run:" |
191 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
192 |
- |
193 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
194 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
195 |
- |
196 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
197 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
198 |
-} |