summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2006-09-29 21:18:20 +0000
committerThilo Bangert <bangert@gentoo.org>2006-09-29 21:18:20 +0000
commit059bf7bc165ac42ea8a2f48bc116c391b7978363 (patch)
tree9bfd42506a5999647681f098931066eb6ee2d41a /www-servers
parentversion bump, upstream merged all our patches, we seem to do something right (diff)
downloadgentoo-2-059bf7bc165ac42ea8a2f48bc116c391b7978363.tar.gz
gentoo-2-059bf7bc165ac42ea8a2f48bc116c391b7978363.tar.bz2
gentoo-2-059bf7bc165ac42ea8a2f48bc116c391b7978363.zip
add SHELL to startup script - fixes #140349
(Portage version: 2.1.1)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/lighttpd/ChangeLog6
-rw-r--r--www-servers/lighttpd/files/lighttpd.confd6
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.11.ebuild3
3 files changed, 13 insertions, 2 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index b735483c4f4b..e78cd0522e44 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/lighttpd
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.81 2006/09/05 17:54:01 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.82 2006/09/29 21:18:20 bangert Exp $
+
+ 29 Sep 2006; Thilo Bangert <bangert@gentoo.org> +files/lighttpd.confd,
+ lighttpd-1.4.11.ebuild:
+ add SHELL to startup script - fixes #140349
05 Sep 2006; Thomas Cort <tcort@gentoo.org> lighttpd-1.4.11.ebuild:
Added ~alpha keyword wrt Bug #123436.
diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
new file mode 100644
index 000000000000..1b9063740376
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/lighttpd
+
+# Location of a shell used by the 'include_shell' directive
+# in the lighttpd's configuration file - fixes bug#140349
+SHELL="/bin/bash"
+
diff --git a/www-servers/lighttpd/lighttpd-1.4.11.ebuild b/www-servers/lighttpd/lighttpd-1.4.11.ebuild
index 3c559e34f022..a707b1651938 100644
--- a/www-servers/lighttpd/lighttpd-1.4.11.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.11.ebuild,v 1.10 2006/09/05 17:54:01 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.11.ebuild,v 1.11 2006/09/29 21:18:20 bangert Exp $
inherit eutils autotools depend.php
@@ -143,6 +143,7 @@ src_install() {
# init script stuff
newinitd ${FILESDIR}/lighttpd.initd lighttpd || die
+ newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
use fam && has_version app-admin/fam && \
sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd