[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/, profiles/
commit: 7a1e8a90fa8a09a84741dc8ef5f774d92ae8433c
Author: Jakov Smolic sartura hr>
AuthorDate: Tue Aug 24 12:38:22 2021 +
Commit: David Seifert gentoo org>
CommitDate: Tue Aug 24 12:38:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1e8a90
www-servers/resin: Remove last-rited package
Bug: https://bugs.gentoo.org/781545
Closes: https://bugs.gentoo.org/674258
Closes: https://bugs.gentoo.org/771579
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
profiles/package.mask | 6 -
www-servers/resin/Manifest | 1 -
.../resin/files/resin-4.0.48-build.xml.patch | 59 ---
www-servers/resin/files/resin-4.0.48.conf | 16 --
www-servers/resin/files/resin-4.0.48.init | 36 -
www-servers/resin/metadata.xml | 11 --
www-servers/resin/resin-4.0.48-r1.ebuild | 179 -
7 files changed, 308 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index e75bf562bc4..677f076878c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -350,12 +350,6 @@ dev-java/jsr101
# Removal on 2021-08-06. Bug #803212.
sys-kernel/bliss-kernel-bin
-# Conrad Kostecki (2021-07-23)
-# Outdated and multiple bugs open.
-# Other alternatives in tree available.
-# Removal in 30 days (2021-08-22)
-www-servers/resin
-
# Andrew Ammerlaan (2021-07-12)
# Version 3.3.0 suffers from ridiculously high CPU usage, this version has
# therefore been retracted upstream.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
deleted file mode 100644
index a6bcbc7275e..000
--- a/www-servers/resin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST resin-4.0.48-src.zip 40883010 BLAKE2B
33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40
SHA512
a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
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
deleted file mode 100644
index 5ef1abc63c5..000
--- a/www-servers/resin/files/resin-4.0.48-build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
a/build.xml
-+++ b/build.xml
-@@ -12,7 +12,7 @@
-
-
-
-+ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
-
-
-
--
--
--
-
-
-
-@@ -92,13 +88,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-@@ -437,13 +426,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-
--
-+
-
-
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
- j...@gentoo.org
- Java
-
-
- Enable Resin admin webapp
-
-
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild
b/www-servers/resin/resin-4.0.48-r1.ebuild
deleted file mode 100644
index a0c767c6628..000
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com";
-SRC_URI="http://www.caucho.com/download/${P}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/jsr101:0
- dev-java/mojarra:2.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/resin-servlet-api:3.1
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- dev-libs/openssl
- >=virtual/jdk-1.6
- dev-java/ant-core:0"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
- jsr101
- mojarra-2.2
- oracle-javamail
- validation-api-1.0
- glassfish-xmlrpc-api
- resin-servlet-api-3.1
- glassfish-deployment-api-1.2
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.48-build.xml.patch
-)
-
-pkg_setup() {
- export RESIN_HOME="/usr/$(get_libdir)/resin"
- java-pkg-2_pkg_setup
- enewgroup resin
- enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # No bundled JARs!
- rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
-
- java-ant_bsfix_one "${S}/build.xml"
- java-ant_bsfix_one "${S}/build-common.xml"
-
- rm -rv lib/* || die
-
- ln -s $(java-config --jdk-home)/lib/tools.jar || die
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/, www-servers/resin/files/4.0.46/, ...
commit: 71700d3292df66e329c1b5cc6db652b6ddcaf5c7
Author: Marty E. Plummer startmail com>
AuthorDate: Sun Apr 8 21:31:03 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Apr 9 19:56:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71700d32
www-servers/resin: drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7902
www-servers/resin/Manifest | 1 -
www-servers/resin/files/4.0.46/build.xml.patch | 59 ---
www-servers/resin/files/4.0.46/resin.init | 36
www-servers/resin/files/4.0.48/resin.conf | 16 --
...uild.xml.patch => resin-4.0.48-build.xml.patch} | 4 +-
.../files/{4.0.46/resin.conf => resin-4.0.48.conf} | 0
.../files/{4.0.48/resin.init => resin-4.0.48.init} | 2 +-
www-servers/resin/resin-4.0.46.ebuild | 183 -
www-servers/resin/resin-4.0.48-r1.ebuild | 6 +-
www-servers/resin/resin-4.0.48.ebuild | 180
10 files changed, 6 insertions(+), 481 deletions(-)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index cc3fd798799..a6bcbc7275e 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,2 +1 @@
-DIST resin-4.0.46-src.zip 40400255 BLAKE2B
e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56
SHA512
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
DIST resin-4.0.48-src.zip 40883010 BLAKE2B
33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40
SHA512
a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
diff --git a/www-servers/resin/files/4.0.46/build.xml.patch
b/www-servers/resin/files/4.0.46/build.xml.patch
deleted file mode 100644
index dc3a413fc0b..000
--- a/www-servers/resin/files/4.0.46/build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
build.xml.orig 2015-08-12 23:14:20.30200 +
-+++ build.xml 2015-08-12 23:14:47.90900 +
-@@ -12,7 +12,7 @@
-
-
-
-+ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
-
-
-
--
--
--
-
-
-
-@@ -92,13 +88,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-@@ -437,13 +426,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-
--
-+
-
-
-
diff --git a/www-servers/resin/files/4.0.46/resin.conf
b/www-servers/resin/files/resin-4.0.48.conf
similarity index 100%
rename from www-servers/resin/files/4.0.46/resin.conf
rename to www-servers/resin/files/resin-4.0.48.conf
diff --git a/www-servers/resin/files/4.0.48/resin.init
b/www-servers/resin/files/resin-4.0.48.init
similarity index 94%
rename from www-servers/resin/files/4.0.48/resin.init
rename to www-servers/resin/files/resin-4.0.48.init
index 2ce1af068f9..a0e5cfb49b6 100644
--- a/www-servers/resin/files/4.0.48/resin.init
+++ b/www-servers/resin/files/resin-4.0.48.init
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
diff --git a/www-servers/resin/resin-4.0.46.ebuild
b/www-servers/resin/resin-4.0.46.ebuild
deleted file mode 100644
index 1143cbb5c62..000
--- a/www-servers/resin/resin-4.0.46.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com";
-SRC_URI="http://www.caucho.com/download/${P}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/jsr101:0
- dev-java/mojarra:2.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/resin-servlet-api:3.1
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-libs/openssl
- dev-java/ant-core:0
- ${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-2.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.1
-glassfish-deployment-api-1.2"
-
-PATCHES=(
- "${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
- java-pkg-2_pkg
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 643eb46d61b91117d0c38df5059bf81ef16d193f Author: David Seifert gentoo org> AuthorDate: Sun Nov 26 13:09:59 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 26 23:26:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643eb46d www-servers/resin: [QA] Consistent whitespace in metadata.xml www-servers/resin/metadata.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml index d0b51e930c6..42183598824 100644 --- a/www-servers/resin/metadata.xml +++ b/www-servers/resin/metadata.xml @@ -1,11 +1,11 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - j...@gentoo.org - Java - - - Enable Resin admin webapp - + + j...@gentoo.org + Java + + + Enable Resin admin webapp +
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: dab6103d9c5839d72593654a6bef57b564fe500e
Author: Patrice Clement gentoo org>
AuthorDate: Wed Sep 28 21:23:00 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Sep 28 21:23:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab6103d
www-servers/resin: do not call get_libdir in global scope.
Gentoo-Bug: https://bugs.gentoo.org/593402
Package-Manager: portage-2.2.28
www-servers/resin/resin-4.0.48-r1.ebuild | 180 +++
1 file changed, 180 insertions(+)
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild
b/www-servers/resin/resin-4.0.48-r1.ebuild
new file mode 100644
index ..54afbab
--- /dev/null
+++ b/www-servers/resin/resin-4.0.48-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/jsr101:0
+ dev-java/mojarra:2.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/resin-servlet-api:3.1
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ dev-libs/openssl
+ >=virtual/jdk-1.6
+ dev-java/ant-core:0"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+ jsr101
+ mojarra-2.2
+ oracle-javamail
+ validation-api-1.0
+ glassfish-xmlrpc-api
+ resin-servlet-api-3.1
+ glassfish-deployment-api-1.2
+"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ export RESIN_HOME="/usr/$(get_libdir)/resin"
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
+}
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
+
+ java-ant_bsfix_one "${S}/build.xml"
+ java-ant_bsfix_one "${S}/build-common.xml"
+
+ rm -rv lib/* || die
+
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+ append-flags -fPIC -DPIC
+
+ chmod 755 "${S}/configure" || die
+ econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+ einfo "Building libraries..."
+ emake
+
+ einfo "Building jars..."
+ eant || die "ant failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ einfo "Moving configuration to /etc ..."
+ dodir /etc/
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die
+ dosym /etc/resin ${RESIN_HOME}/conf
+
+ einfo "Rewriting resin.xml ..."
+ sed -i \
+ -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+ -e 's,${resin.root}/doc/admin,webapps/admin,' \
+ "${D}/etc/resin/resin.xml" || die
+
+ einfo "Fixing log directory ..."
+ rm -rv "${D}/${RESIN_HOME}"/log || die
+ keepdir /var/log/resin
+ dosym /var/log/resin ${RESIN_HOME}/log
+
+ einfo "Installing basic documentation ..."
+ dodoc README "${S}"/conf/*.xml
+
+ einfo "Installing init.d script ..."
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
+
+ einfo "Fixing location of jars ..."
+ #rm -v "${S}"/lib/tools.jar || die
+ java-pkg_dojar "${S}"/lib/*.jar
+ rm -rv "${D}/${RESIN_HOME}"/lib || die
+ dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+ dodir /var/lib/resin/webapps
+ keepdir /var/lib/resin/hosts
+ keepdir /var/lib/resin/resin-data
+ keepdir /var/lib/resin/watchdog-data
+
+ mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || die
+ rm -rv "${D}/${RESIN_HOME}"/webapps || die
+ dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+ dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
+ dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
+ dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
+
+ dosym \
+ "$(java-pkg_getjar resin-servlet-api-3.1
resin-servlet-api.jar)" \
+ "${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
+
+ use admin && {
+ einfo "Installing administration app ..."
+ cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
+ }
+ use doc && {
+ einfo "Installing documentation app ..."
+ cp -a "${S}/doc/resin-d
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/files/4.0.48/, www-servers/resin/
commit: 1f93ca52d6a7305ebcf0beb36c947c7cdc88e8a9
Author: Patrice Clement gentoo org>
AuthorDate: Sun Aug 21 13:47:15 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Aug 21 13:47:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f93ca52
www-servers/resin: version bump to 4.0.48.
Gentoo-Bug: https://bugs.gentoo.org/587762
Package-Manager: portage-2.2.28
www-servers/resin/Manifest | 1 +
www-servers/resin/files/4.0.48/build.xml.patch | 59
www-servers/resin/files/4.0.48/resin.conf | 16 +++
www-servers/resin/files/4.0.48/resin.init | 37 +
www-servers/resin/resin-4.0.48.ebuild | 181 +
5 files changed, 294 insertions(+)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index b4d6330..71b4328 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1 +1,2 @@
DIST resin-4.0.46-src.zip 40400255 SHA256
e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
WHIRLPOOL
a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
+DIST resin-4.0.48-src.zip 40883010 SHA256
f14b4c77fe5003ab11be1e87884a897c09bafb3a5e321f4813305f8192f7f161 SHA512
a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
WHIRLPOOL
099aa3cc480863322bed35c876b0e58fd481475d38b7970db02545f69338cc0fbf41719f0c22b8778009b337559c22eaca862634e3d75d896d34eff45d305c8e
diff --git a/www-servers/resin/files/4.0.48/build.xml.patch
b/www-servers/resin/files/4.0.48/build.xml.patch
new file mode 100644
index 000..dc3a413
--- /dev/null
+++ b/www-servers/resin/files/4.0.48/build.xml.patch
@@ -0,0 +1,59 @@
+--- build.xml.orig 2015-08-12 23:14:20.30200 +
build.xml 2015-08-12 23:14:47.90900 +
+@@ -12,7 +12,7 @@
+
+
+
++ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
+
+
+
+-
+-
+-
+
+
+
+@@ -92,13 +88,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -437,13 +426,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+
+-
++
+
+
+ http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/jsr101:0
+ dev-java/mojarra:2.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/resin-servlet-api:3.1
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ dev-libs/openssl
+ >=virtual/jdk-1.6
+ dev-java/ant-core:0"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+ jsr101
+ mojarra-2.2
+ oracle-javamail
+ validation-api-1.0
+ glassfish-xmlrpc-api
+ resin-servlet-api-3.1
+ glassfish-deployment-api-1.2
+"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
+}
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
+
+ java-ant_bsfix_one "${S}/build.xml"
+ java-ant_bsfix_one "${S}/build-common.xml"
+
+ rm -rv lib/* || die
+
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+ append-flags -fPIC -DPIC
+
+ chmod 755 "${S}/configure" || die
+ econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+ einfo "Building libraries..."
+ emake
+
+ einfo "Building jars..."
+ eant || die "ant failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ einfo "Moving configuration to /etc ..."
+ dodir /etc/
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die
+ dosym /etc/resin ${RESIN_HOME}/conf
+
+ einfo "Rewriting resin.xml ..."
+ sed -i \
+ -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+ -e 's,${resin.root}/doc/admin,webapps/admin,' \
+ "${D}/etc/resin/resin.xml" || die
+
+ einfo "Fixing log directory ..."
+ rm -rv "${D}/${RESIN_HOME}"/log || die
+ keepdir /var/log/resin
+ dosym /var/log/resin ${RESIN_HOME}/log
+
+ einfo "Installing basic documentation ..."
+ dodoc README
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/files/4.0.46/
commit: 168aec72f872d7ad9be01512ac5cc97e25560690 Author: Austin English gentoo org> AuthorDate: Wed May 18 06:35:23 2016 + Commit: Austin English gentoo org> CommitDate: Wed May 18 06:38:34 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168aec72 www-servers/resin: use #!/sbin/openrc-run instead of #!/sbin/runscript www-servers/resin/files/4.0.46/resin.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/4.0.46/resin.init index 6103369..66e2646 100644 --- a/www-servers/resin/files/4.0.46/resin.init +++ b/www-servers/resin/files/4.0.46/resin.init @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/files/4.0.44/, www-servers/resin/
commit: 8cbc945637c5f3ee115da32db508c3897ce239b1
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Feb 19 22:52:42 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Feb 20 14:28:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbc9456
www-servers/resin: Remove old
Package-Manager: portage-2.2.27
www-servers/resin/Manifest | 1 -
www-servers/resin/files/4.0.44/VarType.java.patch | 35
www-servers/resin/files/4.0.44/build.xml.patch | 59 ---
www-servers/resin/files/4.0.44/resin-compile.patch | 53 --
www-servers/resin/files/4.0.44/resin.conf | 16 --
www-servers/resin/files/4.0.44/resin.init | 37
www-servers/resin/resin-4.0.44-r4.ebuild | 191 -
7 files changed, 392 deletions(-)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 10026ee..b4d6330 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,2 +1 @@
-DIST resin-4.0.44-src.zip 40342346 SHA256
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
WHIRLPOOL
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
DIST resin-4.0.46-src.zip 40400255 SHA256
e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
WHIRLPOOL
a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
diff --git a/www-servers/resin/files/4.0.44/VarType.java.patch
b/www-servers/resin/files/4.0.44/VarType.java.patch
deleted file mode 100644
index 05f03f2..000
--- a/www-servers/resin/files/4.0.44/VarType.java.patch
+++ /dev/null
@@ -1,35 +0,0 @@
modules/kernel/src/com/caucho/config/reflect/VarType.java.orig
2015-08-12 21:05:11.89200 +
-+++ modules/kernel/src/com/caucho/config/reflect/VarType.java 2015-08-12
21:06:04.47500 +
-@@ -33,6 +33,7 @@
- import java.lang.reflect.GenericDeclaration;
- import java.lang.reflect.Type;
- import java.lang.reflect.TypeVariable;
-+import java.lang.reflect.AnnotatedType;
- import java.util.Set;
-
- import com.caucho.inject.Module;
-@@ -188,7 +189,23 @@
-
- return sb.toString();
- }
--
-+
-+ public AnnotatedType[] getAnnotatedBounds() {
-+ return null;
-+ }
-+
-+ public Annotation[] getDeclaredAnnotations() {
-+ return null;
-+ }
-+
-+ public Annotation[] getAnnotations() {
-+ return null;
-+ }
-+
-+ public T getAnnotation(Class klass) {
-+ return null;
-+ }
-+
- static class GenericDeclarationImpl implements GenericDeclaration {
- @Override
- public TypeVariable[] getTypeParameters()
diff --git a/www-servers/resin/files/4.0.44/build.xml.patch
b/www-servers/resin/files/4.0.44/build.xml.patch
deleted file mode 100644
index dc3a413..000
--- a/www-servers/resin/files/4.0.44/build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
build.xml.orig 2015-08-12 23:14:20.30200 +
-+++ build.xml 2015-08-12 23:14:47.90900 +
-@@ -12,7 +12,7 @@
-
-
-
-+ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
-
-
-
--
--
--
-
-
-
-@@ -92,13 +88,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-@@ -437,13 +426,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
-
--
-+
-
-
- T getLocalProxy(Class api)
- {
--OwnerCreationalContext owner = new OwnerCreationalContext(null);
--
--return getSessionContext(api).createProxy(owner);
-+ return null;
- }
-
- protected AbstractSessionContext
diff --git a/www-servers/resin/files/4.0.44/resin.conf
b/www-servers/resin/files/4.0.44/resin.conf
deleted file mode 100644
index a48840b..000
--- a/www-servers/resin/files/4.0.44/resin.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-# java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please
refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/4.0.44/resin.init
b/www-servers/resin/files/4.0.44/resin.init
deleted file mode 10
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/4.0.46/
commit: c5308ce8b80ddfa8b16539722e18a4b94eb0ada0
Author: Patrice Clement gentoo org>
AuthorDate: Sat Nov 7 20:56:55 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Nov 7 20:58:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5308ce8
www-servers/resin: Version bump. Fixes bug 564528.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/Manifest| 1 +
www-servers/resin/files/4.0.46/VarType.java.patch | 35
www-servers/resin/files/4.0.46/build.xml.patch| 59 +++
www-servers/resin/files/4.0.46/resin.conf | 16 ++
www-servers/resin/files/4.0.46/resin.init | 37 +
www-servers/resin/resin-4.0.46.ebuild | 184 ++
6 files changed, 332 insertions(+)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 936b7f8..10026ee 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1 +1,2 @@
DIST resin-4.0.44-src.zip 40342346 SHA256
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
WHIRLPOOL
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
+DIST resin-4.0.46-src.zip 40400255 SHA256
e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
WHIRLPOOL
a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
diff --git a/www-servers/resin/files/4.0.46/VarType.java.patch
b/www-servers/resin/files/4.0.46/VarType.java.patch
new file mode 100644
index 000..05f03f2
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/VarType.java.patch
@@ -0,0 +1,35 @@
+--- modules/kernel/src/com/caucho/config/reflect/VarType.java.orig
2015-08-12 21:05:11.89200 +
modules/kernel/src/com/caucho/config/reflect/VarType.java 2015-08-12
21:06:04.47500 +
+@@ -33,6 +33,7 @@
+ import java.lang.reflect.GenericDeclaration;
+ import java.lang.reflect.Type;
+ import java.lang.reflect.TypeVariable;
++import java.lang.reflect.AnnotatedType;
+ import java.util.Set;
+
+ import com.caucho.inject.Module;
+@@ -188,7 +189,23 @@
+
+ return sb.toString();
+ }
+-
++
++ public AnnotatedType[] getAnnotatedBounds() {
++ return null;
++ }
++
++ public Annotation[] getDeclaredAnnotations() {
++ return null;
++ }
++
++ public Annotation[] getAnnotations() {
++ return null;
++ }
++
++ public T getAnnotation(Class klass) {
++ return null;
++ }
++
+ static class GenericDeclarationImpl implements GenericDeclaration {
+ @Override
+ public TypeVariable[] getTypeParameters()
diff --git a/www-servers/resin/files/4.0.46/build.xml.patch
b/www-servers/resin/files/4.0.46/build.xml.patch
new file mode 100644
index 000..dc3a413
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/build.xml.patch
@@ -0,0 +1,59 @@
+--- build.xml.orig 2015-08-12 23:14:20.30200 +
build.xml 2015-08-12 23:14:47.90900 +
+@@ -12,7 +12,7 @@
+
+
+
++ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
+
+
+
+-
+-
+-
+
+
+
+@@ -92,13 +88,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -437,13 +426,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+
+-
++
+
+
+ http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/jsr101:0
+ dev-java/mojarra:2.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/resin-servlet-api:3.1
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ dev-libs/openssl
+ dev-java/ant-core:0
+ ${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.1
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -f "${S}/modules/ext/"*.jar || die
+ rm
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/files/4.0.46/
commit: e4610db38be8f1e8110f92b06ccd834f767ef47d
Author: Patrice Clement gentoo org>
AuthorDate: Sat Nov 7 20:58:06 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Nov 7 20:58:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4610db3
www-servers/resin: Remove useless patch.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/files/4.0.46/VarType.java.patch | 35 ---
1 file changed, 35 deletions(-)
diff --git a/www-servers/resin/files/4.0.46/VarType.java.patch
b/www-servers/resin/files/4.0.46/VarType.java.patch
deleted file mode 100644
index 05f03f2..000
--- a/www-servers/resin/files/4.0.46/VarType.java.patch
+++ /dev/null
@@ -1,35 +0,0 @@
modules/kernel/src/com/caucho/config/reflect/VarType.java.orig
2015-08-12 21:05:11.89200 +
-+++ modules/kernel/src/com/caucho/config/reflect/VarType.java 2015-08-12
21:06:04.47500 +
-@@ -33,6 +33,7 @@
- import java.lang.reflect.GenericDeclaration;
- import java.lang.reflect.Type;
- import java.lang.reflect.TypeVariable;
-+import java.lang.reflect.AnnotatedType;
- import java.util.Set;
-
- import com.caucho.inject.Module;
-@@ -188,7 +189,23 @@
-
- return sb.toString();
- }
--
-+
-+ public AnnotatedType[] getAnnotatedBounds() {
-+ return null;
-+ }
-+
-+ public Annotation[] getDeclaredAnnotations() {
-+ return null;
-+ }
-+
-+ public Annotation[] getAnnotations() {
-+ return null;
-+ }
-+
-+ public T getAnnotation(Class klass) {
-+ return null;
-+ }
-+
- static class GenericDeclarationImpl implements GenericDeclaration {
- @Override
- public TypeVariable[] getTypeParameters()
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 5676116363fce9e8efa0da74e136afdd18bbc069
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Sep 26 14:54:59 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Sep 26 14:54:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56761163
www-servers/resin: Fix accidental SLOT mismatch
wltjr sends his apologies.
Package-Manager: portage-2.2.20.1
www-servers/resin/resin-4.0.44-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/resin/resin-4.0.44-r4.ebuild
b/www-servers/resin/resin-4.0.44-r4.ebuild
index 99cb5e8..dd2b257 100644
--- a/www-servers/resin/resin-4.0.44-r4.ebuild
+++ b/www-servers/resin/resin-4.0.44-r4.ebuild
@@ -44,7 +44,7 @@ mojarra-2.2
oracle-javamail
validation-api-1.0
glassfish-xmlrpc-api
-resin-servlet-api-3.0
+resin-servlet-api-3.1
glassfish-deployment-api-1.2"
PATCHES=(
@@ -145,7 +145,7 @@ src_install() {
dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
dosym \
- "$(java-pkg_getjar resin-servlet-api-3.0
resin-servlet-api.jar)" \
+ "$(java-pkg_getjar resin-servlet-api-3.1
resin-servlet-api.jar)" \
"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
use admin && {
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: b34cac4b8f8f26b56a28958aadb20db2a40fec54
Author: William L. Thomson Jr o-sinc com>
AuthorDate: Sat Sep 26 01:18:23 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Sep 26 01:18:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34cac4b
www-servers/resin: Changed dev-java/resin-servlet-apislot to 3.1
www-servers/resin/{resin-4.0.44-r3.ebuild => resin-4.0.44-r4.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/resin/resin-4.0.44-r3.ebuild
b/www-servers/resin/resin-4.0.44-r4.ebuild
similarity index 99%
rename from www-servers/resin/resin-4.0.44-r3.ebuild
rename to www-servers/resin/resin-4.0.44-r4.ebuild
index 93b73cc..99cb5e8 100644
--- a/www-servers/resin/resin-4.0.44-r3.ebuild
+++ b/www-servers/resin/resin-4.0.44-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="admin doc"
KEYWORDS="~amd64 ~x86"
-CDEPEND="dev-java/resin-servlet-api:3.0
+CDEPEND="dev-java/resin-servlet-api:3.1
dev-java/jsr101:0
dev-java/mojarra:2.2
dev-java/oracle-javamail:0
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 9a4ab04a41bc759711ecdfb0651af7c460ee3033
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 10 14:04:58 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 10 14:05:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4ab04a
www-servers/resin: Remove java-pkg_jar-from lines. Fixes bug 560034.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
.../resin/{resin-4.0.44-r2.ebuild => resin-4.0.44-r3.ebuild} | 8
1 file changed, 8 deletions(-)
diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild
b/www-servers/resin/resin-4.0.44-r3.ebuild
similarity index 93%
rename from www-servers/resin/resin-4.0.44-r2.ebuild
rename to www-servers/resin/resin-4.0.44-r3.ebuild
index a02ac24..93b73cc 100644
--- a/www-servers/resin/resin-4.0.44-r2.ebuild
+++ b/www-servers/resin/resin-4.0.44-r3.ebuild
@@ -77,14 +77,6 @@ src_prepare() {
rm -rf lib/* || die
- java-pkg_jar-from --into lib jsr101
- java-pkg_jar-from --into lib mojarra-1.2
- java-pkg_jar-from --into lib oracle-javamail
- java-pkg_jar-from --into lib validation-api-1.0
- java-pkg_jar-from --into lib glassfish-xmlrpc-api
- java-pkg_jar-from --into lib glassfish-deployment-api-1.2
- java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
ln -s $(java-config --jdk-home)/lib/tools.jar || die
}
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 7d20c1e914f31c905f1abea76c7caf4d04591c55
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:23:03 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d20c1e9
www-servers/resin: Drop old.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44-r1.ebuild | 199 ---
1 file changed, 199 deletions(-)
diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild
b/www-servers/resin/resin-4.0.44-r1.ebuild
deleted file mode 100644
index 5518667..000
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com";
-SRC_URI="http://www.caucho.com/download/${P}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/resin-servlet-api:3.0
- dev-java/jsr101:0
- dev-java/mojarra:1.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-libs/openssl
- dev-java/ant-core:0
- ${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
- "${FILESDIR}"/"${PV}"/resin-compile.patch
- "${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup resin
- enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
- local vm_version=$(java-pkg_get-vm-version)
-
- # #558442.
- if [[ "${vm_version}" == "1.8" ]]; then
- PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
- fi
-
- epatch "${PATCHES[@]}"
-
- # No bundled JARs!
- rm -f "${S}/modules/ext/"*.jar || die
- rm -rf "${S}/project-jars" || die
-
- java-ant_bsfix_one "${S}/build.xml"
- java-ant_bsfix_one "${S}/build-common.xml"
-
- rm -rf lib/* || die
-
- java-pkg_jar-from --into lib jsr101
- java-pkg_jar-from --into lib mojarra-1.2
- java-pkg_jar-from --into lib oracle-javamail
- java-pkg_jar-from --into lib validation-api-1.0
- java-pkg_jar-from --into lib glassfish-xmlrpc-api
- java-pkg_jar-from --into lib glassfish-deployment-api-1.2
- java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
- ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
- append-flags -fPIC -DPIC
-
- chmod 755 "${S}/configure" || die
- econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
- einfo "Building libraries..."
- emake || die "make failed"
-
- einfo "Building jars..."
- eant || die "ant failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-
- einfo "Moving configuration to /etc ..."
- dodir /etc/
- mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
- dosym /etc/resin ${RESIN_HOME}/conf
-
- einfo "Rewriting resin.xml ..."
- sed -i \
- -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
- -e 's,${resin.root}/doc/admin,webapps/admin,' \
- "${D}/etc/resin/resin.xml" || die
-
- einfo "Fixing log directory ..."
- rm -rf "${D}/${RESIN_HOME}/log" || die
- keepdir /var/log/resin
- dosym /var/log/resin ${RESIN_HOME}/log
-
- einfo "Installing basic documentation ..."
- dodoc README "${S}"/conf/*.xml
-
- einfo "Installing init.d script ..."
- newinitd "${FILESDIR}/${PV}/resin.init" resin
- newconfd "${FILESDIR}/${PV}/resin.conf" resin
-
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
-
- einfo "Fixing location of jars ..."
- rm -f "${S}/lib/tools.jar" || die
- java-pkg_dojar "${S}"/lib/*.jar
- rm -fr "${D}/${RESIN_HOME}/lib" || die
- dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
- einfo "Symlinking directories from /var/lib/resin ..."
- rm -rf "${D}/${RESIN_HOME}/resin-data" || die
- rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
- dodir /var/lib/resin/webapps
- keepdir /var/lib/resin/hosts
- keepdir /var/lib/resin/resin-data
- keepdir /var/lib/resin/watchdog-data
- mv "${D}"/${RESIN_HOME}
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 071ff6141aa2a1fda4153eada61a179706c733dc
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:11:23 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ff614
www-servers/resin: Bump dev-java/mojarra SLOT to 2.2. Fixes security bug 501280.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44-r2.ebuild | 199 +++
1 file changed, 199 insertions(+)
diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild
b/www-servers/resin/resin-4.0.44-r2.ebuild
new file mode 100644
index 000..a02ac24
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.0
+ dev-java/jsr101:0
+ dev-java/mojarra:2.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ dev-libs/openssl
+ dev-java/ant-core:0
+ ${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/resin-compile.patch
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+ local vm_version=$(java-pkg_get-vm-version)
+
+ # #558442.
+ if [[ "${vm_version}" == "1.8" ]]; then
+ PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+ fi
+
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -f "${S}/modules/ext/"*.jar || die
+ rm -rf "${S}/project-jars" || die
+
+ java-ant_bsfix_one "${S}/build.xml"
+ java-ant_bsfix_one "${S}/build-common.xml"
+
+ rm -rf lib/* || die
+
+ java-pkg_jar-from --into lib jsr101
+ java-pkg_jar-from --into lib mojarra-1.2
+ java-pkg_jar-from --into lib oracle-javamail
+ java-pkg_jar-from --into lib validation-api-1.0
+ java-pkg_jar-from --into lib glassfish-xmlrpc-api
+ java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+ java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+ append-flags -fPIC -DPIC
+
+ chmod 755 "${S}/configure" || die
+ econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+ einfo "Building libraries..."
+ emake || die "make failed"
+
+ einfo "Building jars..."
+ eant || die "ant failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ einfo "Moving configuration to /etc ..."
+ dodir /etc/
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+ dosym /etc/resin ${RESIN_HOME}/conf
+
+ einfo "Rewriting resin.xml ..."
+ sed -i \
+ -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+ -e 's,${resin.root}/doc/admin,webapps/admin,' \
+ "${D}/etc/resin/resin.xml" || die
+
+ einfo "Fixing log directory ..."
+ rm -rf "${D}/${RESIN_HOME}/log" || die
+ keepdir /var/log/resin
+ dosym /var/log/resin ${RESIN_HOME}/log
+
+ einfo "Installing basic documentation ..."
+ dodoc README "${S}"/conf/*.xml
+
+ einfo "Installing init.d script ..."
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
+
+ einfo "Fixing location of jars ..."
+ rm -f "${S}/lib/tools.jar" || die
+ java-pkg_dojar "${S}"/lib/*.jar
+ rm -fr "${D}/${RESIN_HOME}/lib" || die
+ dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+ einfo "Symlinking directories from /var/lib/resin ..."
+ rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+ rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+ dodir /var/lib/resin/webapps
+ keepdir /var/lib/resin/hosts
+ keepdir /var/lib/resin/resin-data
+ keepdir /var/lib/re
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: a619c20057f9c323bd6e1e3cb5758d8646815c9b Author: James Le Cuirot gentoo org> AuthorDate: Wed Sep 2 09:38:27 2015 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Sep 2 09:39:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a619c200 www-servers/resin: Drop stable keywords wrt bug #558442 discussion There is concern that the patch to make this build with Java 7 will cause breakage. I see no harm in dropping the stable keywords until the 1.8 virtuals are stable. Package-Manager: portage-2.2.20.1 www-servers/resin/resin-4.0.44-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild index 67410a2..5518667 100644 --- a/www-servers/resin/resin-4.0.44-r1.ebuild +++ b/www-servers/resin/resin-4.0.44-r1.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 66a9358ab877e8560b801fc1fb2297d3af0178d3
Author: Patrice Clement gentoo org>
AuthorDate: Tue Aug 25 12:06:07 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Aug 25 12:06:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a9358a
www-servers/resin: Drop vunerable version. Fixes security bug 431416.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44.ebuild | 193 --
1 file changed, 193 deletions(-)
diff --git a/www-servers/resin/resin-4.0.44.ebuild
b/www-servers/resin/resin-4.0.44.ebuild
deleted file mode 100644
index 4e356a2..000
--- a/www-servers/resin/resin-4.0.44.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com";
-SRC_URI="http://www.caucho.com/download/${P}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/resin-servlet-api:3.0
- dev-java/jsr101:0
- dev-java/mojarra:1.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-libs/openssl
- dev-java/ant-core:0
- ${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
- "${FILESDIR}"/"${PV}"/VarType.java.patch
- "${FILESDIR}"/"${PV}"/resin-compile.patch
- "${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup resin
- enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # No bundled JARs!
- rm -f "${S}/modules/ext/"*.jar || die
- rm -rf "${S}/project-jars" || die
-
- java-ant_bsfix_one "${S}/build.xml"
- java-ant_bsfix_one "${S}/build-common.xml"
-
- rm -rf lib/* || die
-
- java-pkg_jar-from --into lib jsr101
- java-pkg_jar-from --into lib mojarra-1.2
- java-pkg_jar-from --into lib oracle-javamail
- java-pkg_jar-from --into lib validation-api-1.0
- java-pkg_jar-from --into lib glassfish-xmlrpc-api
- java-pkg_jar-from --into lib glassfish-deployment-api-1.2
- java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
- ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
- append-flags -fPIC -DPIC
-
- chmod 755 "${S}/configure" || die
- econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
- einfo "Building libraries..."
- emake || die "make failed"
-
- einfo "Building jars..."
- eant || die "ant failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-
- einfo "Moving configuration to /etc ..."
- dodir /etc/
- mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
- dosym /etc/resin ${RESIN_HOME}/conf
-
- einfo "Rewriting resin.xml ..."
- sed -i \
- -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
- -e 's,${resin.root}/doc/admin,webapps/admin,' \
- "${D}/etc/resin/resin.xml" || die
-
- einfo "Fixing log directory ..."
- rm -rf "${D}/${RESIN_HOME}/log" || die
- keepdir /var/log/resin
- dosym /var/log/resin ${RESIN_HOME}/log
-
- einfo "Installing basic documentation ..."
- dodoc README "${S}"/conf/*.xml
-
- einfo "Installing init.d script ..."
- newinitd "${FILESDIR}/${PV}/resin.init" resin
- newconfd "${FILESDIR}/${PV}/resin.conf" resin
-
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
-
- einfo "Fixing location of jars ..."
- rm -f "${S}/lib/tools.jar" || die
- java-pkg_dojar "${S}"/lib/*.jar
- rm -fr "${D}/${RESIN_HOME}/lib" || die
- dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
- einfo "Symlinking directories from /var/lib/resin ..."
- rm -rf "${D}/${RESIN_HOME}/resin-data" || die
- rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
- dodir /var/lib/resin/webapps
- keepdir /var/lib/resin/hosts
- keepdir /var/lib/resin/resin-data
- keepdir /var/lib/resin/watchdog-data
- mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
- die "mv of webapps failed"
- rm -rf "${D}/${RESIN_HOME}/
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 444c96a89bb3cf7e1ef99ae11142058052f3d7ff Author: Patrice Clement gentoo org> AuthorDate: Tue Aug 25 12:04:34 2015 + Commit: Patrice Clement gentoo org> CommitDate: Tue Aug 25 12:06:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444c96a8 www-servers/resin: Stable for amd64+x86. Fixes bug 431416. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> www-servers/resin/resin-4.0.44-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild index 5518667..67410a2 100644 --- a/www-servers/resin/resin-4.0.44-r1.ebuild +++ b/www-servers/resin/resin-4.0.44-r1.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 9d6fa4934b3afe77fb1f6889374cb302c4f94de2
Author: Patrice Clement gentoo org>
AuthorDate: Tue Aug 25 09:45:34 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Aug 25 09:46:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6fa493
www-servers/resin: disable a patch that doesn't work with JDK versions lower
than 1.8. Fixes bug 558442.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44-r1.ebuild | 199 +++
1 file changed, 199 insertions(+)
diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild
b/www-servers/resin/resin-4.0.44-r1.ebuild
new file mode 100644
index 000..5518667
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.0
+ dev-java/jsr101:0
+ dev-java/mojarra:1.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ dev-libs/openssl
+ dev-java/ant-core:0
+ ${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-1.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/resin-compile.patch
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+ local vm_version=$(java-pkg_get-vm-version)
+
+ # #558442.
+ if [[ "${vm_version}" == "1.8" ]]; then
+ PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+ fi
+
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -f "${S}/modules/ext/"*.jar || die
+ rm -rf "${S}/project-jars" || die
+
+ java-ant_bsfix_one "${S}/build.xml"
+ java-ant_bsfix_one "${S}/build-common.xml"
+
+ rm -rf lib/* || die
+
+ java-pkg_jar-from --into lib jsr101
+ java-pkg_jar-from --into lib mojarra-1.2
+ java-pkg_jar-from --into lib oracle-javamail
+ java-pkg_jar-from --into lib validation-api-1.0
+ java-pkg_jar-from --into lib glassfish-xmlrpc-api
+ java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+ java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+ append-flags -fPIC -DPIC
+
+ chmod 755 "${S}/configure" || die
+ econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+ einfo "Building libraries..."
+ emake || die "make failed"
+
+ einfo "Building jars..."
+ eant || die "ant failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ einfo "Moving configuration to /etc ..."
+ dodir /etc/
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+ dosym /etc/resin ${RESIN_HOME}/conf
+
+ einfo "Rewriting resin.xml ..."
+ sed -i \
+ -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+ -e 's,${resin.root}/doc/admin,webapps/admin,' \
+ "${D}/etc/resin/resin.xml" || die
+
+ einfo "Fixing log directory ..."
+ rm -rf "${D}/${RESIN_HOME}/log" || die
+ keepdir /var/log/resin
+ dosym /var/log/resin ${RESIN_HOME}/log
+
+ einfo "Installing basic documentation ..."
+ dodoc README "${S}"/conf/*.xml
+
+ einfo "Installing init.d script ..."
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
+
+ einfo "Fixing location of jars ..."
+ rm -f "${S}/lib/tools.jar" || die
+ java-pkg_dojar "${S}"/lib/*.jar
+ rm -fr "${D}/${RESIN_HOME}/lib" || die
+ dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+ einfo "Symlinking directories from /var/lib/resin ..."
+ rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+ rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+ dodir /var/lib/resin/webapps
+ keepdir /var/lib/resin/hosts
+ keepdir /var/lib/resin/resin-data
+
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/4.0.22/, ...
commit: 350224db5c05c0b0b96a4193a4d7b6d97aff9a7b
Author: Patrice Clement gentoo org>
AuthorDate: Fri Aug 21 13:20:32 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Aug 21 13:22:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350224db
www-servers/resin: Remove vunerable versions. Fixes security bug 431416.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/Manifest| 6 -
www-servers/resin/files/4.0.13/resin.conf | 16 ---
www-servers/resin/files/4.0.13/resin.init | 37 --
www-servers/resin/files/4.0.14/resin.conf | 16 ---
www-servers/resin/files/4.0.14/resin.init | 37 --
www-servers/resin/files/4.0.15/resin.conf | 16 ---
www-servers/resin/files/4.0.15/resin.init | 37 --
www-servers/resin/files/4.0.22/resin.conf | 16 ---
www-servers/resin/files/4.0.22/resin.init | 37 --
www-servers/resin/files/4.0.25/resin.conf | 16 ---
www-servers/resin/files/4.0.25/resin.init | 37 --
www-servers/resin/files/4.0.26/resin.conf | 16 ---
www-servers/resin/files/4.0.26/resin.init | 37 --
www-servers/resin/resin-4.0.22.ebuild | 186 --
www-servers/resin/resin-4.0.25.ebuild | 186 --
www-servers/resin/resin-4.0.26.ebuild | 182 -
16 files changed, 878 deletions(-)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 741570b..936b7f8 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,7 +1 @@
-DIST resin-4.0.22-src.zip 17540820 SHA256
5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a
-DIST resin-4.0.25-src.zip 17971688 SHA256
e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a
-DIST resin-4.0.26-src.zip 17879008 SHA256
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
WHIRLPOOL
a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
DIST resin-4.0.44-src.zip 40342346 SHA256
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
WHIRLPOOL
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
-DIST resin-gentoo-patches-4.0.22-r1.tar.bz2 2625 SHA256
4f29cabe826f535d9b2d324d7f70b9983410cd4b8c250a166fa1e74f1ab3d828
-DIST resin-gentoo-patches-4.0.25-r1.tar.bz2 3208 SHA256
bbdcd0ba71670869171356ff15dd13461aac667e75b6998019864d75876132d2
-DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256
adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31 SHA512
fc23c6b82f55b76c063276169e8b6be40ab697dfa07ab8f8f560db33b9c48993526f07190b137406f952e0d1a548cc45f30b6a9ceb4983e2a9eed5de8f4ab5d3
WHIRLPOOL
cf7403adcdd0b98fcab2ace7733af7e9fa57361f9e2b2fb128ee8c3a9d787c5e8437f6749889cea1aacbf1ec9b9725647e6737fe4e3d1a98d69d1965c129c2d2
diff --git a/www-servers/resin/files/4.0.13/resin.conf
b/www-servers/resin/files/4.0.13/resin.conf
deleted file mode 100644
index a48840b..000
--- a/www-servers/resin/files/4.0.13/resin.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-# java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please
refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/4.0.13/resin.init
b/www-servers/resin/files/4.0.13/resin.init
deleted file mode 100644
index d36037f..000
--- a/www-servers/resin/files/4.0.13/resin.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
- use dns logger mysql postgresql
-}
-
-runResin() {
- JAVA_HOME=$(java-config -O)
- [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config
--select-vm="${GENTOO_VM}" -O)
- export JAVA_HOME
-
- local extraArgs=
- if [ "${VERBOSE}" = "yes" ]; then
- extraArgs="-verbose"
- fi
-
- local msg="${1}"
- shift
-
- 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__
${extraAr
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 87734d3141398e916521b33e6bb6f23c50cc1da5 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Aug 16 08:49:02 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Aug 16 08:49:02 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87734d31 www-servers/resin-4.0.44-r0: amd64 stable wrt bug #431416 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" www-servers/resin/resin-4.0.44.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild index 306e2ac..4f1e0c6 100644 --- a/www-servers/resin/resin-4.0.44.ebuild +++ b/www-servers/resin/resin-4.0.44.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: cd8399cad313d3feb4451670f8a6d9975e0c9532 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Aug 16 08:49:27 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Aug 16 08:49:27 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8399ca www-servers/resin-4.0.44-r0: x86 stable wrt bug #431416 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" www-servers/resin/resin-4.0.44.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild index 4f1e0c6..4e356a2 100644 --- a/www-servers/resin/resin-4.0.44.ebuild +++ b/www-servers/resin/resin-4.0.44.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/files/4.0.44/, www-servers/resin/
commit: a07c143fbb16e02694ac324ab2c27bd61045e247
Author: Patrice Clement gentoo org>
AuthorDate: Wed Aug 12 23:50:16 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Aug 12 23:57:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07c143f
www-servers/resin: Version bump. Fixes bug 472958 and bug 431416.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/Manifest | 5 +-
www-servers/resin/files/4.0.44/VarType.java.patch | 35
www-servers/resin/files/4.0.44/build.xml.patch | 59 +++
www-servers/resin/files/4.0.44/resin-compile.patch | 53 ++
www-servers/resin/files/4.0.44/resin.conf | 16 ++
www-servers/resin/files/4.0.44/resin.init | 37
www-servers/resin/resin-4.0.44.ebuild | 193 +
7 files changed, 396 insertions(+), 2 deletions(-)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 5b8c9f1..741570b 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,6 +1,7 @@
DIST resin-4.0.22-src.zip 17540820 SHA256
5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a
DIST resin-4.0.25-src.zip 17971688 SHA256
e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a
-DIST resin-4.0.26-src.zip 17879008 SHA256
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e
+DIST resin-4.0.26-src.zip 17879008 SHA256
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
WHIRLPOOL
a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
+DIST resin-4.0.44-src.zip 40342346 SHA256
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
WHIRLPOOL
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
DIST resin-gentoo-patches-4.0.22-r1.tar.bz2 2625 SHA256
4f29cabe826f535d9b2d324d7f70b9983410cd4b8c250a166fa1e74f1ab3d828
DIST resin-gentoo-patches-4.0.25-r1.tar.bz2 3208 SHA256
bbdcd0ba71670869171356ff15dd13461aac667e75b6998019864d75876132d2
-DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256
adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31
+DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256
adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31 SHA512
fc23c6b82f55b76c063276169e8b6be40ab697dfa07ab8f8f560db33b9c48993526f07190b137406f952e0d1a548cc45f30b6a9ceb4983e2a9eed5de8f4ab5d3
WHIRLPOOL
cf7403adcdd0b98fcab2ace7733af7e9fa57361f9e2b2fb128ee8c3a9d787c5e8437f6749889cea1aacbf1ec9b9725647e6737fe4e3d1a98d69d1965c129c2d2
diff --git a/www-servers/resin/files/4.0.44/VarType.java.patch
b/www-servers/resin/files/4.0.44/VarType.java.patch
new file mode 100644
index 000..05f03f2
--- /dev/null
+++ b/www-servers/resin/files/4.0.44/VarType.java.patch
@@ -0,0 +1,35 @@
+--- modules/kernel/src/com/caucho/config/reflect/VarType.java.orig
2015-08-12 21:05:11.89200 +
modules/kernel/src/com/caucho/config/reflect/VarType.java 2015-08-12
21:06:04.47500 +
+@@ -33,6 +33,7 @@
+ import java.lang.reflect.GenericDeclaration;
+ import java.lang.reflect.Type;
+ import java.lang.reflect.TypeVariable;
++import java.lang.reflect.AnnotatedType;
+ import java.util.Set;
+
+ import com.caucho.inject.Module;
+@@ -188,7 +189,23 @@
+
+ return sb.toString();
+ }
+-
++
++ public AnnotatedType[] getAnnotatedBounds() {
++ return null;
++ }
++
++ public Annotation[] getDeclaredAnnotations() {
++ return null;
++ }
++
++ public Annotation[] getAnnotations() {
++ return null;
++ }
++
++ public T getAnnotation(Class klass) {
++ return null;
++ }
++
+ static class GenericDeclarationImpl implements GenericDeclaration {
+ @Override
+ public TypeVariable[] getTypeParameters()
diff --git a/www-servers/resin/files/4.0.44/build.xml.patch
b/www-servers/resin/files/4.0.44/build.xml.patch
new file mode 100644
index 000..dc3a413
--- /dev/null
+++ b/www-servers/resin/files/4.0.44/build.xml.patch
@@ -0,0 +1,59 @@
+--- build.xml.orig 2015-08-12 23:14:20.30200 +
build.xml 2015-08-12 23:14:47.90900 +
+@@ -12,7 +12,7 @@
+
+
+
++ depends="init, hessian, javaee, jaxstream, portlet, script,
resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext,
j2ee-management, gae">
+
+
+
+-
+-
+-
+
+
+
+@@ -92,13 +88,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -437,13 +426,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
