1 |
commit: 7a1e8a90fa8a09a84741dc8ef5f774d92ae8433c |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Tue Aug 24 12:38:22 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 24 12:38:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1e8a90 |
7 |
|
8 |
www-servers/resin: Remove last-rited package |
9 |
|
10 |
Bug: https://bugs.gentoo.org/781545 |
11 |
Closes: https://bugs.gentoo.org/674258 |
12 |
Closes: https://bugs.gentoo.org/771579 |
13 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
15 |
|
16 |
profiles/package.mask | 6 - |
17 |
www-servers/resin/Manifest | 1 - |
18 |
.../resin/files/resin-4.0.48-build.xml.patch | 59 ------- |
19 |
www-servers/resin/files/resin-4.0.48.conf | 16 -- |
20 |
www-servers/resin/files/resin-4.0.48.init | 36 ----- |
21 |
www-servers/resin/metadata.xml | 11 -- |
22 |
www-servers/resin/resin-4.0.48-r1.ebuild | 179 --------------------- |
23 |
7 files changed, 308 deletions(-) |
24 |
|
25 |
diff --git a/profiles/package.mask b/profiles/package.mask |
26 |
index e75bf562bc4..677f076878c 100644 |
27 |
--- a/profiles/package.mask |
28 |
+++ b/profiles/package.mask |
29 |
@@ -350,12 +350,6 @@ dev-java/jsr101 |
30 |
# Removal on 2021-08-06. Bug #803212. |
31 |
sys-kernel/bliss-kernel-bin |
32 |
|
33 |
-# Conrad Kostecki <conikost@g.o> (2021-07-23) |
34 |
-# Outdated and multiple bugs open. |
35 |
-# Other alternatives in tree available. |
36 |
-# Removal in 30 days (2021-08-22) |
37 |
-www-servers/resin |
38 |
- |
39 |
# Andrew Ammerlaan <andrewammerlaan@g.o> (2021-07-12) |
40 |
# Version 3.3.0 suffers from ridiculously high CPU usage, this version has |
41 |
# therefore been retracted upstream. |
42 |
|
43 |
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest |
44 |
deleted file mode 100644 |
45 |
index a6bcbc7275e..00000000000 |
46 |
--- a/www-servers/resin/Manifest |
47 |
+++ /dev/null |
48 |
@@ -1 +0,0 @@ |
49 |
-DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee |
50 |
|
51 |
diff --git a/www-servers/resin/files/resin-4.0.48-build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch |
52 |
deleted file mode 100644 |
53 |
index 5ef1abc63c5..00000000000 |
54 |
--- a/www-servers/resin/files/resin-4.0.48-build.xml.patch |
55 |
+++ /dev/null |
56 |
@@ -1,59 +0,0 @@ |
57 |
---- a/build.xml |
58 |
-+++ b/build.xml |
59 |
-@@ -12,7 +12,7 @@ |
60 |
- <property name="eclipse.home" value="${user.home}/eclipse"/> |
61 |
- |
62 |
- <target name="compile" |
63 |
-- depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper"> |
64 |
-+ depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae"> |
65 |
- </target> |
66 |
- |
67 |
- <!-- |
68 |
-@@ -27,10 +27,6 @@ |
69 |
- </antcall> |
70 |
- </target> |
71 |
- --> |
72 |
-- <target name="resin-eclipselink" depends="eclipselink"> |
73 |
-- <copy file="modules/eclipselink/dist/resin-eclipselink.jar" |
74 |
-- todir="${resin.lib}"/> |
75 |
-- </target> |
76 |
- |
77 |
- <target name="richfaces" depends="init"> |
78 |
- <antcall target="artifact" inheritRefs="true"> |
79 |
-@@ -92,13 +88,6 @@ |
80 |
- </antcall> |
81 |
- </target> |
82 |
- |
83 |
-- <target name="eclipselink" depends="init"> |
84 |
-- <antcall target="module" inheritRefs="true"> |
85 |
-- <param name="module.name" value="eclipselink"/> |
86 |
-- <param name="module.jar" value="resin-eclipselink.jar"/> |
87 |
-- </antcall> |
88 |
-- </target> |
89 |
-- |
90 |
- <!-- gae APIs for quercus testing --> |
91 |
- <target name="gae" depends="init"> |
92 |
- <antcall target="module" inheritRefs="true"> |
93 |
-@@ -437,13 +426,6 @@ |
94 |
- </antcall> |
95 |
- </target> |
96 |
- |
97 |
-- <target name="jasper" depends="init"> |
98 |
-- <antcall target="module" inheritRefs="true"> |
99 |
-- <param name="module.name" value="jasper"/> |
100 |
-- <param name="module.jar" value="resin-jasper.jar"/> |
101 |
-- </antcall> |
102 |
-- </target> |
103 |
-- |
104 |
- <target name="version"> |
105 |
- <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl" |
106 |
- tofile="${resin.modules}/kernel/src/com/caucho/Version.java" |
107 |
-@@ -903,7 +885,7 @@ |
108 |
- <delete dir="${dist}/${dist.name}"/> |
109 |
- </target> |
110 |
- |
111 |
-- <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/> |
112 |
-+ <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/> |
113 |
- |
114 |
- <target name="configure" depends="init"> |
115 |
- <copy tofile="modules/c/src/resin/Makefile.in" |
116 |
|
117 |
diff --git a/www-servers/resin/files/resin-4.0.48.conf b/www-servers/resin/files/resin-4.0.48.conf |
118 |
deleted file mode 100644 |
119 |
index a48840b5e9f..00000000000 |
120 |
--- a/www-servers/resin/files/resin-4.0.48.conf |
121 |
+++ /dev/null |
122 |
@@ -1,16 +0,0 @@ |
123 |
-# JVM Runtime |
124 |
-# Using the default setting, it will determine your JVM from the system-vm |
125 |
-# set using java-config. |
126 |
-# See java-config(1) manual page for assistance in determining this value. |
127 |
- |
128 |
-# You can override this value with whatever JDK you want. |
129 |
-# For a list of valid values for GENTOO_VM see output of |
130 |
-# java-config -L |
131 |
-#GENTOO_VM=sun-jdk-1.5 |
132 |
- |
133 |
-# Verbose starting and stopping? (yes/no, defaults to no) |
134 |
-#VERBOSE="yes" |
135 |
- |
136 |
-# Select which server will be started, this is an advanced feature, please refer |
137 |
-# to Resin documentation. |
138 |
-SERVER_ID="" |
139 |
|
140 |
diff --git a/www-servers/resin/files/resin-4.0.48.init b/www-servers/resin/files/resin-4.0.48.init |
141 |
deleted file mode 100644 |
142 |
index a0e5cfb49b6..00000000000 |
143 |
--- a/www-servers/resin/files/resin-4.0.48.init |
144 |
+++ /dev/null |
145 |
@@ -1,36 +0,0 @@ |
146 |
-#!/sbin/openrc-run |
147 |
-# Copyright 1999-2018 Gentoo Foundation |
148 |
-# Distributed under the terms of the GNU General Public License v2 |
149 |
- |
150 |
-depend() { |
151 |
- need net |
152 |
- use dns logger mysql postgresql |
153 |
-} |
154 |
- |
155 |
-runResin() { |
156 |
- JAVA_HOME=$(java-config -O) |
157 |
- [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) |
158 |
- export JAVA_HOME |
159 |
- |
160 |
- local extraArgs= |
161 |
- if [ "${VERBOSE}" = "yes" ]; then |
162 |
- extraArgs="-verbose" |
163 |
- fi |
164 |
- |
165 |
- local msg="${1}" |
166 |
- shift |
167 |
- |
168 |
- local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}" |
169 |
- |
170 |
- ebegin "${msg}" |
171 |
- su - resin -c "${cmdline}" |
172 |
- eend $? |
173 |
-} |
174 |
- |
175 |
-start() { |
176 |
- runResin "Starting Resin" "start" |
177 |
-} |
178 |
- |
179 |
-stop() { |
180 |
- runResin "Stopping Resin" "shutdown" |
181 |
-} |
182 |
|
183 |
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml |
184 |
deleted file mode 100644 |
185 |
index 42183598824..00000000000 |
186 |
--- a/www-servers/resin/metadata.xml |
187 |
+++ /dev/null |
188 |
@@ -1,11 +0,0 @@ |
189 |
-<?xml version="1.0" encoding="UTF-8"?> |
190 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
191 |
-<pkgmetadata> |
192 |
- <maintainer type="project"> |
193 |
- <email>java@g.o</email> |
194 |
- <name>Java</name> |
195 |
- </maintainer> |
196 |
- <use> |
197 |
- <flag name="admin">Enable Resin admin webapp</flag> |
198 |
- </use> |
199 |
-</pkgmetadata> |
200 |
|
201 |
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild |
202 |
deleted file mode 100644 |
203 |
index a0c767c6628..00000000000 |
204 |
--- a/www-servers/resin/resin-4.0.48-r1.ebuild |
205 |
+++ /dev/null |
206 |
@@ -1,179 +0,0 @@ |
207 |
-# Copyright 1999-2021 Gentoo Authors |
208 |
-# Distributed under the terms of the GNU General Public License v2 |
209 |
- |
210 |
-EAPI="5" |
211 |
- |
212 |
-JAVA_PKG_IUSE="source" |
213 |
- |
214 |
-inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user |
215 |
- |
216 |
-DESCRIPTION="A fast Servlet and JSP engine" |
217 |
-HOMEPAGE="http://www.caucho.com" |
218 |
-SRC_URI="http://www.caucho.com/download/${P}-src.zip" |
219 |
- |
220 |
-LICENSE="GPL-2" |
221 |
-SLOT="0" |
222 |
-IUSE="admin doc" |
223 |
- |
224 |
-KEYWORDS="~amd64 ~x86" |
225 |
- |
226 |
-CDEPEND=" |
227 |
- dev-java/jsr101:0 |
228 |
- dev-java/mojarra:2.2 |
229 |
- dev-java/oracle-javamail:0 |
230 |
- dev-java/validation-api:1.0 |
231 |
- dev-java/resin-servlet-api:3.1 |
232 |
- dev-java/glassfish-xmlrpc-api:0 |
233 |
- dev-java/glassfish-deployment-api:1.2" |
234 |
- |
235 |
-RDEPEND=" |
236 |
- ${CDEPEND} |
237 |
- >=virtual/jre-1.6" |
238 |
- |
239 |
-DEPEND=" |
240 |
- ${CDEPEND} |
241 |
- app-arch/unzip |
242 |
- dev-libs/openssl |
243 |
- >=virtual/jdk-1.6 |
244 |
- dev-java/ant-core:0" |
245 |
- |
246 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
247 |
- |
248 |
-EANT_GENTOO_CLASSPATH=" |
249 |
- jsr101 |
250 |
- mojarra-2.2 |
251 |
- oracle-javamail |
252 |
- validation-api-1.0 |
253 |
- glassfish-xmlrpc-api |
254 |
- resin-servlet-api-3.1 |
255 |
- glassfish-deployment-api-1.2 |
256 |
-" |
257 |
- |
258 |
-PATCHES=( |
259 |
- "${FILESDIR}"/${PN}-4.0.48-build.xml.patch |
260 |
-) |
261 |
- |
262 |
-pkg_setup() { |
263 |
- export RESIN_HOME="/usr/$(get_libdir)/resin" |
264 |
- java-pkg-2_pkg_setup |
265 |
- enewgroup resin |
266 |
- enewuser resin -1 /bin/bash "${RESIN_HOME}" resin |
267 |
-} |
268 |
- |
269 |
-src_prepare() { |
270 |
- epatch "${PATCHES[@]}" |
271 |
- |
272 |
- # No bundled JARs! |
273 |
- rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die |
274 |
- |
275 |
- java-ant_bsfix_one "${S}/build.xml" |
276 |
- java-ant_bsfix_one "${S}/build-common.xml" |
277 |
- |
278 |
- rm -rv lib/* || die |
279 |
- |
280 |
- ln -s $(java-config --jdk-home)/lib/tools.jar || die |
281 |
-} |
282 |
- |
283 |
-src_configure() { |
284 |
- append-flags -fPIC -DPIC |
285 |
- |
286 |
- chmod 755 "${S}/configure" || die |
287 |
- econf --prefix=${RESIN_HOME} |
288 |
-} |
289 |
- |
290 |
-src_compile() { |
291 |
- einfo "Building libraries..." |
292 |
- emake |
293 |
- |
294 |
- einfo "Building jars..." |
295 |
- eant || die "ant failed" |
296 |
-} |
297 |
- |
298 |
-src_install() { |
299 |
- emake DESTDIR="${D}" install |
300 |
- |
301 |
- einfo "Moving configuration to /etc ..." |
302 |
- dodir /etc/ |
303 |
- mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die |
304 |
- dosym /etc/resin ${RESIN_HOME}/conf |
305 |
- |
306 |
- einfo "Rewriting resin.xml ..." |
307 |
- sed -i \ |
308 |
- -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \ |
309 |
- -e 's,${resin.root}/doc/admin,webapps/admin,' \ |
310 |
- "${D}/etc/resin/resin.xml" || die |
311 |
- |
312 |
- einfo "Fixing log directory ..." |
313 |
- rm -rv "${D}/${RESIN_HOME}"/log || die |
314 |
- keepdir /var/log/resin |
315 |
- dosym /var/log/resin ${RESIN_HOME}/log |
316 |
- |
317 |
- einfo "Installing basic documentation ..." |
318 |
- dodoc README "${S}"/conf/*.xml |
319 |
- |
320 |
- einfo "Installing init.d script ..." |
321 |
- newinitd "${FILESDIR}/${PN}-4.0.48.init" resin |
322 |
- newconfd "${FILESDIR}/${PN}-4.0.48.conf" resin |
323 |
- |
324 |
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die |
325 |
- |
326 |
- einfo "Fixing location of jars ..." |
327 |
- #rm -v "${S}"/lib/tools.jar || die |
328 |
- java-pkg_dojar "${S}"/lib/*.jar |
329 |
- rm -rv "${D}/${RESIN_HOME}"/lib || die |
330 |
- dosym /usr/share/resin/lib ${RESIN_HOME}/lib |
331 |
- |
332 |
- dodir /var/lib/resin/webapps |
333 |
- keepdir /var/lib/resin/hosts |
334 |
- keepdir /var/lib/resin/resin-data |
335 |
- keepdir /var/lib/resin/watchdog-data |
336 |
- |
337 |
- mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || die |
338 |
- rm -rv "${D}/${RESIN_HOME}"/webapps || die |
339 |
- dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps |
340 |
- dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts |
341 |
- dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data |
342 |
- dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data |
343 |
- |
344 |
- dosym \ |
345 |
- "$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \ |
346 |
- "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" |
347 |
- |
348 |
- use admin && { |
349 |
- einfo "Installing administration app ..." |
350 |
- cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die |
351 |
- } |
352 |
- use doc && { |
353 |
- einfo "Installing documentation app ..." |
354 |
- cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die |
355 |
- } |
356 |
- |
357 |
- use source && { |
358 |
- einfo "Installing sources ..." |
359 |
- java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null |
360 |
- } |
361 |
- |
362 |
- einfo "Removing stale directories ..." |
363 |
- rm -rv "${D}/${RESIN_HOME}"/{bin,doc} || die |
364 |
- #rm -rv "${D}"/etc/resin/*.orig || die |
365 |
- |
366 |
- einfo "Fixing ownerships and permissions ..." |
367 |
- fowners -R 0:root / |
368 |
- fowners -R resin:resin /etc/resin |
369 |
- fowners -R resin:resin /var/lib/resin |
370 |
- fowners -R resin:resin /var/log/resin |
371 |
- |
372 |
- fperms 644 /etc/conf.d/resin |
373 |
- fperms 755 /etc/init.d/resin |
374 |
- fperms 750 /var/lib/resin |
375 |
- fperms 750 /etc/resin |
376 |
-} |
377 |
- |
378 |
-pkg_postinst() { |
379 |
- elog |
380 |
- elog " User and group 'resin' have been added." |
381 |
- elog |
382 |
- elog " By default, Resin runs on port 8080. You can change this" |
383 |
- elog " value by editing /etc/resin/resin.properties." |
384 |
- elog |
385 |
-} |