Remove bashisms from spawn-fcgi

Package-Manager: portage-2.1.2.3

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 8a78fd0673ee4f1f8ac35265210c357b1c71ebd0..663cec7e6ee0e1d19d470abcf2241a7cf15779f9 100644 (file)
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.106 2007/04/01 23:22:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.107 2007/04/02 12:46:08 uberlord Exp $
+
+  02 Apr 2007; Roy Marples <uberlord@gentoo.org> files/spawn-fcgi.initd:
+  Remove bashisms from spawn-fcgi
 
   01 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
   +files/conf/mod_fastcgi.conf-1.4.13-r2, lighttpd-1.4.13-r2.ebuild:

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index c61d065e8b707af9c58c013586d3a5dfd224719c..79cf27a2450ee64118475da505b4dc997b347093 100644 (file)
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -98,10 +98,10 @@ AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 8
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 files/spawn-fcgi.confd 1076
 SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 files/spawn-fcgi.confd 1076
-AUX spawn-fcgi.initd 1383 RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 SHA1 fec5bd3a132b2a1c664a84bd3be76f386046e7ce SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6
-MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
-RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 files/spawn-fcgi.initd 1383
-SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6 files/spawn-fcgi.initd 1383
+AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1
+MD5 78bc6ceac57ecaa47abf4d5df857fe57 files/spawn-fcgi.initd 1398
+RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 files/spawn-fcgi.initd 1398
+SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 files/spawn-fcgi.initd 1398
 DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA1 47449370b58f488350a54d54b416747228e4120f SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369
 DIST lighttpd-1.4.11.tar.gz 781656 RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f SHA1 ca904d3d4d9dde76f85156f2c709a394f30e28c8 SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c
 DIST lighttpd-1.4.13.tar.gz 797813 RMD160 4e67e42dc3692d50c044561cc903de7b906f260c SHA1 b17553e66609f85baec50263712a4a5aeca50ca5 SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
@@ -125,10 +125,10 @@ EBUILD lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199
 MD5 cca2c68140d653460de5c5895f3b6d6e lighttpd-1.4.13.ebuild 5431
 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 lighttpd-1.4.13.ebuild 5431
 SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5 lighttpd-1.4.13.ebuild 5431
-MISC ChangeLog 28160 RMD160 e739cc1f89b5c64995cffe523200113b6307e94d SHA1 d0f856ce8946f6f4fac398ddc8ef7268e466b064 SHA256 1aadf65dff2dbf72bc7502413f186334354313539d01d594603a5769439cfc64
-MD5 e69b014252abf2fa07a9c7f4eae59990 ChangeLog 28160
-RMD160 e739cc1f89b5c64995cffe523200113b6307e94d ChangeLog 28160
-SHA256 1aadf65dff2dbf72bc7502413f186334354313539d01d594603a5769439cfc64 ChangeLog 28160
+MISC ChangeLog 28269 RMD160 df3f0f709b940298c3b8454c5f84ff6ccbf372d9 SHA1 9b52770f07b078febe948f696c5a618d5337c970 SHA256 9b20033a6c0b6fa831a21434fa5c363e8e31207a7a5ebb08b2347a374dee0b8f
+MD5 f8f6666cadde062f2d139a31f8b5dcb6 ChangeLog 28269
+RMD160 df3f0f709b940298c3b8454c5f84ff6ccbf372d9 ChangeLog 28269
+SHA256 9b20033a6c0b6fa831a21434fa5c363e8e31207a7a5ebb08b2347a374dee0b8f ChangeLog 28269
 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1
 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725
 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725

diff --git a/www-servers/lighttpd/files/spawn-fcgi.initd b/www-servers/lighttpd/files/spawn-fcgi.initd
index 2f93285ddb6b68b09cb24fe0b45937be3c17f332..63daa75081f9c4c0ee962d07ae54ac819a1388d8 100644 (file)
--- a/www-servers/lighttpd/files/spawn-fcgi.initd
+++ b/www-servers/lighttpd/files/spawn-fcgi.initd
@@ -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/lighttpd/files/spawn-fcgi.initd,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/spawn-fcgi.initd,v 1.2 2007/04/02 12:46:08 uberlord Exp $
 
 SPAWNFCGI_PID="/var/run/spawn-fcgi.pid"
 
@@ -40,10 +40,12 @@ start() {
 
 stop() {
         ebegin "Stopping spawn-fcgi"
-        kill `cat ${SPAWNFCGI_PID}`
-               [[ $? -ne 0 ]] && eend $?
+        if ! kill `cat ${SPAWNFCGI_PID}` ; then
+           eend $?
+           return 1
+       fi
         if [ -w ${SPAWNFCGI_PID} ]; then
-                rm ${SPAWNFCGI_PID};
+                rm ${SPAWNFCGI_PID}
         fi
         eend 0
 }