4 files changed, 69 insertions, 5 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 3c37b792b6b0..444d714d3b17 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.8 2005/10/28 15:49:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.9 2005/11/16 02:57:36 ka0ttic Exp $
+
+*thttpd-2.25b-r4 (15 Nov 2005)
+
+  15 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> +thttpd-2.25b-r4.ebuild:
+  Revision bump; removed php support so we can go stable for security bug 110637.
 
 *thttpd-2.25b-r3 (28 Oct 2005)
 
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 921450d2fcf9..87477570d320 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 83414b97f4d5beb3e67f1e9f04612630 ChangeLog 2323
+MD5 a7f1b34177c7c294fd7980b7327456fe ChangeLog 2512
 MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25b 64
 MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25b-r1 64
 MD5 6f77a5ae06c1e805c8ba4f18ef210040 files/digest-thttpd-2.25b-r2 126
 MD5 27edca46bf76911bd19ce0121cd4de3b files/digest-thttpd-2.25b-r3 126
+MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25b-r4 64
 MD5 cbb3d508ce2e62b217ed6628ddf82290 files/php-5.0.3-IOV.patch 413
 MD5 f7a7898637874593f519c336db79fa45 files/php-5.0.3-missing-arches.patch 524
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/php5.0-stdint.diff 358
@@ -19,11 +20,12 @@ MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 9638e3f16ce376f6259c3963fe78da43 thttpd-2.25b-r1.ebuild 1234
 MD5 3275e777a332a1525de88c1b458009c5 thttpd-2.25b-r2.ebuild 2088
 MD5 d8de2aefcaa09167a51a9b1451cfa21d thttpd-2.25b-r3.ebuild 2155
+MD5 3af28fdd96778b7ea940a05061fc4fdb thttpd-2.25b-r4.ebuild 1330
 MD5 9938eaae4deb104a092e8b4fc966a692 thttpd-2.25b.ebuild 1186
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDYkiLEZCkKN40op4RAh/SAJ9LWRNlQJqPlIQd7yW3LwT6smLqRwCgq8pQ
-zdr5rdT5mWcCucMyUM/Rjw8=
-=NJIX
+iD8DBQFDellhEZCkKN40op4RAghrAJoCDz4B+kZjgbrtmrvxmZfP5CiCrgCgiEQU
+7rbcNeBcC793pYNMkEi4MWA=
+=mM86
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/digest-thttpd-2.25b-r4 b/www-servers/thttpd/files/digest-thttpd-2.25b-r4
new file mode 100644
index 000000000000..823600acb15d
--- /dev/null
+++ b/www-servers/thttpd/files/digest-thttpd-2.25b-r4
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..c3ee87573172
--- /dev/null
+++ b/www-servers/thttpd/thttpd-2.25b-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 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.1 2005/11/16 02:57:36 ka0ttic 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="~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 -Wl,-z,now
+	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 !"
+}