Fix init script to change into configured directory before starting, reported by Laurence Withers in bug #142047

(Portage version: 2.1.1_rc1-r4)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 73 deletions

diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index b9c058208a17..edb211131168 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -10,23 +10,23 @@ AUX thttpd-2.25/thttpd.confd 1152 RMD160 78503da6afa0bae20ecace503a3f5f8b7532c4e
 MD5 84af2600ce2cfa9331871027accd00f5 files/thttpd-2.25/thttpd.confd 1152
 RMD160 78503da6afa0bae20ecace503a3f5f8b7532c4ee files/thttpd-2.25/thttpd.confd 1152
 SHA256 cb723bdc62b339a20c238989d45d26bfcd79fa3a8d31e9bd666fdef979c31c54 files/thttpd-2.25/thttpd.confd 1152
-AUX thttpd-2.25/thttpd.init 828 RMD160 4ccd693406c020966892c6de7895434a0a66a386 SHA1 f1bef7c4f130e01f1a9618c9381dee9bb7f97374 SHA256 4ff9bca163ecede8c27419fb88cba40688916d369ecc3532a548f5fa343403bd
-MD5 98bfd7ed90b6a438a940413d5e541c29 files/thttpd-2.25/thttpd.init 828
-RMD160 4ccd693406c020966892c6de7895434a0a66a386 files/thttpd-2.25/thttpd.init 828
-SHA256 4ff9bca163ecede8c27419fb88cba40688916d369ecc3532a548f5fa343403bd files/thttpd-2.25/thttpd.init 828
-DIST thttpd-2.25b.tar.gz 132363
-EBUILD thttpd-2.25b-r4.ebuild 1349 RMD160 f302f451fe40879f5169a39a9cbb6862d59a2283 SHA1 c3ef94539a6788fb491598f1b89066ee37ef4ad6 SHA256 3148b88f5291964120abc4e2134df26e3f82dc1cb9d79eb46d2662f342a989ca
-MD5 ae4f93b21fbf24cf90efcebf19d191a5 thttpd-2.25b-r4.ebuild 1349
-RMD160 f302f451fe40879f5169a39a9cbb6862d59a2283 thttpd-2.25b-r4.ebuild 1349
-SHA256 3148b88f5291964120abc4e2134df26e3f82dc1cb9d79eb46d2662f342a989ca thttpd-2.25b-r4.ebuild 1349
-MISC ChangeLog 3399 RMD160 b819a00c1323aa776b57251a140037434e4bdd42 SHA1 7206b071e6668476bc3d6829fd8d1e9194ce0e22 SHA256 26ea22716c142c626d253e1288f72e13dc76f6836d147634123ed7e692e38093
-MD5 dabd53152a76aa76e21f94f46bbcba16 ChangeLog 3399
-RMD160 b819a00c1323aa776b57251a140037434e4bdd42 ChangeLog 3399
-SHA256 26ea22716c142c626d253e1288f72e13dc76f6836d147634123ed7e692e38093 ChangeLog 3399
+AUX thttpd-2.25/thttpd.init 745 RMD160 cb2eda2714728f8cee568b83013f3b5bb70974e7 SHA1 83fdd54a3ac959dc5c6a066a181a41c1d898ed9c SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da
+MD5 6a79014b083c00c6acc79966655ae42c files/thttpd-2.25/thttpd.init 745
+RMD160 cb2eda2714728f8cee568b83013f3b5bb70974e7 files/thttpd-2.25/thttpd.init 745
+SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da files/thttpd-2.25/thttpd.init 745
+DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
+EBUILD thttpd-2.25b-r5.ebuild 1344 RMD160 80cf2562f4846e2dbc0fc80c02636427206e6cad SHA1 c8554028379198aa8e4a300255c05e6ff3c8159f SHA256 b4b34c0dc274e9720050b7ec5feec22956ad10fff59b740e72466e8d263e87ff
+MD5 632ca976019fa51f53d57bd554c90108 thttpd-2.25b-r5.ebuild 1344
+RMD160 80cf2562f4846e2dbc0fc80c02636427206e6cad thttpd-2.25b-r5.ebuild 1344
+SHA256 b4b34c0dc274e9720050b7ec5feec22956ad10fff59b740e72466e8d263e87ff thttpd-2.25b-r5.ebuild 1344
+MISC ChangeLog 3673 RMD160 5c80263c41c2edbee7d60904486949effcd72e43 SHA1 ed9d5cdd57627881c52472915a3c6ffcf28726ab SHA256 c34c64912aa96f2c796b5f28d2fc63d5bc3071a72023b563906a1a1110a5eb95
+MD5 e2cf24cb230c6fa10f5f33a9dd5bff84 ChangeLog 3673
+RMD160 5c80263c41c2edbee7d60904486949effcd72e43 ChangeLog 3673
+SHA256 c34c64912aa96f2c796b5f28d2fc63d5bc3071a72023b563906a1a1110a5eb95 ChangeLog 3673
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165
 SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c metadata.xml 165
-MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25b-r4 64
-RMD160 e07d93ee3f9136a298fa5c9189701557c540167c files/digest-thttpd-2.25b-r4 64
-SHA256 6444ae628126f23ed792f84a3bbb8ca0cf65eba3c1495dee2169766239335bea files/digest-thttpd-2.25b-r4 64
+MD5 4bc6def57b02ee5c45bb3bd196b36642 files/digest-thttpd-2.25b-r5 238
+RMD160 ba623358749f8f3fe04f6ae043e7f76f10e67a4c files/digest-thttpd-2.25b-r5 238
+SHA256 6e08f96c75dcd361ad63bd4aab9229f8cf6d544622eb8612ae57fddca2ee2a6e files/digest-thttpd-2.25b-r5 238
diff --git a/www-servers/thttpd/files/digest-thttpd-2.25b-r4 b/www-servers/thttpd/files/digest-thttpd-2.25b-r4
deleted file mode 100644
index 823600acb15d..000000000000
--- a/www-servers/thttpd/files/digest-thttpd-2.25b-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0e9cd87455d3a0ea11e5ea7e947adf6 thttpd-2.25b.tar.gz 132363
diff --git a/www-servers/thttpd/thttpd-2.25b-r4.ebuild b/www-servers/thttpd/thttpd-2.25b-r4.ebuild
deleted file mode 100644
index df4d3a178b99..000000000000
--- a/www-servers/thttpd/thttpd-2.25b-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r4.ebuild,v 1.5 2006/01/01 20:55:11 metalgod Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P%[a-z]*}"
-
-DESCRIPTION="Small and fast multiplexing webserver."
-HOMEPAGE="http://www.acme.com/software/thttpd/"
-SRC_URI="http://www.acme.com/software/thttpd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc x86"
-IUSE="static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}/fix-insecure-tmp-creation-CVE-2005-3124.diff
-}
-
-src_compile() {
-	## TODO: what to do with IPv6?
-
-	append-ldflags $(bindnow-flags)
-	use static && append-ldflags -static
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	dodir /usr/share/man/man1
-	make prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		WEBGROUP=nogroup \
-		WEBDIR=${D}/var/www/localhost \
-		"$@" install || die "make install failed"
-
-	mv ${D}/usr/sbin/{,th_}htpasswd
-	mv ${D}/usr/share/man/man1/{,th_}htpasswd.1
-
-	newinitd ${FILESDIR}/${MY_P}/thttpd.init thttpd
-	newconfd ${FILESDIR}/${MY_P}/thttpd.confd thttpd
-
-	dodoc README INSTALL TODO
-
-	insinto /etc/thttpd
-	doins ${FILESDIR}/${MY_P}/thttpd.conf.sample
-}
-
-pkg_postinst() {
-	einfo "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
-}