Fix THTTPD_DOCROOT

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

6 files changed, 29 insertions, 23 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index ec3a94990235..89dc4070740c 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.46 2012/08/05 15:50:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.47 2012/08/08 13:24:57 blueness Exp $
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org> thttpd-2.26.4-r1.ebuild,
+  files/thttpd.conf.sample, files/thttpd.confd, files/thttpd.confd.1:
+  Fix THTTPD_DOCROOT
 
 *thttpd-2.26.4-r1 (05 Aug 2012)
 
   05 Aug 2012; Anthony G. Basile <blueness@gentoo.org> -thttpd-2.26.4.ebuild,
   +thttpd-2.26.4-r1.ebuild:
-  Move distribution's htdocs to doc dir, bug #429632
+  Move htdocs to docdir, bug #429632
 
 *thttpd-2.26.4 (13 Jul 2012)
 
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index b5a39c98a920..08a4e800907c 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -8,24 +8,24 @@ AUX thttpd-2.25/thttpd.conf.sample 672 SHA256 36c778f749a1277569c72b23f9c4e25b80
 AUX thttpd-2.25/thttpd.confd 1152 SHA256 cb723bdc62b339a20c238989d45d26bfcd79fa3a8d31e9bd666fdef979c31c54 SHA512 66a176742308419d5dc5763a5011c664cd2c0ad581b8daf1473112b3f3698f01b5395d5d2ecb40c6f13068943819be2a643d91a45d129c46fe5e5ada9818b813 WHIRLPOOL c53f9ca7cb815852d89735da01f6a5717ed313f67fca1d71394d44f0cd93fb4a081551cf472a9069e125f9b3b06d0f1b027922bf3a3c28eaab8c208fa703f3c0
 AUX thttpd-2.25/thttpd.init 745 SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da SHA512 ccf43b21034a19d986a4593b179e1417118efda547d32c4640fd6a22cb1bd0ecaa2e2e0c8d44e51db2e0c4b44f319484d622074f17a5edaaa869ac90c07407a9 WHIRLPOOL 154cd55312352f6458c4c36da79cf06708d22fa67307c96f3bc326c49bf420152408532dbc1823f52fc1ed8867072d6b1334a6ea72fe180044e1789b2d48cec2
 AUX thttpd-2.25b-glibc-2.10.patch 691 SHA256 30ad7d07c03b45497e8067dd9d5ef2abe2a8fc86de7ce40184c178144b3f03b3 SHA512 b19ce0896c59061b9d2535cb4c1b09f51c81f0dc3227ff6b033324b215ac15850905c6fa4a7d2cc276d41950c4c588d497bccdcd71962db3622b828002c17694 WHIRLPOOL 5610db232766a85d8ba6a3073586e59663b33ee97add86ba69b3b5b440379dad5203846c264f726d11b53f7333ed84d07138489ec91e9ce8ac89ca2e9e7fad16
