Revision bump; add support for specifying which server configuration should be used in init.d script.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

5 files changed, 26 insertions, 15 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index d3737d1ed4de..1669f5ce534a 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.101 2010/12/12 15:54:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.102 2010/12/12 16:22:51 nelchael Exp $
+
+*resin-4.0.13-r1 (12 Dec 2010)
+
+  12 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> files/4.0.13/resin.conf,
+  files/4.0.13/resin.init, -resin-4.0.13.ebuild, +resin-4.0.13-r1.ebuild:
+  Revision bump; add support for specifying which server configuration should
+  be used in init.d script.
 
   12 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> +files/4.0.13/resin.conf,
   +files/4.0.13/resin.init:
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 48e3a7e5fa47..34bce327d90f 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5
-AUX 4.0.13/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 4.0.13/resin.init 883 RMD160 0ebd18579f1eb9b73c2b264ccc000856af6cf50d SHA1 284857ff4efc7b4c1f038528f8fdb60bda120504 SHA256 696263e6cc3213e8a06a52ddb92eb3c1b10155daa09589221a1f010d08d13a8d
+AUX 4.0.13/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
+AUX 4.0.13/resin.init 908 RMD160 1eaf21ce2f732030d99a80540517c33cd25328b1 SHA1 37fdacdfb502f38eabce074d5b2438ced65dceeb SHA256 c0f70f050e8fc700913ba4073072a9f3910a7f8dcb8ebde8f7484a1f8e3cb9e1
 AUX 4.0.5/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 4.0.5/resin.init 884 RMD160 060b7bd06e16a5d6f36909dd24e09fced55c2bc0 SHA1 fc7ed3336edeb17fcd35a7781e0127687df16217 SHA256 9c274a3a23d5ebc09056977a5776b29acc77e1a9822e7bb09f6ac51eba887c3a
 AUX 4.0.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
@@ -22,20 +22,20 @@ DIST resin-gentoo-patches-4.0.5.tar.bz2 2772 RMD160 0b8a9a39eacc35054e1ed0dc6419
 DIST resin-gentoo-patches-4.0.6.tar.bz2 2804 RMD160 5163ba0b608b99ab3bed8e3616e3c7b71f7a9f58 SHA1 42d145947b504a3d1c56e2c0e32d5cde264fd766 SHA256 3be0748f1aad2793cec4f7e5f5cebb5883f5ebcafc6aa3fb43369d12ef613523
 DIST resin-gentoo-patches-4.0.9.tar.bz2 2820 RMD160 2f115b563683db34a2aafb2c5e62980b0660022e SHA1 34e8c5837c910209af6ff564e9a938ff62fa0bf2 SHA256 606a3489d2eba330fec96df8c953623ee0ce3c03fbee0f52192a553cdc614af0
 EBUILD resin-3.2.1-r3.ebuild 4122 RMD160 22649cee4681b83514118bd19e4a9e4be1905e4d SHA1 0abfffa06198148d3517bd9208d7819b2c2706ab SHA256 a42d7cd807efdc79f36e71d6052d2f1f72d42bd046ebde5edfa3d5fcd5696aca
-EBUILD resin-4.0.13.ebuild 4976 RMD160 4e678140e4e62b7bdb46a2f46cc0842fb5b11523 SHA1 e738641b689732b52076db02aca6fb1eda0a1e27 SHA256 afae79ac9be4ed9a212b55b31bf341d11d47590aa2ccd4f2ae5f543c2eb3d937
+EBUILD resin-4.0.13-r1.ebuild 4979 RMD160 2324af070aeca45bccc8ed63c497cf3d6cdaf393 SHA1 9c77076fb6cae3fa19519ca25e48f346260f9014 SHA256 e02539542a69da2cf34f13a9c9d55da78dd30cc2d8c9a6c161c6bf5924268f21
 EBUILD resin-4.0.5.ebuild 4164 RMD160 97bda6a104c780f4f692a969a52af3e054515ff0 SHA1 d8067c23549d6bb5166948fb45319410633d79a5 SHA256 6c2e9b8a738a7639a896d89d9a1c5b4f77e60ab568222ad0624d21ed1c083897
 EBUILD resin-4.0.6.ebuild 4819 RMD160 ba575be76825f7c35eb94e57c824a99a453db8d1 SHA1 eb030fc07ce8d93b0367e8efddbfda5526d89b7f SHA256 3b9d3fe101c66ec96accb9a92f3fc32ca01f6888780ee303594e65fe7b9c0e0a
 EBUILD resin-4.0.9.ebuild 4975 RMD160 8cb37adc8f083a094b68a81e8ab08d5e61e147b7 SHA1 4900e120ff8720f15ca4499b8726a5ff6f25ce23 SHA256 db01f1fe09cdae4c23fc7a01d0c0bc08c0288dfd1f446c7d86df23d63fa93513
