1 |
commit: 3fb737f93ec72b191d4985bce5a0d25504489046 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 04:54:40 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 04:54:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb737f9 |
7 |
|
8 |
www-servers/tomcat: removed vulnerable 8.5.55 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/729668 |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
www-servers/tomcat/Manifest | 1 - |
15 |
www-servers/tomcat/tomcat-8.5.55.ebuild | 158 -------------------------------- |
16 |
2 files changed, 159 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
19 |
index 64555f749fb..c7d7008579a 100644 |
20 |
--- a/www-servers/tomcat/Manifest |
21 |
+++ b/www-servers/tomcat/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257 |
24 |
-DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d |
25 |
DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d |
26 |
DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b |
27 |
DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef |
28 |
|
29 |
diff --git a/www-servers/tomcat/tomcat-8.5.55.ebuild b/www-servers/tomcat/tomcat-8.5.55.ebuild |
30 |
deleted file mode 100644 |
31 |
index 688cb761576..00000000000 |
32 |
--- a/www-servers/tomcat/tomcat-8.5.55.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,158 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-JAVA_PKG_IUSE="doc source test" |
41 |
- |
42 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
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 |
- virtual/jre" |
64 |
-DEPEND="${COMMON_DEP} |
65 |
- app-admin/pwgen |
66 |
- >=dev-java/ant-core-1.9.13 |
67 |
- virtual/jdk:1.8 |
68 |
- test? ( |
69 |
- >=dev-java/ant-junit-1.9:0 |
70 |
- dev-java/easymock:3.2 |
71 |
- )" |
72 |
- |
73 |
-S=${WORKDIR}/${MY_P} |
74 |
- |
75 |
-pkg_setup() { |
76 |
- java-pkg-2_pkg_setup |
77 |
- enewgroup tomcat 265 |
78 |
- enewuser tomcat 265 -1 /dev/null tomcat |
79 |
-} |
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.47-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 --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 |
- java-pkg-2_src_compile |
115 |
-} |
116 |
- |
117 |
-src_test() { |
118 |
- java-pkg-2_src_test |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- local dest="/usr/share/${PN}-${SLOT}" |
123 |
- |
124 |
- java-pkg_jarinto "${dest}"/bin |
125 |
- java-pkg_dojar output/build/bin/*.jar |
126 |
- exeinto "${dest}"/bin |
127 |
- doexe output/build/bin/*.sh |
128 |
- |
129 |
- java-pkg_jarinto "${dest}"/lib |
130 |
- java-pkg_dojar output/build/lib/*.jar |
131 |
- |
132 |
- dodoc RELEASE-NOTES RUNNING.txt |
133 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
134 |
- use source && java-pkg_dosrc java/* |
135 |
- |
136 |
- ### Webapps ### |
137 |
- |
138 |
- # add missing docBase |
139 |
- local apps="host-manager manager" |
140 |
- for app in ${apps}; do |
141 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
142 |
- output/build/webapps/${app}/META-INF/context.xml || die |
143 |
- done |
144 |
- |
145 |
- insinto "${dest}"/webapps |
146 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
147 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
148 |
- |
149 |
- ### Config ### |
150 |
- |
151 |
- # create "logs" directory in $CATALINA_BASE |
152 |
- # and set correct perms, see #458890 |
153 |
- dodir "${dest}"/logs |
154 |
- fperms 0750 "${dest}"/logs |
155 |
- |
156 |
- # replace the default pw with a random one, see #92281 |
157 |
- local randpw="$(pwgen -s -B 15 1)" |
158 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
159 |
- |
160 |
- # prepend gentoo.classpath to common.loader, see #453212 |
161 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
162 |
- |
163 |
- insinto "${dest}" |
164 |
- doins -r output/build/conf |
165 |
- |
166 |
- ### rc ### |
167 |
- |
168 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
169 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
170 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
171 |
- |
172 |
- insinto "${dest}"/gentoo |
173 |
- doins "${T}"/tomcat.conf |
174 |
- exeinto "${dest}"/gentoo |
175 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
176 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
177 |
-} |
178 |
- |
179 |
-pkg_postinst() { |
180 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
181 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
182 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
183 |
- |
184 |
- elog "To manage Tomcat instances, run:" |
185 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
186 |
- |
187 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
188 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
189 |
- |
190 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
191 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
192 |
-} |