Further cleanup

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 19 insertions, 70 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index f49f25c46044..16140c82fc88 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.55 2012/12/29 14:50:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.56 2012/12/29 14:53:07 blueness Exp $
+
+  29 Dec 2012; Anthony G. Basile <blueness@gentoo.org> -files/thttpd.confd,
+  -files/thttpd.init:
+  Further cleanup
 
   29 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
   -files/thttpd-2.25/additional-input-validation-httpd.c.diff,
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 05bd036698c7..fbb730d3c6f1 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -2,29 +2,27 @@
 Hash: SHA256
 
 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.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a
 EBUILD thttpd-2.26.4-r1.ebuild 1694 SHA256 49b4daf85ac507c7e9afbbbc9c6cb1ee07863fc62e2e2f3efb2f9f3c25faf9c9 SHA512 b19f0661248550e60ed2aa3bc4fb9a846f4a6cc7a1c8afddd836a11bc2f4265b4e54db9a9d4b085ec559293110fc48753b0d5ae95627a51c0d6e79e63c6c64a8 WHIRLPOOL c4b32b78644c15e9fbd69afbc189baa92908d9fad0221dbc1aa2ae8a2c0fa7a465e604fe411e4edaa9709791528b686a4340f27544f72087c2cbc2d0826d3d93
