Version bump of 2.1 series.

(Portage version: 2.1.1_pre4)
 (Signed Manifest commit)

5 files changed, 128 insertions, 4 deletions

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index da0dfd6cdcef..5ae4d2906947 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.1.14/21resin 53 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e SHA1 8a6385133272e1491a4440f9ce31bda4dc27039b SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e files/2.1.14/21resin 53
@@ -14,6 +17,22 @@ AUX 2.1.14/resin.init 751 RMD160 2c4cf66790eb2332ac78337478953a199779bb8a SHA1 8
 MD5 fdd22c5f252db48ef11406b278e267be files/2.1.14/resin.init 751
 RMD160 2c4cf66790eb2332ac78337478953a199779bb8a files/2.1.14/resin.init 751
 SHA256 9c0a43a3deff11daa8d15da56d82b5fa70b0d3c112526c024c561295148ef1a6 files/2.1.14/resin.init 751
+AUX 2.1.17/21resin 53 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e SHA1 8a6385133272e1491a4440f9ce31bda4dc27039b SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6
+MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.17/21resin 53
+RMD160 62e4ea99f9df806df34d777d121804f5802ef74e files/2.1.17/21resin 53
+SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6 files/2.1.17/21resin 53
+AUX 2.1.17/resin.conf 1178 RMD160 3d5189f01b0523e03f0248d1f88c480d34e679b3 SHA1 a955aec266c49c922a890ca2e9c7a13592e878b1 SHA256 1414bd9aa421ce7df568f967b9e0afa9d05808ff167ae77d0172ca2de651ae06
+MD5 94a0740742735629f269e776256d09bf files/2.1.17/resin.conf 1178
+RMD160 3d5189f01b0523e03f0248d1f88c480d34e679b3 files/2.1.17/resin.conf 1178
+SHA256 1414bd9aa421ce7df568f967b9e0afa9d05808ff167ae77d0172ca2de651ae06 files/2.1.17/resin.conf 1178
+AUX 2.1.17/resin.diff 504 RMD160 5c68c5509f03da3ff9e52ccba075f27f406bf9ab SHA1 5ea54c4249df4ade67e5eb130c78b29c42fba397 SHA256 ea304110358cb34b70cf295a53c9a33c797e8f465ccdb987f1d67dc32dac7362
+MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.17/resin.diff 504
+RMD160 5c68c5509f03da3ff9e52ccba075f27f406bf9ab files/2.1.17/resin.diff 504
+SHA256 ea304110358cb34b70cf295a53c9a33c797e8f465ccdb987f1d67dc32dac7362 files/2.1.17/resin.diff 504
+AUX 2.1.17/resin.init 751 RMD160 2c4cf66790eb2332ac78337478953a199779bb8a SHA1 89606c83834695fd94611e4d622c23d69a11fcee SHA256 9c0a43a3deff11daa8d15da56d82b5fa70b0d3c112526c024c561295148ef1a6
+MD5 fdd22c5f252db48ef11406b278e267be files/2.1.17/resin.init 751
+RMD160 2c4cf66790eb2332ac78337478953a199779bb8a files/2.1.17/resin.init 751
+SHA256 9c0a43a3deff11daa8d15da56d82b5fa70b0d3c112526c024c561295148ef1a6 files/2.1.17/resin.init 751
 AUX 3.0.12/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f SHA1 cc11fbfa74f3008dff06e790bab78284ab52328b SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123
 MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.12/21resin 22
 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f files/3.0.12/21resin 22
@@ -63,6 +82,7 @@ MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.8/wrapper.pl.diff 526
 RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 files/3.0.8/wrapper.pl.diff 526
 SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125 files/3.0.8/wrapper.pl.diff 526
 DIST resin-2.1.14.tar.gz 3305648
+DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
 DIST resin-3.0.12.tar.gz 6965320
 DIST resin-3.0.19-src.tar.gz 5031722 RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 SHA1 9de0832abcb3ec18d717702afd8108f61c102aac SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3
 DIST resin-3.0.8.tar.gz 5757738
