Version bump, multi-instance enhancement, bug #424826

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

5 files changed, 145 insertions, 5 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 04a895b8f877..343fad4b7077 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2012/07/13 13:54:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.45 2012/07/13 14:08:26 blueness Exp $
+
+*thttpd-2.26.4 (13 Jul 2012)
+
+  13 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +thttpd-2.26.4.ebuild,
+  +files/thttpd.confd.1, +files/thttpd.init.1:
+  Version bump, multi-instance enhancement, bug #424826
 
   13 Jul 2012; Anthony G. Basile <blueness@gentoo.org> thttpd-2.26.2.ebuild:
   Keyword ~arm ~ppc ~ppc64
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 878ab5584478..ddf7ee3648d5 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -10,18 +10,22 @@ AUX thttpd-2.25/thttpd.init 745 SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c6
 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.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.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a
 DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
 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
-MISC ChangeLog 8881 SHA256 2b41c0bcd03b4db4878af001618d465dbc3b7c57be17b379ffe018fcac61b4b6 SHA512 772435aefb689210a122fb792a8819042b2b177a0f753ee5f568ef478d4dfab4026b7371b2a8409bc80782e5d4a172e0efeb3c65806b9f209422f554cd1fe8b3 WHIRLPOOL 56a391bba68850a5eb3254ec3bf82a1dcd7a6ef3cd01aca317a483b7ecf34c533a33f1ed6c1ed2cc0d1e9a8d5f58bd605a36bf18d9b08ec3c66da18eca20a3f6
+EBUILD thttpd-2.26.4.ebuild 1509 SHA256 479baf1e7af3e18f3f1ac3299de048bd87d80274941b1cf4164be9e0ac2f108c SHA512 203f670f36b5874fd79533783a5363c45661c3723ad2641696350b2534901133f389bda00758324c3a7cc992c4d80606e4a64ca8b7cae5b87a6403b6e3ca5193 WHIRLPOOL 401938203afcfebc0221ee84275144d1c8c4ac2d37453cccfd1706c96bd98d5d985a3861c3220d48b028df567f0891c56114345fa7d6fa3f69e1328cc699f2b3
+MISC ChangeLog 9093 SHA256 209d43ad0c9482050022a0f52493097e8a2fc7c47b7f82990c5f7011016e45bd SHA512 d7c84fea68f83734e6bd3eee908a99c9246fef4f9ba3d7c83e054486b8760b1c8cca414640cfdb03001813f5b65e58404a92b2cf7171becd1d789d97c6aabbac WHIRLPOOL db625a82e7f73b327d04bc7737c089cbb2e9c37e0be6ab3bc0667d30287fa702654f362df9633e7e3761461e65b2a244d48ecdaf976ddffd7b06a26133f039fe
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAAKKkACgkQl5yvQNBFVTVj7wCfVM/oPVsk2f6ZE00sATy+RUsn
-1eQAn1+lZlZPKA0sufv2CQfo2nTYJJ/0
-=TTo+
+iEYEAREIAAYFAlAAK+gACgkQl5yvQNBFVTVVegCfWRdXHb/P1sPN2ExB32d3x/uU
+CasAn2gq7PWSFyluBe0GIKba4NjdEsnT
+=07Kt
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/thttpd.confd.1 b/www-servers/thttpd/files/thttpd.confd.1
new file mode 100644
index 000000000000..cb61a1f2ae52
--- /dev/null
+++ b/www-servers/thttpd/files/thttpd.confd.1
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+## 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"
+
+## 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>")
+
+## For additional thttpd instances, run:
+# ln -s /etc/init.d/thttpd /etc/init.d/thttpd.$NAME
+# cp /etc/conf.d/thttpd /etc/conf.d/thttpd.$NAME
+
+## Note: 1) and 2) can be mixed but
+##		the init-script set PID (option -i) to
+##			/var/run/thttpd.$NAME.run
+##		and logfile (option -l) to
+##			/var/log/thttpd.$NAME.log
+##
+## 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"
+
+## 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.1 b/www-servers/thttpd/files/thttpd.init.1
new file mode 100644
index 000000000000..415ead79d6a6
--- /dev/null
+++ b/www-servers/thttpd/files/thttpd.init.1
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v3 or later
+
+depend() {
+	need net
+	use dns logger netmount
+	after sshd
+}
+
+checkconfig() {
+	if [ ! -d "$THTTPD_DOCROOT" ]; then
+		eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/${SVCNAME}"
+	fi
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	checkconfig || return 1
+
+	start-stop-daemon --quiet --start --exec /usr/sbin/thttpd \
+		--pidfile /var/run/${SVCNAME}.pid --chdir "$THTTPD_DOCROOT" -- \
+			-i /var/run/${SVCNAME}.pid \
+			-l /var/log/${SVCNAME}.log \
+			${THTTPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --quiet --stop --pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/www-servers/thttpd/thttpd-2.26.4.ebuild b/www-servers/thttpd/thttpd-2.26.4.ebuild
new file mode 100644
index 000000000000..291f08d7937e
--- /dev/null
+++ b/www-servers/thttpd/thttpd-2.26.4.ebuild
@@ -0,0 +1,61 @@
+# 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.ebuild,v 1.1 2012/07/13 14:08:26 blueness Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="s${P}"
+
+DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver."
+HOMEPAGE="http://opensource.dyc.edu/sthttpd"
+SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+THTTPD_USER=thttpd
+THTTPD_GROUP=thttpd
+THTTPD_DOCROOT="${EPREFIX}/var/www/localhost/htdocs"
+
+DOCS=( README TODO )
+
+pkg_setup() {
+	ebegin "Creating thttpd user and group"
+	enewgroup ${THTTPD_GROUP}
+	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
+}
+
+src_configure() {
+	econf WEBDIR=${THTTPD_DOCROOT}
+}
+
+src_install () {
+	default
+
+	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
+	newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/thttpd.logrotate" thttpd
+
+	insinto /etc/thttpd
+	doins "${FILESDIR}"/thttpd.conf.sample
+}
+
+pkg_postinst() {
+	chown root:${THTTPD_GROUP} "${EROOT}/usr/sbin/makeweb" \
+		|| die "Failed chown makeweb"
+	chmod 2751 "${EROOT}/usr/sbin/makeweb" \
+		|| die "Failed chmod makeweb"
+	chmod 755 "${THTTPD_DOCROOT}/cgi-bin/printenv" \
+		|| die "Failed chmod printenv"
+	elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
+}