diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-04-12 18:00:42 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-04-12 18:00:42 +0000 |
| commit | a577e66534136139edb210043fff5a2fc19c32f3 (patch) | |
| tree | cdb9cbe30fbf9de83b7504fe162bffc9dc6e63ef /www-servers/spawn-fcgi | |
| parent | stable ppc64, bug 265702 (diff) | |
| download | historical-a577e66534136139edb210043fff5a2fc19c32f3.tar.gz historical-a577e66534136139edb210043fff5a2fc19c32f3.tar.bz2 historical-a577e66534136139edb210043fff5a2fc19c32f3.zip | |
warn if FCGI_PROGRAM is not executable - fix lineendings (bug #265454) - thanks Elias Probbst
Package-Manager: portage-2.2_rc26/cvs/Linux i686
Diffstat (limited to 'www-servers/spawn-fcgi')
| -rw-r--r-- | www-servers/spawn-fcgi/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.initd | 23 |
3 files changed, 22 insertions, 11 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index a90fb99a28e5..2c2e1338530f 100644 --- a/www-servers/spawn-fcgi/ChangeLog +++ b/www-servers/spawn-fcgi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/spawn-fcgi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.9 2009/04/12 12:44:37 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.10 2009/04/12 18:00:41 bangert Exp $ + + 12 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.initd: + add extra warning if FCGI_PROGRAM is not executable - fix lineendings + (bug #265454) 12 Apr 2009; Tobias Klausmann <klausman@gentoo.org> spawn-fcgi-1.6.1-r1.ebuild: diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest index 186a87e38a67..68a91cd85cde 100644 --- a/www-servers/spawn-fcgi/Manifest +++ b/www-servers/spawn-fcgi/Manifest @@ -1,6 +1,6 @@ AUX spawn-fcgi.confd 2139 RMD160 db0e89fc9602f864cbd21b20b0235d1a4cb48610 SHA1 d0e87700f2387699f598b29a1338990de10193bc SHA256 d2e8246fdbbb6961d4286cf43a1a0e60110a14b215435fc25087a94ef06ad6e3 -AUX spawn-fcgi.initd 2757 RMD160 93f3f54f20026a3ad06ef5566028f2f9c007276a SHA1 8b28e85d5baff189b4e2787b0460309e4e224407 SHA256 d95429ac463ae181299795ff0b52a4ed30e074863626698a851c8a0d1f4ef5b9 +AUX spawn-fcgi.initd 2966 RMD160 5ef1544717d365f7649d730518b6c2ab53548ff5 SHA1 67cf6ca6231deffc9aa365808431bda09243fae3 SHA256 9650693c1b7fe4a06b0e425732ebf7bcc3e0318be5395c152d20339ad941a213 DIST spawn-fcgi-1.6.1.tar.bz2 71975 RMD160 d906031b3ce40c4a7d682da8acd556f12e8f3fcb SHA1 e18db1367ac1e186972d02e4d9e67a3a34212fc2 SHA256 81301b74d66b8083f23e9c1e39d42fe71995cdf3d06d3beecf3a81a1782f523c EBUILD spawn-fcgi-1.6.1-r1.ebuild 847 RMD160 c590a17631d91e5869d8f33e9781e1b36ad09029 SHA1 6e766aaa1a126f427afc49373296d68110d7ae0a SHA256 8dc7269148efdd22f3570b27320cdace010ffaee11d66c6ac4969f4670b4c122 -MISC ChangeLog 1616 RMD160 cba13e77797d80f537c0f36b1ceba110dff910d8 SHA1 05aef7b3f137585a92713680bd4d4b5eede702c7 SHA256 3398513c2930a5079f337373157ddd62c604e7d3ddb1e16cb63dd2f1f3e868eb +MISC ChangeLog 1779 RMD160 35e0f0107e4d3990927098388cb812dff7be607f SHA1 682b7caab37392ef68cbe8b83a5b5b60ad52794a SHA256 229a0127b5efa196fd102db7fc61b5f06adc86c0f8fc391f3267d84b1cd7de06 MISC metadata.xml 454 RMD160 6d518892201f5edddc6a83e119384f5c57661d42 SHA1 37c722d45f2473c24620d92f5bc2b31e92f6385c SHA256 dad5c3b31bdf5cffbec7a56402ecc46a9ed1db288f9e27302ca3d53da5b0fe0c diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index 404465a3ba45..b904485dec6d 100644 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd +++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.7 2009/04/10 09:30:25 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.8 2009/04/12 18:00:42 bangert Exp $ PROGNAME=${SVCNAME#*.} SPAWNFCGI=/usr/bin/spawn-fcgi @@ -13,6 +13,9 @@ depend() { } start() { + local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC + FCGI_PROGRAM_EXEC=(${FCGI_PROGRAM}) + if [ "${SVCNAME}" = "spawn-fcgi" ]; then eerror "You are not supposed to run this script directly. Create a symlink" eerror "for the FastCGI application you want to run as well as a copy of the" @@ -33,13 +36,18 @@ start() { fi if [ -z "${FCGI_PROGRAM}" ]; then - eerror "You need to specify which FCGI program you want" - eerror "spawn-fcgi to start." - eerror "Look at /etc/conf.d/spawn-fcgi.${PROGNAME}" + eerror "You need to specify which \$FCGI_PROGRAM" + eerror "you want to start." + eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}" return 1 fi - local X E OPTIONS i RETVAL FCGI_PROGRAM_NAME + if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then + eerror "The file specified as \$FCGI_PROGRAM" + eerror "does not exist or is not executable." + eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}" + return 1 + fi if [ -z "${FCGI_ADDRESS}" ]; then FCGI_ADDRESS=127.0.0.1 @@ -69,7 +77,6 @@ start() { done ebegin "Starting FastCGI application ${PROGNAME}" - FCGI_PROGRAM_NAME=(${FCGI_PROGRAM}) X=0 while [ $X -lt ${FCGI_CHILDREN} ]; do X=$(($X+1)) @@ -78,8 +85,8 @@ start() { [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" - env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \ - --name ${FCGI_PROGRAM_NAME} -- ${SOCKET_OPTION} ${INET_OPTION} \ + env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \ + --name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \ -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} RETVAL=$? |