fix docroot issue (bug #187113 - thanks throw_away_2002) - remove stale files

Package-Manager: portage-2.1.2.12

6 files changed, 22 insertions, 102 deletions

diff --git a/www-servers/mini_httpd/ChangeLog b/www-servers/mini_httpd/ChangeLog
index 9b77643ac391..5839dd23e700 100644
--- a/www-servers/mini_httpd/ChangeLog
+++ b/www-servers/mini_httpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/mini_httpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/ChangeLog,v 1.8 2007/05/10 15:03:37 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/ChangeLog,v 1.9 2007/08/26 21:20:21 bangert Exp $
+
+  26 Aug 2007; Thilo Bangert <bangert@gentoo.org>
+  files/mini_httpd.confd-1.19, -files/mini_httpd.conf.sample,
+  -files/mini_httpd.confd, files/mini_httpd.init:
+  fix docroot issue (bug #187113 - thanks throw_away_2002) - remove stale files
 
   10 May 2007; Ferris McCormick <fmccor@gentoo.org> mini_httpd-1.19.ebuild:
   Add ~sparc keyword at user (renihs) request --- Bug #177923 --- no problems
diff --git a/www-servers/mini_httpd/Manifest b/www-servers/mini_httpd/Manifest
index f275d70ef898..39e3730eea48 100644
--- a/www-servers/mini_httpd/Manifest
+++ b/www-servers/mini_httpd/Manifest
@@ -1,32 +1,24 @@
-AUX mini_httpd.conf.sample 860 RMD160 b19798ca09597d32e1a3a92901477b8fa7d13ed7 SHA1 1f3ed1ffd5e0f756065b9cdca1a9b2f74f97e52b SHA256 548f0209fa9f44538fb706397b613c9d5b4e72f7fcfbc06f46eccca47a8c7641
-MD5 4999dd0e1f1fef19fee9d91e030157e7 files/mini_httpd.conf.sample 860
-RMD160 b19798ca09597d32e1a3a92901477b8fa7d13ed7 files/mini_httpd.conf.sample 860
-SHA256 548f0209fa9f44538fb706397b613c9d5b4e72f7fcfbc06f46eccca47a8c7641 files/mini_httpd.conf.sample 860
 AUX mini_httpd.conf.sample-1.19 860 RMD160 b19798ca09597d32e1a3a92901477b8fa7d13ed7 SHA1 1f3ed1ffd5e0f756065b9cdca1a9b2f74f97e52b SHA256 548f0209fa9f44538fb706397b613c9d5b4e72f7fcfbc06f46eccca47a8c7641
 MD5 4999dd0e1f1fef19fee9d91e030157e7 files/mini_httpd.conf.sample-1.19 860
 RMD160 b19798ca09597d32e1a3a92901477b8fa7d13ed7 files/mini_httpd.conf.sample-1.19 860
 SHA256 548f0209fa9f44538fb706397b613c9d5b4e72f7fcfbc06f46eccca47a8c7641 files/mini_httpd.conf.sample-1.19 860
-AUX mini_httpd.confd 1131 RMD160 5dadd6fe70503dd4088af665d34586c6d0cb8d5d SHA1 550eb053de171eda376937d3e3af86a957b91d24 SHA256 a8bf039f62ea9da32ca2008d68324d9aa621eb46e07f0122bd46a331dc6f220c
-MD5 9685388fae3963caf5d21c334d2bc4bb files/mini_httpd.confd 1131
-RMD160 5dadd6fe70503dd4088af665d34586c6d0cb8d5d files/mini_httpd.confd 1131
-SHA256 a8bf039f62ea9da32ca2008d68324d9aa621eb46e07f0122bd46a331dc6f220c files/mini_httpd.confd 1131
-AUX mini_httpd.confd-1.19 1278 RMD160 3cb5569e1799bb50378fbdd804fedca3cd143e96 SHA1 3a8c76779adecccd0e23e5678856eeddf6fb09f8 SHA256 ade301cb1c7c7e793d984ac0a618d33befe8e0e68cb27784116e08c70b1884e3
-MD5 a1d6cef277be7b652c38ea2087bb319e files/mini_httpd.confd-1.19 1278
-RMD160 3cb5569e1799bb50378fbdd804fedca3cd143e96 files/mini_httpd.confd-1.19 1278
-SHA256 ade301cb1c7c7e793d984ac0a618d33befe8e0e68cb27784116e08c70b1884e3 files/mini_httpd.confd-1.19 1278
-AUX mini_httpd.init 862 RMD160 3f525a041353b8be89202d977f81374b64b74e13 SHA1 de0d5cbbeb6c935a94a5af32daa9cfb090830f0e SHA256 7d493ef1016b292194621e9a80b14414dacb72e2dfe98105296f8cabdac6980f
-MD5 d71656642f1a0ea54524b71080fcb866 files/mini_httpd.init 862
-RMD160 3f525a041353b8be89202d977f81374b64b74e13 files/mini_httpd.init 862
-SHA256 7d493ef1016b292194621e9a80b14414dacb72e2dfe98105296f8cabdac6980f files/mini_httpd.init 862
+AUX mini_httpd.confd-1.19 1310 RMD160 21ff345ddcdf3b41f959c058d567e0d70e381839 SHA1 429ca147cf382a875d574162a6af55fd1892f1b1 SHA256 7a180b360c80c0883ebf150693f92756218bf99cd127071664e9987774bfe9d2
+MD5 cceb5cdd8a174456b0d9caa21ed45a3f files/mini_httpd.confd-1.19 1310
+RMD160 21ff345ddcdf3b41f959c058d567e0d70e381839 files/mini_httpd.confd-1.19 1310
+SHA256 7a180b360c80c0883ebf150693f92756218bf99cd127071664e9987774bfe9d2 files/mini_httpd.confd-1.19 1310
+AUX mini_httpd.init 744 RMD160 37ff35b466e6ce0633f4ed34cfec6889610e8ccd SHA1 381e6c876e8e3fa9fe5ce6783e0ec543ebc12253 SHA256 93249b62ae0190cabed790d677f29a440dec5c3e1e1056a2ab5cde0beeddbca8
+MD5 ec52d2db1ce52f1b088d474aeefe9da8 files/mini_httpd.init 744
+RMD160 37ff35b466e6ce0633f4ed34cfec6889610e8ccd files/mini_httpd.init 744
+SHA256 93249b62ae0190cabed790d677f29a440dec5c3e1e1056a2ab5cde0beeddbca8 files/mini_httpd.init 744
 DIST mini_httpd-1.19.tar.gz 42142 RMD160 376bda80c64395db9cbfbdeaea92dbee1f99ce65 SHA1 da1ce9cf717f16aea69a75d3a77e610e9a740cc7 SHA256 30e30fa22102dbea8b662ee258e6bf9ce687db5699fabdf3c2f518b717cebd96
 EBUILD mini_httpd-1.19.ebuild 1810 RMD160 c3c31b8fc64df5f2f64945a8266ac9ca2d4937d4 SHA1 882c096451d37d356b20a8d3631b0845537ea217 SHA256 c2b0a50c169d00c482aab87867218e234c2441589b17aad7f68362fba2e7357b
 MD5 b0076dae2b7e576f4c347aefd301f216 mini_httpd-1.19.ebuild 1810
 RMD160 c3c31b8fc64df5f2f64945a8266ac9ca2d4937d4 mini_httpd-1.19.ebuild 1810
 SHA256 c2b0a50c169d00c482aab87867218e234c2441589b17aad7f68362fba2e7357b mini_httpd-1.19.ebuild 1810
-MISC ChangeLog 2313 RMD160 cedff13bdacedf5e36619f1b78f7e05a96bc55f4 SHA1 6a2b3b29dee1eb7fb45ccda01010d534b0387242 SHA256 8302bc5a58625e96039e735ab854555779b2a63bd5c18960d068bb7676371415
-MD5 643e88ef76ee0c11af8ad29003538154 ChangeLog 2313
-RMD160 cedff13bdacedf5e36619f1b78f7e05a96bc55f4 ChangeLog 2313
-SHA256 8302bc5a58625e96039e735ab854555779b2a63bd5c18960d068bb7676371415 ChangeLog 2313
+MISC ChangeLog 2557 RMD160 b629c8fe437b86b1d836794cc7f8db736685d42e SHA1 c0e0e698bd19884b1c175528190cd6b80ab70b62 SHA256 84b57d1760e9bf879d63f458d55605aa5754eef91a2b62365de6d15eb8648ce9
+MD5 474def8208d73eb0f5cacb68cb8b0c5c ChangeLog 2557
+RMD160 b629c8fe437b86b1d836794cc7f8db736685d42e ChangeLog 2557
+SHA256 84b57d1760e9bf879d63f458d55605aa5754eef91a2b62365de6d15eb8648ce9 ChangeLog 2557
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165
diff --git a/www-servers/mini_httpd/files/mini_httpd.conf.sample b/www-servers/mini_httpd/files/mini_httpd.conf.sample
deleted file mode 100644
index 092f7a546b48..000000000000
--- a/www-servers/mini_httpd/files/mini_httpd.conf.sample
+++ /dev/null
@@ -1,47 +0,0 @@
-## /etc/mini_httpd.conf
-##
-## do not leave empty lines in here!
-## format is: key=value
-##
-## run in debug-mode?
-#debug
-##
-## what interface to bind to?
-## (default is binding to any interface)
-#host=www.example.org
-port=8080
-user=nobody
-##
-## CGI:
-##	?	match a single char
-##	*	matches any string excluding "/"
-##	**	matches any string including "/"
-##	separate multiple patterns with "|"
-#cgipat=**.sh|**.cgi
-##
-## chroot:
-chroot
-#nochroot
-##
-logfile=/var/log/mini_httpd.log
-pidfile=/var/run/mini_httpd.pid
-##
-charset=iso-8859-1
-##
-## control the caching: (in secs)
-#maxage 60
-##
-## useless setting (just modifies the http-header)
-## (see mini_httpd(8) and http://www.w3.org/P3P/ for more info)
-#p3p
-##
-## virtual hosting:
-#vhost
-##
-## cache-control: send this "max-age" in all HTTP-responses:
-#max-age=0
-##
-## ssl:
-#nossl
-#ssl
-#certfile=/tmp/mini_httpd.pem
diff --git a/www-servers/mini_httpd/files/mini_httpd.confd b/www-servers/mini_httpd/files/mini_httpd.confd
deleted file mode 100644
index f570bc460830..000000000000
--- a/www-servers/mini_httpd/files/mini_httpd.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd,v 1.1 2004/08/08 17:37:46 stuart Exp $
-
-## Config file for /etc/init.d/mini_httpd
-
-## the startup-dir of mini_httpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-#MINI_HTTPD_DOCROOT="/home/httpd/htdocs"
-
-## There are 2 ways to configure mini_httpd:
-##	1) specify all params on the cmd-line
-##	2) use a config-file (and start with "-C <conf-file>")
-## Note: 1) and 2) can be mixed.
-##
-## We choose 1) here -- if you have a more complicated setup read
-## mini_httpd(8) for details on 2).
-
-MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log"
-
-## to add cgi-support you should switch over to a config-file, a sample can
-## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
-##     mini_httpd.conf.sample.gz
-## copy the sample to /etc/mini_httpd.conf and replace the MINI_HTTPD_OPTS-line
-## above by:
-##MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
diff --git a/www-servers/mini_httpd/files/mini_httpd.confd-1.19 b/www-servers/mini_httpd/files/mini_httpd.confd-1.19
index 31312e2ea963..e310f669d9c0 100644
--- a/www-servers/mini_httpd/files/mini_httpd.confd-1.19
+++ b/www-servers/mini_httpd/files/mini_httpd.confd-1.19
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd-1.19,v 1.1 2004/08/08 17:37:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd-1.19,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
 ## Config file for /etc/init.d/mini_httpd
 
 ## the startup-dir of mini_httpd is the docroot, so we specify it here
 ## and the init-script does a "cd" prior to startup:
-#MINI_HTTPD_DOCROOT="/var/www/localhost"
+MINI_HTTPD_DOCROOT="/var/www/localhost/htdocs"
 
 ## There are 2 ways to configure mini_httpd:
 ##	1) specify all params on the cmd-line
@@ -16,7 +16,7 @@
 ## We choose 1) here -- if you have a more complicated setup read
 ## mini_httpd(8) for details on 2).
 
-MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log"
+MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log -d ${MINI_HTTPD_DOCROOT}"
 
 ## to add cgi-support you should switch over to a config-file, a sample can
 ## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
diff --git a/www-servers/mini_httpd/files/mini_httpd.init b/www-servers/mini_httpd/files/mini_httpd.init
index f32c883d024e..ccaf53d31fe8 100644
--- a/www-servers/mini_httpd/files/mini_httpd.init
+++ b/www-servers/mini_httpd/files/mini_httpd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.1 2004/08/08 17:37:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
 depend() {
 	need net
@@ -13,10 +13,6 @@ start() {
 		eend 1 "MINI_HTTPD_DOCROOT not set correctly in /etc/conf.d/mini_httpd"
 		exit 1
 	fi
-	cd $MINI_HTTPD_DOCROOT
-	if [ $? -ne 0 ]; then
-		eend $? "ERROR: cannot change to docroot \"$MINI_HTTPD_DOCROOT\""
-	fi
 	start-stop-daemon --quiet --start --startas /usr/sbin/mini_httpd \
 		--pidfile /var/run/mini_httpd.pid -- ${MINI_HTTPD_OPTS}
 	eend $?