-MISC ChangeLog 19070 RMD160 aaf6d1469bda9c4b91ccb7114438bfd2e4a69fa6 SHA1 2aedb478d8a74e06c00744692c22c75110444063 SHA256 ebfafc7194a67ea33880a5a2b5f299b46e41e28cfc351f65ae477c69ef380e9c
+MISC ChangeLog 19362 RMD160 34ac4576858fb4de84f774b4e8c9534c56c3937e SHA1 d307db50f8ad6bd7621a7d754347f4ea9da9463a SHA256 e0da982537a89d6cf7030bc46b9590cd2d43d4edea0e81bd16c90d19ac0c0022
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNBPAeAAoJEBZyv1r2qA5G02cH/2YPG9r/DHZIw6ylOc5r7WDQ
-YLDrt0N8eGGupkRKZIkBEvOIRjY4XkWcin0+f2+OIjj39PaiWXwmaPjsw6H7v6w8
-ngrHKCZXjwxERH/N5gjd9gr+KdaqPQTlYxrMo+rj1IKY9a1ZVFQQk0J8Xb+akQo2
-uj6d8AggrhXVkIm5X4BLai11LSFL6YkxGM35odTshcqiGsOU0sKc3oGgVctOfN+Q
-bKUxlymuageuUNIcgM1ItakCFBDEnChQ0RkmmNoMKs2HQYgLq93r9qSJnqWqMBde
-KNDutP3xsrYp3L+suotV3lOBOZhZ217m1hEkggEHtdDjIPbShYF7UxBgxpvqtBQ=
-=OLpu
+iQEcBAEBAgAGBQJNBPbhAAoJEBZyv1r2qA5GmjQH/jJkOnMucTrUgXMT4xuHy8A1
+BBxGlqpyI2pFMCtfs2BTouQ8egKgcM839JmPMbo/XNdvkzwgAnCguy9f1n9hzgMj
+HB7udU9D3dfPTWP/QVAjgyvN2qNt0kD3cSOJt4CpoOUd8RiZvHnxRooWH/ofPENU
+nYjRebsbiEDMGZIkktNABXCoNZbclS6SaZLUP2eT18TtJxAmwR2KNn6YpZhUP0bM
+DcnFbnU0m8B0BIKnQQ/S15cuShYiViSxe976YbD7o5Sfgci12GoK75d5Fu8qKafl
+cX68KXcld6RAdy/IwGy1cO9HyDVXqPmXG2QgchUehrWwv6x9wpY4yYp6JuyHUEU=
+=FDxS
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/4.0.13/resin.conf b/www-servers/resin/files/4.0.13/resin.conf
index b205f671a22d..a48840b5e9f2 100644
--- a/www-servers/resin/files/4.0.13/resin.conf
+++ b/www-servers/resin/files/4.0.13/resin.conf
@@ -10,3 +10,7 @@
 
 # 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
index 106367785453..ffdecf020cb4 100644
--- a/www-servers/resin/files/4.0.13/resin.init
+++ b/www-servers/resin/files/4.0.13/resin.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.13/resin.init,v 1.1 2010/12/12 15:54:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.13/resin.init,v 1.2 2010/12/12 16:22:51 nelchael Exp $
 
 depend() {
 	need net
@@ -21,7 +21,7 @@ runResin() {
 	local msg="${1}"
 	shift
 
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
+	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} ${@}"
 
 	ebegin "${msg}"
 	su - resin -c "${cmdline}"
diff --git a/www-servers/resin/resin-4.0.13.ebuild b/www-servers/resin/resin-4.0.13-r1.ebuild
index b3733ea55229..41399fc82d99 100644
--- a/www-servers/resin/resin-4.0.13.ebuild
+++ b/www-servers/resin/resin-4.0.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.13.ebuild,v 1.1 2010/12/12 14:04:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.13-r1.ebuild,v 1.1 2010/12/12 16:22:51 nelchael Exp $
 
 EAPI="2"