add SHELL to startup script - fixes #140349

Package-Manager: portage-2.1.1

4 files changed, 25 insertions, 10 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/Manifest b/www-servers/lighttpd/Manifest
index 846946a31e49..7f1c73597dff 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -58,6 +58,10 @@ AUX lighttpd-1.3.13-php.diff 1399 RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f9
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
 RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f99 files/lighttpd-1.3.13-php.diff 1399
 SHA256 dcf102367a768f8d6b1273327e5299a17f597ea4f7939b485c30a71bee8143ef files/lighttpd-1.3.13-php.diff 1399
+AUX lighttpd.confd 161 RMD160 60defeb308c6366c4009a0f3ec20f6e37ac4e4a5 SHA1 fa1c812adae667262df1ddc8ce81204b81bff201 SHA256 4b50e91f689beb57148ef1561af2f3c4c8062feb0bc4031d39176d36dce3ec87
+MD5 5ce79982f7ad8b15d03d6ce12c3f1d97 files/lighttpd.confd 161
+RMD160 60defeb308c6366c4009a0f3ec20f6e37ac4e4a5 files/lighttpd.confd 161
+SHA256 4b50e91f689beb57148ef1561af2f3c4c8062feb0bc4031d39176d36dce3ec87 files/lighttpd.confd 161
 AUX lighttpd.initd 1232 RMD160 dcdc9196b6a11b98d6e54f1b0d02b5ff784cd845 SHA1 9957bf5c2b42510f6e2549b5c882953dc06a32f3 SHA256 39c9dc6c192878ab95e7d487168a778be98fc0989a10bd103b6b2723aaef8de3
 MD5 795944f04932a980650397d21a4264f9 files/lighttpd.initd 1232
 RMD160 dcdc9196b6a11b98d6e54f1b0d02b5ff784cd845 files/lighttpd.initd 1232
@@ -80,14 +84,14 @@ EBUILD lighttpd-1.3.16.ebuild 2589 RMD160 3ff48e9342813af77cc82ff0c6b4dad51dc6ab
 MD5 0df89754aec138ad20821ef93c45833b lighttpd-1.3.16.ebuild 2589
 RMD160 3ff48e9342813af77cc82ff0c6b4dad51dc6ab2e lighttpd-1.3.16.ebuild 2589
 SHA256 1e35432b058eb98b7344d34bcef5272a85ba761afb7d9d10fdf57ec56a03a9b4 lighttpd-1.3.16.ebuild 2589
-EBUILD lighttpd-1.4.11.ebuild 5342 RMD160 c2b1251c49162f09d256926365a2d3b947b4d15a SHA1 6a7b3e0a754d8a9bdfbdc5f0555c798f1120d114 SHA256 bbad478a27f9d2abed42179d5677427ad8acdfe0689313b345c629a42c3e613c
-MD5 3b4eaf1ca30a75ab0cff6ce08aa3887a lighttpd-1.4.11.ebuild 5342
-RMD160 c2b1251c49162f09d256926365a2d3b947b4d15a lighttpd-1.4.11.ebuild 5342
-SHA256 bbad478a27f9d2abed42179d5677427ad8acdfe0689313b345c629a42c3e613c lighttpd-1.4.11.ebuild 5342
-MISC ChangeLog 24139 RMD160 9aacab8a8076c063fe4755fc158e28a6323a63a5 SHA1 c18b2b797c3b6305e2b21edb462397afd58cf936 SHA256 0393946a4d7b6329eb68071ca8bbbf261179e48f8a8a4bd20406c17fffdaf4fc
-MD5 1ce42230a682d6e68c119a5da964b015 ChangeLog 24139
-RMD160 9aacab8a8076c063fe4755fc158e28a6323a63a5 ChangeLog 24139
-SHA256 0393946a4d7b6329eb68071ca8bbbf261179e48f8a8a4bd20406c17fffdaf4fc ChangeLog 24139
+EBUILD lighttpd-1.4.11.ebuild 5397 RMD160 71bd74892febf073ce82e86954744a425b91c986 SHA1 f22e7035107cce6449a157ab292c5a35cd895b84 SHA256 c783356629986ff17953d41b901e7bfd16f2416102e79338089e89330a33cb83
+MD5 262005de52280372a324cc58390f0864 lighttpd-1.4.11.ebuild 5397
+RMD160 71bd74892febf073ce82e86954744a425b91c986 lighttpd-1.4.11.ebuild 5397
+SHA256 c783356629986ff17953d41b901e7bfd16f2416102e79338089e89330a33cb83 lighttpd-1.4.11.ebuild 5397
+MISC ChangeLog 24287 RMD160 e94a82500e55e7546eb5ca0e2d01e07ce92962f4 SHA1 1a304e9b89af3dfe49db02ced5ed4175b9310579 SHA256 c8110aabcd6f663a7cdc4cec3f83e95d5708bc8ce26c1dbeab58d07c8af043c5
+MD5 33fcb38a219fde685561d1041116a137 ChangeLog 24287
+RMD160 e94a82500e55e7546eb5ca0e2d01e07ce92962f4 ChangeLog 24287
+SHA256 c8110aabcd6f663a7cdc4cec3f83e95d5708bc8ce26c1dbeab58d07c8af043c5 ChangeLog 24287
 MISC metadata.xml 726 RMD160 a4e58899dbe2a328fe699a564a67666809b385fc SHA1 1d02ea35425790ffcdcfb83813123af4c50be5d8 SHA256 c99edd41b36c5354a29c2fa2e37fccd83568d306d1531f0ce7bbaebf703f2a56
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
 RMD160 a4e58899dbe2a328fe699a564a67666809b385fc metadata.xml 726
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