-AUX thttpd.conf.sample 672 SHA256 756d1ca7568d328c2ad8f440e6d50a43aa0dba1575ec79b4502595e2b3b363b8 SHA512 bef174fe6ca45594cec0b8fb1b92ae3cc84f49e525d133fbbe68f89c42b915fed8aec1f43923384f88a59a7780bddf9b4337e3b5bc8b221f501e43a8bf1d7656 WHIRLPOOL 9cb9a00129192411db41dce7d6806f6150a26ad012c36d5579dee6a0f2e268ee4a9f9aefab65f45eb044ba9d8835089a744cebd375a9f2c2a8c57e1d26453b1d
-AUX thttpd.confd 1142 SHA256 7a6d7c973dddd83d4d3b3bcaeecd0e67d880bb1addccaec46280fbf105c09556 SHA512 db0c67606b1d2f3ca5655190975b2bb5c7980eedf38e4e50e86e3cf5ecfba0644117b6d8a1986f4e17705d0e68ec6aa97bb71a432c2f3f1ce114799ff9b4dc24 WHIRLPOOL da1ff477b2c0b195d728a3947ecd22f1e8965e214449c108ddf088f2f3413a3d1c706a3b2764263629f68f102656aa8579e735e3c0178d126eecea92ce161688
-AUX thttpd.confd.1 1265 SHA256 5caf43c54b63a268bb182263a682c1f51283ca4496d20d0191472f2182dcda19 SHA512 66ca20e309d5ab33c5d00c5e2d822b530d7bb61a8d9f7376d86b40a4448f6fc895c22c52c118eaf1ef0584e324fee9c95c77a5456e22c391ad7bca0480109349 WHIRLPOOL 7e01a2a7fd765fd5406a47fb706559dd05a29ec979f26f019dee7c45064b8d3dd629b787e6106fc9fe69fa66ab76f88221c2ccda71c67452d4f5f52386833bc6
+AUX thttpd.conf.sample 670 SHA256 abdf9f7c6685f846ee2bd482d60b8f8cedc3747cbc3d32c0dd21d6ca8a4dd8de SHA512 97c8582438518bf528b6d419fdb7bd94668e91e6b7033a3ed5cda4afb3539e38bf24aea5ae4b138ff2c561c95003e7f85cfa7ce88cd97e8cbbf558bc4147d2c6 WHIRLPOOL 3831498f048ea44e3969e97d9436f6a61d4afc88e95e3aa5910fb3f8a3fc8acde9f1ff63f935eba0c0636e6f592c2f8c441044666322888a2ac7f257ec6925a3
+AUX thttpd.confd 1149 SHA256 94e7d7a4a67ab6cbbcb6c114bef50233421fca78c1b558bee82bc8b05ca06a8a SHA512 36db97a9c6a315a204f7718dc32ef5d9eaf3a03b6c509aba4c3418717e8a69475f01054bb3ab5a726d6841a634025619fb63dfd523f4743be4e871af4ecb41fc WHIRLPOOL d64f2f4f641f83e97949f89c53edde9bca72c3774048a35cb4240cc734fe7f362a3979cb6ffa2b5289455aa404b410cdddfe42e21c01163c0f5722dae14cfd5a
+AUX thttpd.confd.1 1263 SHA256 79e5cb1fba2b80c1c7970093861f8afe7e09d723faf8e044fc540742abdc37bc SHA512 83b8d5aebf180c398e27695bcfc9b847f6535302b4521be460ffd2e867b20fcf1083bcacdb605e557038c54631546a7ee1ba928611a6a23d786fb9f6ef9e0ee0 WHIRLPOOL a8bec5f119ac3e3856938c1753f8bde1f8d1839c94f3a1f4180d29932f2c79066e64b696f18babf847367bb4f96c9267567a0a6db9239bbc0ce1946738781ca8
 AUX thttpd.init 689 SHA256 1702eae9920794188e3405b629c49ce68bce42e42c439862f90e6900fc26c403 SHA512 47a11a5c09853fcc0054fe0b5877b2ef7c5b549da82c722e05a40ce054b93c1bb0a7eef2e0cd29bc4bfd255dfb0ba76b9981b3de3d16e46cbb2376a2b949e602 WHIRLPOOL cc003335263f5c42561491a9b4055b289a6d61c255b74e6d37b07f4e77fbaedfa55344bc1d6c0dd47fa393bf630dbdd3d3fc6a11ac9204f5e6b6ce432395d174
 AUX thttpd.init.1 734 SHA256 d3945c6fd088c02a51157c4aaf722f4b9b5accfa5aded37fe26fd447904621cd SHA512 8fba38fbf1591a665e08ad8ef7f3b02e99ec8b6708f8b3941a913e088367d00c68210ea8019cc88b30deadd3372c8fb05188019a5c4deb94444d12e81aaad106 WHIRLPOOL 8c7e0506ac5b4c74325b12a034da81a2f4ae8eeaa10f5e39ba70093568e6b7e202f493c66754210585c8a42ab90b188071e4d734ee23069c913d69ad62255a41
 AUX thttpd.logrotate 197 SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd WHIRLPOOL 79577136bbfdf6b2b6026f1e114d4af8a66712abd0efc892f96f5ac0c084341621a3f413102764a750bf101237b9ae52424a2cd6f1b0b92b4430037faf954a6b
-DIST sthttpd-2.26.2.tar.gz 194591 RMD160 ea1275187a75035e7b1c2e08c49f538074539caf SHA1 b1c929025d1db96cec6088b84ba3c60c9a10d92c SHA256 605f54371211bd11b6c75fb56899ead62118ecf80fca90c21656eacb76cd60d2
+DIST sthttpd-2.26.2.tar.gz 194591 SHA256 605f54371211bd11b6c75fb56899ead62118ecf80fca90c21656eacb76cd60d2 SHA512 f0125b8ee8f49d36fdd6358494e93f4a7714a73f5de3e166a77aced9d9d141710eccadd26844f3ceab7354efdf8dfc5377a948758d228b7e13e1868d0200e8c6 WHIRLPOOL 8af1bd7eef9d5635d08c5c45b6d02e7fed9f5ed57c2fb10cda24b2d10d993eb7cc7b175f4a9a716dae515ac0cc1479362a50fa50683b87d37ca7c0397353b0ad
 DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a
-DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
+DIST thttpd-2.25b.tar.gz 132363 SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024 SHA512 1b7ca7db009b4b2e0700ce8e4d1edb1b7a9edff821400229d33c8ccc095d48ab7cd0dc8e2252e0fd82d45eb52ce2461675d6ca6f8092880ea4931a58b8cbf405 WHIRLPOOL 912b8c69563e646ff773f5978fbad9213394e751a654e14966ffa2051dd27aa6d03b2b12416b0734375ba64de57c19bbb8356bec8a2e7ee03a3b434969465770
 EBUILD thttpd-2.25b-r7.ebuild 1583 SHA256 86d3377568eb67f552dc482461fe68c0b5173a1db5c3598316f9f55a08019dfe SHA512 e15a48410349d69194ab14c3e405b415bca62fa069ec835cac3049f0c221a2d16adda2963642583be8907e7f550c772f0911a4e2c58a2d6c51541678e1720d13 WHIRLPOOL 11f8887d0259bbaf37561b9d2d2c0bbe09bc5c532ff35169fdf8234ffe8f756df5df36ec4a6682a34d029cb5cbf5e56fe6ac1d390aeb1606f78f8c9de377bd8d
 EBUILD thttpd-2.26.2.ebuild 1503 SHA256 a703575c7df57f31ee55b60813bc1e2719938490e9e4bfcd1f4183b6cc0fdb2f SHA512 2e50d9d4140db0d508ffe89594d8d649bb9028749ced7ecfd733aad558104d9b7fb8a2495ffca5a81314b8cac6b9bcc4f2772a522517ce9fd0d20c1f62665be8 WHIRLPOOL 7fa36d534bcacec6e734152d355a955a607cce0021e87a80a7ce5c9c960b4d146bd0f690329b697753879dab3efa58bcdb518689a16c809a9506b04aca124607
-EBUILD thttpd-2.26.4-r1.ebuild 1688 SHA256 60e6ae323490d9fd7a0a1bfef6ddba504596073028a3db69bea783f29f8d6420 SHA512 5e8e76dc1dcd6c4d342ffb39821daa5800db603f3bddf36c77544910fc7501d05de4bdf3f68712b2d2cb60ba2daa184612e3204d18eb117aaef5f0a9d06e1dd0 WHIRLPOOL 9652b9fe506e44bd45f251a1dab76ed0c4d30b6f678cec85b61d4e1a5d71d096c1beb8a192e39c33635bd67b3de4d4b7f6d1bea30bbe3abde22171495d63b4bf
-MISC ChangeLog 9286 SHA256 1e80157ecccf29fc3b540dace4f572909f1e04358f7f2544289df621809540b5 SHA512 ca33c13dc042b2d7d44dba0e36a96c77aec8df0f4423026bdd2e09d99f7dd9cc6ef302bebff0fb8287c95b8b7f2ecfeb77c027422e8f431e12db39dc27ed5f12 WHIRLPOOL 902dac9359217710357e3b312b0ec06707420aca44fdf503bd40c38827c58ac9bbd1bc97a2ffb081f7d7dc7e2dcdfb42557174fbb97a1af5b4ecf5f137b85583
+EBUILD thttpd-2.26.4-r1.ebuild 1726 SHA256 bce2fc4dc8c9158d8be668739ed41105e0f2e6e6e6c51a26146c82309ca55d66 SHA512 b9745a3512e8d13fc1a61237b595b8fd067dfb2c89761b447f6578d734d093505453c5e521b193bbbe6784ed4db7a95fb8ee307178c9815257ae94da9e1cb729 WHIRLPOOL 7cbacb78bb316706e923fef143d35f38331d169bc5bbb22c8fa7e4b6b25d002c31463e90217344d8cb9a9c7b65472242edffd76ab1f51ce39d405d8d5c7f928c
+MISC ChangeLog 9442 SHA256 6130e7058e5c52e8bcf543d639f5ffbab3c07e699562d66f11f49d395dd7c366 SHA512 1a9baf5c013e12d7fc348be545f22294cf7ef85e3c5596501cac4c726aa49da31ca960b4ed47fb8f79916607fa7daf35bd122f322f87022889f3445ecaa60069 WHIRLPOOL b74a2d06f85005540b624201f17488d5cf6391c47e75cb97d4d52325f859e8686a335c8cefe4d64fc1757c45000d4f17a2230d8faf296f06db8b6e1075515738
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAelmsACgkQl5yvQNBFVTVq5gCglFDu/5aQQNn8YhHnljTtvQQU
-Jc8AoJOdLSKMbWA8bOqNkaU8sncZVv/g
-=qE/n
+iEYEAREIAAYFAlAiaKsACgkQl5yvQNBFVTX3zQCgp6wdNvmViWx6zKNN+N5MFR1+
+Ud4An3qNLTyMFMxfjg69/sjole7Y1a+V
+=96IV
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/thttpd.conf.sample b/www-servers/thttpd/files/thttpd.conf.sample
index 85660fede36a..462bd0c198d0 100644
--- a/www-servers/thttpd/files/thttpd.conf.sample
+++ b/www-servers/thttpd/files/thttpd.conf.sample
@@ -9,7 +9,7 @@
 ## what interface to bind to?
 ## (default is binding to any interface)
 #host=www.example.org
