From 63b600c2f8de92aa0c33313886cbca93824890ea Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Thu, 24 May 2007 14:18:43 +0000 Subject: Make the init.d script free of bash syntax, see bug #179633. Package-Manager: portage-2.1.2.7 --- www-servers/resin/ChangeLog | 6 ++++- www-servers/resin/Manifest | 38 +++++++++++++++---------------- www-servers/resin/files/3.0.22/resin.init | 6 ++--- www-servers/resin/files/3.0.23/resin.init | 6 ++--- www-servers/resin/files/3.1.1/resin.init | 8 +++---- 5 files changed, 34 insertions(+), 30 deletions(-) (limited to 'www-servers') diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index 60145fbae12d..945ded7a9d51 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/resin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.46 2007/05/18 15:10:32 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.47 2007/05/24 14:18:43 nelchael Exp $ + + 24 May 2007; Krzysiek Pawlik + files/3.0.22/resin.init, files/3.0.23/resin.init, files/3.1.1/resin.init: + Make the init.d script free of bash syntax, see bug #179633. 18 May 2007; Krzysiek Pawlik resin-3.0.22.ebuild: Fix RDEPEND. diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index 72e011d7f183..db92346c58c2 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -25,10 +25,10 @@ AUX 3.0.22/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 3 MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.22/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.22/resin.conf 791 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.22/resin.conf 791 -AUX 3.0.22/resin.init 955 RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 SHA1 6c2afd3d5edad63baba94bf07fb814ea3fd48481 SHA256 2dfc51c94319d4cccd5ac5086ea3761a4d68a1e2585492790919cd0138fb4175 -MD5 9f676cf44140395b22cdd5b04ec0aef9 files/3.0.22/resin.init 955 -RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 files/3.0.22/resin.init 955 -SHA256 2dfc51c94319d4cccd5ac5086ea3761a4d68a1e2585492790919cd0138fb4175 files/3.0.22/resin.init 955 +AUX 3.0.22/resin.init 951 RMD160 16eb9a1ada923df0856d89e9ab590ae251eb1bc8 SHA1 9ea0bfc4a350347fb57c03d44f4ca38d48e067a1 SHA256 b19014f8dc8dc09e7e63d83eeb543b4b62330eecc11b8af0a25020a971cf72bd +MD5 7c721449f590e21647ce5c7d905a544f files/3.0.22/resin.init 951 +RMD160 16eb9a1ada923df0856d89e9ab590ae251eb1bc8 files/3.0.22/resin.init 951 +SHA256 b19014f8dc8dc09e7e63d83eeb543b4b62330eecc11b8af0a25020a971cf72bd files/3.0.22/resin.init 951 AUX 3.0.23/resin-3.0.23-gentoo.patch 10121 RMD160 2fec131a2e68c8a3191f62a28435c58c6eabacb5 SHA1 13bbfa02868fbf6c53c111f69c20b930f35afe14 SHA256 402aaa73057f59ef7b4c171eb12471c761b500b392748409504b038d82f7f79a MD5 eb0955c1afae395b12dc78928f4df6e7 files/3.0.23/resin-3.0.23-gentoo.patch 10121 RMD160 2fec131a2e68c8a3191f62a28435c58c6eabacb5 files/3.0.23/resin-3.0.23-gentoo.patch 10121 @@ -37,10 +37,10 @@ AUX 3.0.23/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 3 MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.23/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.23/resin.conf 791 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.23/resin.conf 791 -AUX 3.0.23/resin.init 955 RMD160 863d7a7449fc902494958367f2b0cd65bdd0d9c2 SHA1 6e3e539a11802594e57c6690bc0f37c134849361 SHA256 e25f9684676020458155473180797e1734e39b05f557fd26c166a3662e284138 -MD5 cffb8354a138bd1a43fcb70cc8fc91b7 files/3.0.23/resin.init 955 -RMD160 863d7a7449fc902494958367f2b0cd65bdd0d9c2 files/3.0.23/resin.init 955 -SHA256 e25f9684676020458155473180797e1734e39b05f557fd26c166a3662e284138 files/3.0.23/resin.init 955 +AUX 3.0.23/resin.init 951 RMD160 5770a06dac99475a94943f125f3b236e33372a06 SHA1 b513f41e9117d1a3e0023225ccefc99cf2ca5baf SHA256 70de55e5930032759fa7d1fdb5addce8dc71281143154e8922c1b7e8d00fb604 +MD5 c528c07cd8359907e8ddbe4f3f7d8a82 files/3.0.23/resin.init 951 +RMD160 5770a06dac99475a94943f125f3b236e33372a06 files/3.0.23/resin.init 951 +SHA256 70de55e5930032759fa7d1fdb5addce8dc71281143154e8922c1b7e8d00fb604 files/3.0.23/resin.init 951 AUX 3.1.1/resin-3.1.1-gentoo.patch 7476 RMD160 9f03bcd1fcacc301b7cbe74f4948d300d358a3ed SHA1 f541869159b5483d0e570929f2957c1343830638 SHA256 c03d506f97cfc301dc134c350ccfb44ec8d168dd51eb9ca724717c366f5c42ce MD5 55a57949a29acb38a65f7fb2f5254ee0 files/3.1.1/resin-3.1.1-gentoo.patch 7476 RMD160 9f03bcd1fcacc301b7cbe74f4948d300d358a3ed files/3.1.1/resin-3.1.1-gentoo.patch 7476 @@ -49,10 +49,10 @@ AUX 3.1.1/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c3 MD5 4ccfaa3a9f3c4f386c77659a6ef91f71 files/3.1.1/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c files/3.1.1/resin.conf 425 SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c files/3.1.1/resin.conf 425 -AUX 3.1.1/resin.init 839 RMD160 06ec56cb0a4d9c3e89fb59fcda981d30202b1598 SHA1 ba07f8f1a399ec1d1d80f6c4d76bd9e1a7f87597 SHA256 6bc198f37f6abfd5baa48c28a354ff7a5bda039d2bb2977488407b090187e746 -MD5 09b4820aa49c8e9af8a5bbf566e3c869 files/3.1.1/resin.init 839 -RMD160 06ec56cb0a4d9c3e89fb59fcda981d30202b1598 files/3.1.1/resin.init 839 -SHA256 6bc198f37f6abfd5baa48c28a354ff7a5bda039d2bb2977488407b090187e746 files/3.1.1/resin.init 839 +AUX 3.1.1/resin.init 826 RMD160 2021befc854746c4a31cfa8cc3a80108b3e8aaad SHA1 75d9e725911832085a24b5e3d6a3894849bef59f SHA256 85bbc3b77ad9887fbac98f90cf7c1fca3eb14fb4744a5c4277830df2a88faf3d +MD5 c0a55d189f02d4454edbcc5938d25590 files/3.1.1/resin.init 826 +RMD160 2021befc854746c4a31cfa8cc3a80108b3e8aaad files/3.1.1/resin.init 826 +SHA256 85bbc3b77ad9887fbac98f90cf7c1fca3eb14fb4744a5c4277830df2a88faf3d files/3.1.1/resin.init 826 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d @@ -73,10 +73,10 @@ EBUILD resin-3.1.1-r1.ebuild 3568 RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fc MD5 972cfa2bdf9f5c1c9d812ad99aa3de4d resin-3.1.1-r1.ebuild 3568 RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fcf resin-3.1.1-r1.ebuild 3568 SHA256 017d161cf41a741e2823fc99cac2f8649b8a5d59bd6fcdf6fadaff31d7d0ce52 resin-3.1.1-r1.ebuild 3568 -MISC ChangeLog 9782 RMD160 8cb31fed882e59af0a5c4aa69f878a2ff32071d8 SHA1 8f98491ff91b68ec26fc131635404ee62d69e7a4 SHA256 1e4259d3cbadee26d96aa2f4fa025a7e4fb977d90a512997de15001a7282be1d -MD5 9d0ac987614957f23688215a4867e70b ChangeLog 9782 -RMD160 8cb31fed882e59af0a5c4aa69f878a2ff32071d8 ChangeLog 9782 -SHA256 1e4259d3cbadee26d96aa2f4fa025a7e4fb977d90a512997de15001a7282be1d ChangeLog 9782 +MISC ChangeLog 9975 RMD160 3b11bb9e2dbc226ad3fb9848832a05cc9d8cf4b7 SHA1 ef20596684338d340cdcd9342f88c37218e9b03d SHA256 c4c8d50d17ee88d9ed05f5a93757a326de985e3f115f8cba7d71c187a9bf0c68 +MD5 2b0cf4dd719b96a3aa51e7c83ba82134 ChangeLog 9975 +RMD160 3b11bb9e2dbc226ad3fb9848832a05cc9d8cf4b7 ChangeLog 9975 +SHA256 c4c8d50d17ee88d9ed05f5a93757a326de985e3f115f8cba7d71c187a9bf0c68 ChangeLog 9975 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229 @@ -96,7 +96,7 @@ SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGTcI2go/w9rxVVVERAibaAKCOmf0FQm88zXohZalQrf5z1x0qKwCgs6Ws -Sb00Nxil61bpuu93plOrhuw= -=CP3k +iD8DBQFGVZ8Ygo/w9rxVVVERAmDKAKCCLrMoqp/oRkuw4No1Hxg6QDWI8gCgm4Q6 +QCr8V36mABSSPng5WyV7kfA= +=cA5n -----END PGP SIGNATURE----- diff --git a/www-servers/resin/files/3.0.22/resin.init b/www-servers/resin/files/3.0.22/resin.init index 075eb2e40e5b..6906678e0221 100644 --- a/www-servers/resin/files/3.0.22/resin.init +++ b/www-servers/resin/files/3.0.22/resin.init @@ -1,7 +1,7 @@ #!/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.22/resin.init,v 1.2 2007/01/08 22:44:55 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.22/resin.init,v 1.3 2007/05/24 14:18:43 nelchael Exp $ depend() { need net @@ -10,7 +10,7 @@ depend() { start() { JAVA_HOME=$(java-config -O) - [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) export JAVA_HOME ebegin "Starting Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}" @@ -19,7 +19,7 @@ start() { stop() { JAVA_HOME=$(java-config -O) - [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) export JAVA_HOME ebegin "Stopping Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}" diff --git a/www-servers/resin/files/3.0.23/resin.init b/www-servers/resin/files/3.0.23/resin.init index 48ecf089bdc3..3937c573ace5 100644 --- a/www-servers/resin/files/3.0.23/resin.init +++ b/www-servers/resin/files/3.0.23/resin.init @@ -1,7 +1,7 @@ #!/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.23/resin.init,v 1.1 2007/05/15 16:36:50 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.23/resin.init,v 1.2 2007/05/24 14:18:43 nelchael Exp $ depend() { need net @@ -10,7 +10,7 @@ depend() { start() { JAVA_HOME=$(java-config -O) - [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) export JAVA_HOME ebegin "Starting Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}" @@ -19,7 +19,7 @@ start() { stop() { JAVA_HOME=$(java-config -O) - [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) export JAVA_HOME ebegin "Stopping Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}" diff --git a/www-servers/resin/files/3.1.1/resin.init b/www-servers/resin/files/3.1.1/resin.init index 7863a112a7ba..200b4844c13b 100644 --- a/www-servers/resin/files/3.1.1/resin.init +++ b/www-servers/resin/files/3.1.1/resin.init @@ -1,21 +1,21 @@ #!/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.1.1/resin.init,v 1.2 2007/05/18 13:10:16 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.1/resin.init,v 1.3 2007/05/24 14:18:43 nelchael Exp $ depend() { need net use dns logger mysql postgresql } -function runResin() { +runResin() { JAVA_HOME=$(java-config -O) - [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) export JAVA_HOME local extraArgs= - if [[ "${VERBOSE}" = "yes" ]]; then + if [ "${VERBOSE}" = "yes" ]; then extraArgs="-verbose" fi -- cgit v1.2.3-65-gdbad