diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-15 12:23:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-15 12:23:24 +0000 |
| commit | 48803c925c4da70af80bddbea1de1c214fe0acd5 (patch) | |
| tree | 731e41e7c7336e6a4048b9665deefd6c905c0149 | |
| parent | 334ba4029aa89519fda0915bc31e1446f8c84b2e (diff) | |
| download | aports-48803c925c4da70af80bddbea1de1c214fe0acd5.tar.bz2 aports-48803c925c4da70af80bddbea1de1c214fe0acd5.tar.xz | |
main/lighttpd: fix bad shell substitution in spawn-fcgi
fixes #160
| -rw-r--r-- | main/lighttpd/APKBUILD | 7 | ||||
| -rw-r--r-- | main/lighttpd/spawn-fcgi.initd | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD index 0abe6dea..dac869b3 100644 --- a/main/lighttpd/APKBUILD +++ b/main/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lighttpd pkgver=1.4.23 -pkgrel=0 +pkgrel=1 pkgdesc="a secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" license="custom" @@ -11,7 +11,6 @@ makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig" source="http://www.$pkgname.net/download/$pkgname-$pkgver.tar.bz2 $pkgname.initd $pkgname.confd - $install $pkgname.logrotate spawn-fcgi.confd spawn-fcgi.initd @@ -70,11 +69,9 @@ build() { md5sums="0ab6bb7b17bf0f515ce7dce68e5e215a lighttpd-1.4.23.tar.bz2 6910842e8ba496e8aa984ab30a46eb72 lighttpd.initd 0dede109282bfe685bdec6b35f0e4b6b lighttpd.confd -e250fe505d07733e920348bea0909c29 lighttpd.pre-install -6e0e81296d854887e11bc4f8d6f998d7 lighttpd.post-install ad091c9157134890499f26d170352c9f lighttpd.logrotate 1d925aed297ec4541fb230dd19e11bc1 spawn-fcgi.confd -78bc6ceac57ecaa47abf4d5df857fe57 spawn-fcgi.initd +2f177ba0a35fd1c683edef3453c20bc8 spawn-fcgi.initd df5b2360ea380d988bf16905ab214286 lighttpd.conf fef397e7bcf1b741dea211a555e1803c mime-types.conf 9c1407e95f62ed22da66c4ef5f69c3b5 mod_cgi.conf diff --git a/main/lighttpd/spawn-fcgi.initd b/main/lighttpd/spawn-fcgi.initd index 63daa750..a4023a2c 100644 --- a/main/lighttpd/spawn-fcgi.initd +++ b/main/lighttpd/spawn-fcgi.initd @@ -7,6 +7,7 @@ SPAWNFCGI_PID="/var/run/spawn-fcgi.pid" depend() { need net + after firewall } start() { @@ -21,7 +22,7 @@ start() { # copy the allowed environment variables unset E for i in ${ALLOWED_ENV}; do - E="${E} ${i}=${!i}" + eval "E=\"${E} ${i}=\$${i}\"" done # clean environment and set up a new one @@ -49,3 +50,4 @@ stop() { fi eend 0 } + |