-port=8080
+port=80
 user=thttpd
 ##
 ## CGI:
diff --git a/www-servers/thttpd/files/thttpd.confd b/www-servers/thttpd/files/thttpd.confd
index a98718e4492f..4e1f76f12885 100644
--- a/www-servers/thttpd/files/thttpd.confd
+++ b/www-servers/thttpd/files/thttpd.confd
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.2 2012/04/04 15:05:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.3 2012/08/08 13:24:57 blueness Exp $
 
 ## Config file for /etc/init.d/thttpd
 
 ## the startup-dir of thttpd is the docroot, so we specify it here
 ## and the init-script does a "cd" prior to startup:
-THTTPD_DOCROOT="/var/www/localhost"
+THTTPD_DOCROOT="/var/www/localhost/htdocs"
 
 ## There are 2 ways to configure thttpd:
 ##	1) specify all params on the cmd-line
diff --git a/www-servers/thttpd/files/thttpd.confd.1 b/www-servers/thttpd/files/thttpd.confd.1
index cb61a1f2ae52..b5f630e7ecc2 100644
--- a/www-servers/thttpd/files/thttpd.confd.1
+++ b/www-servers/thttpd/files/thttpd.confd.1
@@ -24,7 +24,7 @@ THTTPD_DOCROOT="/var/www/localhost"
 ## We choose 1) here -- if you have a more complicated setup read
 ## thttpd(8) for details on 2).
 
-THTTPD_OPTS="-p 8080 -u thttpd -r"
+THTTPD_OPTS="-p 80 -u thttpd -r"
 
 ## For a more complex setup (e.g. cgi-support) use an external configfile:
 ## comment the THTTPD_OPTS line above und use the one below.
diff --git a/www-servers/thttpd/thttpd-2.26.4-r1.ebuild b/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
index aa2666fa3815..c6f95a1f46bd 100644
--- a/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
+++ b/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r1.ebuild,v 1.1 2012/08/05 15:50:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r1.ebuild,v 1.2 2012/08/08 13:24:57 blueness Exp $
 
 EAPI="4"
 
@@ -21,9 +21,11 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 
+WEBROOT="/var/www/localhost"
+
 THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}/var/www/localhost/htdocs"
+THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
 
 DOCS=( README TODO )
 
@@ -49,12 +51,13 @@ src_install () {
 	insinto /etc/thttpd
 	doins "${FILESDIR}"/thttpd.conf.sample
 
+	#move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-
-	mv "${ED}"/var/www/localhost/htdocs \
+	mv "${ED}"${WEBROOT}/htdocs \
 		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${ED}"${WEBROOT}/htdocs
 
-	mkdir "${ED}"/var/www/localhost/htdocs
+	keepdir ${WEBROOT}/htdocs
 }
 
 pkg_postinst() {
@@ -62,7 +65,6 @@ pkg_postinst() {
 		|| die "Failed chown makeweb"
 	chmod 2751 "${EROOT}/usr/sbin/makeweb" \
 		|| die "Failed chmod makeweb"
-	chmod 755 "${THTTPD_DOCROOT}/cgi-bin/printenv" \
+	chmod 755 "${EROOT}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
 		|| die "Failed chmod printenv"
-	elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
 }