@@ -70,6 +90,10 @@ EBUILD resin-2.1.14.ebuild 2980 RMD160 e3e8eecab447ef6d0b44af4dae12968c5cd608b6
 MD5 493369717a39d721e008936cfe2e34ac resin-2.1.14.ebuild 2980
 RMD160 e3e8eecab447ef6d0b44af4dae12968c5cd608b6 resin-2.1.14.ebuild 2980
 SHA256 f4657b6982e64a1394a382b3d0a04c8292177b72cd927fffb9b4814d7f16e8b5 resin-2.1.14.ebuild 2980
+EBUILD resin-2.1.17.ebuild 2986 RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57 SHA1 de39d8c1290f0362d89467fe38b22efbefd646f1 SHA256 771fac2bccec6571bf094f6fa6f47ea5948ebd4a1652d719cd67b24758d39811
+MD5 1aaea3df4d0bd80e1eb408d083863ca3 resin-2.1.17.ebuild 2986
+RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57 resin-2.1.17.ebuild 2986
+SHA256 771fac2bccec6571bf094f6fa6f47ea5948ebd4a1652d719cd67b24758d39811 resin-2.1.17.ebuild 2986
 EBUILD resin-3.0.12.ebuild 3440 RMD160 3e29c34b07c232a8175060853e6a0b8b03d115e8 SHA1 6c9bc062106bf7c3c4337741215d6699d7dfea95 SHA256 c6dbd72d90f85a6c3ee3c4d4ce243f9a07f23378d22f88561e4d13426b95a321
 MD5 1bfc6d50e2f52dbcbade3df91569998f resin-3.0.12.ebuild 3440
 RMD160 3e29c34b07c232a8175060853e6a0b8b03d115e8 resin-3.0.12.ebuild 3440
@@ -82,10 +106,10 @@ EBUILD resin-3.0.8-r1.ebuild 3421 RMD160 a058566d36d377c03b1c618a443c035226c2231
 MD5 0648422e68fa0423df7cd06655baed13 resin-3.0.8-r1.ebuild 3421
 RMD160 a058566d36d377c03b1c618a443c035226c2231a resin-3.0.8-r1.ebuild 3421
 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de resin-3.0.8-r1.ebuild 3421
-MISC ChangeLog 3934 RMD160 23edbf03c5eb800ddc1c08dd7e95032ecb418c15 SHA1 3d4420431b93238e5a54c2aaf4eed5b889784b8b SHA256 a22926c3093cee8d9b607e035ef7b53372ce7d76aac02b57aba463451317e936
-MD5 3efa03c8d3fea55a1fd22c13a84171ed ChangeLog 3934
-RMD160 23edbf03c5eb800ddc1c08dd7e95032ecb418c15 ChangeLog 3934
-SHA256 a22926c3093cee8d9b607e035ef7b53372ce7d76aac02b57aba463451317e936 ChangeLog 3934
+MISC ChangeLog 4172 RMD160 5917f7fc21e891e4cfa61ff54badd21f3cbe9003 SHA1 0daa19ca826e4dbb5399ceb3aac44f0d3319f65d SHA256 649db48b906b8efbe3a1806502c8843afac30126f477323b668c78ebf3296da0
+MD5 d80f69ed3f654e6f8c4cfb86fef1699e ChangeLog 4172
+RMD160 5917f7fc21e891e4cfa61ff54badd21f3cbe9003 ChangeLog 4172
+SHA256 649db48b906b8efbe3a1806502c8843afac30126f477323b668c78ebf3296da0 ChangeLog 4172
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -93,6 +117,9 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
 RMD160 a6cdb924c8a569a3b4fe291bc26036aa93fb2b19 files/digest-resin-2.1.14 65
 SHA256 634f44dc2b824fa8b5d1d516e83506db922a4ae7fd6eeff888c5f029a6186a03 files/digest-resin-2.1.14 65