-MISC ChangeLog 10703 SHA256 c8535cc42b47d5daac6987554c85eff351e132ab8070747996249a53a0160af3 SHA512 a8fc3a89effd7f77b9de7d999e1e3aa267db15841640e9bece1e461bedf236912c8cd651c8b13defd4cbb9afa655ece6a01f1c0b89cc4a36940b07c5f6ee2dab WHIRLPOOL 1a32f8c42a3484cf12d13dce0051ca41a0b544647e7fb3ec6617a22d5041b6c5da9149048a799ee4a31a0280c767c33118a6c599414ad7d01d7ee79a902ae116
+MISC ChangeLog 10820 SHA256 51b592facfe5fd4b64a228b622bc52c5b4c84fa5ce7d1e7b995b912936f06406 SHA512 7bb88e37ec652eb0811ed683adf5cb27fbd2b5d1e905fd987ae22aa37376376334c749467e1d52c723aa59c3239e7fc47847be16607818f40d181784c51ee55a WHIRLPOOL cd8ee887c90fe00a64a80bb7dbaa510cb29468a0c726a92ed9ee127d4be0f328e8de3283d8883949f0bc892cc53954a1405419d6049c34f7c97c8045ec3af359
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ3wNMAAoJEJOE+m71LUu6+NYQAIITQo42r7do9cEvPUZbw98w
-jt7QyndYU6q/6+MJ06eLPmhYXGawporVfwQVOnme8DKbPzdG22c0j4ubFvVSyuE+
-7BanywC8iWf77scO6gEpy5DdRCU+NBkzSw5U2OLU2DJmbzqiBZwLIOI2wGz9qm4K
-h/5vCHHiwQhhpd6yK81XjREmWHgIR2K79IqSwLg3+XqGga1+G+3VblqElLelcp+p
-Ee8H5AVRNCbu6Ocbjvk15tJd69+2e9WC3IlTAlKEY7akBXGdXDrSNHWfx4/RnXB0
-uR3lFtFb08xfmFZxaYnSfxokv4r4ryN+THmS5/MqiCD1JP9HZrUG/w5YWcW8TcE2
-NGEEgmxzNiuO5I+4qtEG7FPCZVYceQ7id/3flOL37J4CsmsXuBfk6vrZxgh8Vaxh
-Uw2foQt9Uk594tNa1Ds7qEJRTTyN2ThAzxFVyrnm6l7VSQdxJ3RK9cP0zbxOujLM
-APtXhZ4aOXWmWL/o/AoqXi64tHz0sAkJuicvk6vEBO7Opkh+Cq9rnWgCBwWMSxYs
-luSB/vq+LX0BQ0xCTL8CCn19ez416QrW29A9/k1neE7SmDnBt3wYPGXvqAiVDaV2
-9dVNTLehpfsV882YAQlOxAnK+0Wr6pjRrDKa4uIXUenDsYJ7i9VUqL1wF0jE6Kxb
-NEsATk8yUclG7pAKXIbq
-=zUxB
+iQIcBAEBCAAGBQJQ3wPYAAoJEJOE+m71LUu6XOgQAIA11F0Ia46ACmqmZveOC6Ol
+3Hz8y4InN90vfH0GX6Lziy7nMlTGD5WG/Urc/EwMbhcz536z4eyOJeY0bDGLBI9L
+snElxHbC+js3fjJPnLHl5qsGQyfbD3sP8cSPJeAOeVprnWpiQxZnXUSNxBfE4MLc
+CwcXJJRF9AIY7Mlb4wD+8gu9np0OwHsJ/RDplfrPo3u/XEdc3ByqKRYNH3NI+h2q
+ko3G4Po8JZO9qe95S1miWUIV/l5GpN8QeCiNkW8iNUJDQ/8zYjQtCJQ4U9OV08yr
+R49tURjzYwvXUf5ixE6+6stJuc/yGaDOIgZTMT23xsGo+j3jFWMz0VvRhlrvhlfR
+My82Kok/YFVLQogKteNQSU43lhfqsmq9+WdqH45qs9ASbt9IlFk/CXepy9bjP4sJ
+EApR0kYDPbvkGj9K1rjqg7Y+XTqIwx5d7RZ7j3faCJVErSDD26DLEFfNTkjM3u7B
+AfcGixNdb/BKPLG6x2oHBQIiEYsN2dvaLhKFwT4enaal6tFmueTYeXNupDu/mJsf
+TYhbytCa8DriEo7g7fkqWtVo4UkEalXXZRThqJcsaf4VIWRFd6paKnJwwS0vAfVI
+KoRU5ngcEmD977+vkuX0NMRsbovbxmpi1rT15XayANX1j/HR0cA34WAVdwzAbYjA
+9hdsmS7I+JgsZVXh/Kv3
+=hTwX
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/thttpd.confd b/www-servers/thttpd/files/thttpd.confd
deleted file mode 100644
index 4e1f76f12885..000000000000
--- a/www-servers/thttpd/files/thttpd.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.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/htdocs"
-
-## There are 2 ways to configure thttpd:
-##	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
-## thttpd(8) for details on 2).
-
-THTTPD_OPTS="-p 8080 -u thttpd -r -i /var/run/thttpd.pid -l /var/log/thttpd.log"
-
-## For a more complex setup (e.g. cgi-support) use an external configfile:
-## comment the THTTPD_OPTS line above und use the one below.
-#THTTPD_OPTS="-C /etc/thttpd/thttpd.conf"
-
-## If you know what you are doing you can add cgi-support with the line below;
-## but you _should_ use the extern-configfile version!
-#THTTPD_OPTS="$THTTPD_OPTS -c **.cgi|**.sh"
diff --git a/www-servers/thttpd/files/thttpd.init b/www-servers/thttpd/files/thttpd.init
deleted file mode 100644
index 6e1878f740fa..000000000000
--- a/www-servers/thttpd/files/thttpd.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# 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.init,v 1.1 2012/03/24 02:59:02 blueness Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting thttpd"
-	if [ ! -d "$THTTPD_DOCROOT" ]; then
-		eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/thttpd"
-		exit 1
-	fi
-	start-stop-daemon --quiet --start --exec /usr/sbin/thttpd \
-		--pidfile /var/run/thttpd.pid --chdir "$THTTPD_DOCROOT" -- \
-			${THTTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping thttpd"
-	start-stop-daemon --quiet --stop --pidfile /var/run/thttpd.pid
-	eend $?
-}