added missing patchset, fixes #89602. also corrected license for resin > 3.0, fixes #89595

(Portage version: 2.0.51.19)

4 files changed, 81 insertions, 0 deletions

diff --git a/www-servers/resin/files/3.0.12/21resin b/www-servers/resin/files/3.0.12/21resin
new file mode 100644
index 000000000000..8ebed2d0a4f8
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/21resin
@@ -0,0 +1 @@
+RESIN_HOME=/opt/resin
diff --git a/www-servers/resin/files/3.0.12/resin.conf b/www-servers/resin/files/3.0.12/resin.conf
new file mode 100644
index 000000000000..9dfcf0269d58
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/resin.conf
@@ -0,0 +1,36 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.12/resin.conf,v 1.1 2005/04/19 14:03:56 luckyduck Exp $
+
+# 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 path you wish.  
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.1.01
+
+#JAVA_HOME=`java-config -O`
+
+# (Optional) Java runtime options used when the "start", "stop", or "run"
+# commands are executed.
+# JAVA_OPTS=""
+
+# Where your Resin is installed
+RESIN_HOME=/opt/resin
+SERVER_ROOT=${RESIN_HOME}
+
+# Resin's User
+RESIN_USER=resin
+
+# Resin Log Locations
+RESIN_OUT=/var/log/resin/resin_out.log
+RESIN_ERR=/var/log/resin/resin_err.log
+
+# Location of the Resin JARs and classes
+RESIN_LIBDIR=/usr/share/resin/lib
+
+# The CLASSPATH for Resin to use, plus any others you need.
+CLASSPATH=$(java-config -p resin 2>/dev/null):${RESIN_LIBDIR}/lib
+
+# START/STOP settings
+RESIN_START="-java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} start"
+RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.12/resin.init b/www-servers/resin/files/3.0.12/resin.init
new file mode 100644
index 000000000000..7c73128a5857
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/resin.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.12/resin.init,v 1.1 2005/04/19 14:03:56 luckyduck Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	ebegin "Starting Resin"
+	cd ${RESIN_HOME}
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_START}" 
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Resin"
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_STOP}"
+	sleep 2
+	eend $?
+}
diff --git a/www-servers/resin/files/3.0.12/wrapper.pl.diff b/www-servers/resin/files/3.0.12/wrapper.pl.diff
new file mode 100644
index 000000000000..0bd8702e6a0f
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/wrapper.pl.diff
@@ -0,0 +1,21 @@
+--- bin/wrapper.pl.in	2004-07-30 01:59:20.680348752 +0200
++++ bin/wrapper.pl.in	2004-07-30 02:04:38.745995424 +0200
+@@ -418,9 +418,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -679,8 +676,6 @@
+       $date = `date`;
+       chop($date);
+ 
+-      print "Resin $name $cmd at $date\n";
+-
+       # create a keepalive socket
+       # when the wrapper dies, the httpd class will detect that and
+       # close gracefully