+MD5 07e6b1635b6db18f68bd40814c347673 files/digest-resin-2.1.17 241
+RMD160 4139a546bdfad3a5c0a0bbf3330583eeb38756ac files/digest-resin-2.1.17 241
+SHA256 bc4da846dca614d5ad2d9ddd735df2109aabd6bfc9a7d4c6f550198a5ecd9440 files/digest-resin-2.1.17 241
 MD5 c4456fac82339e40800999da730ef2e2 files/digest-resin-3.0.12 65
 RMD160 bf2a1bd23b3e722408449bed71b05acb1c072c92 files/digest-resin-3.0.12 65
 SHA256 3e02fb910717eb0d1ff43aee169f1a6ed64861aeab6dabd755e4f10823ce26a1 files/digest-resin-3.0.12 65
@@ -102,3 +129,10 @@ SHA256 092bf61d5004c321668d0e000c821dd9a7f2a8fce1acaaa42059f37f7dcd6fe4 files/di
 MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8-r1 64
 RMD160 1ed3e5fee0a5bfc62d0e47c1b5cdbc25799070e6 files/digest-resin-3.0.8-r1 64
 SHA256 a5d9f4b822a2524029ae0cf42f3124949513da515f7c8e9281269bfb8a02b3b4 files/digest-resin-3.0.8-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEy4vRgo/w9rxVVVERApbQAJ9I9WxvTcGf8ADHzxbeFfy5SOi9iQCdGzPR
+K5bCQ30Uis/MwWLjAEy7pAM=
+=1zQB
+-----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/2.1.17/21resin b/www-servers/resin/files/2.1.17/21resin
new file mode 100644
index 000000000000..5a3ecc5b6e96
--- /dev/null
+++ b/www-servers/resin/files/2.1.17/21resin
@@ -0,0 +1,2 @@
+RESIN_HOME=/opt/resin
+CONFIG_PROTECT=/opt/resin/conf
diff --git a/www-servers/resin/files/2.1.17/resin.conf b/www-servers/resin/files/2.1.17/resin.conf
new file mode 100644
index 000000000000..8a09ee795a0c
--- /dev/null
+++ b/www-servers/resin/files/2.1.17/resin.conf
@@ -0,0 +1,36 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/2.1.17/resin.conf,v 1.1 2006/07/29 16:24:35 nelchael 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=`/bin/grep -e "CLASSPATH" /usr/share/resin/package.env | /bin/sed -e "s/CLASSPATH=//"`:${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/2.1.17/resin.diff b/www-servers/resin/files/2.1.17/resin.diff
new file mode 100644
index 000000000000..156f1e020d31
--- /dev/null
+++ b/www-servers/resin/files/2.1.17/resin.diff
@@ -0,0 +1,20 @@
+--- bin/wrapper.pl.orig	2003-04-30 08:35:27.000000000 -0400
++++ bin/wrapper.pl	2003-04-30 08:39:56.000000000 -0400
+@@ -381,7 +381,7 @@
+ 	chop($pid);
+ 
+ 	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
++	    print("");
+ 	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+@@ -652,7 +652,7 @@
+       $date = `date`;
+       chop($date);
+ 
+-      print("Resin $name $cmd at $date\n");
++      print("");
+ 
+       # create a keepalive socket
+       # when the wrapper dies, the httpd class will detect that and
diff --git a/www-servers/resin/files/2.1.17/resin.init b/www-servers/resin/files/2.1.17/resin.init
new file mode 100644
index 000000000000..1e6914734079
--- /dev/null
+++ b/www-servers/resin/files/2.1.17/resin.init
@@ -0,0 +1,32 @@
+#!/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/2.1.17/resin.init,v 1.1 2006/07/29 16:24:35 nelchael 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 $?
+}
+
+restart() {
+	ebegin "Restarting Resin"
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_STOP}"
+	sleep 5
+	cd ${RESIN_HOME}
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_START}"
+	eend $?
+}