Rev bump for security bug #159941.

Package-Manager: portage-2.1.1-r2

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index dd579e01db83a360c770ea89afcb50f56a1af8e6..d7d6526d9d3d77e22d88a3abb327d7e0a120c969 100644 (file)
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/thttpd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.16 2006/10/08 19:58:07 drizzt Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.17 2007/01/08 21:49:51 beu Exp $
+
+*thttpd-2.25b-r6 (08 Jan 2007)
+
+  08 Jan 2007; Elfyn McBratney <beu@gentoo.org>
+  +files/thttpd-2.25/fix-buffer-overflow.diff, +thttpd-2.25b-r6.ebuild:
+  Rev bump for security bug #159941.
 
   08 Oct 2006; Timothy Redaelli <drizzt@gentoo.org> thttpd-2.25b-r5.ebuild:
   Added ~x86-fbsd keyword.

diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index e2086dfd3951b8f5d7b78df6755b19a68e44896d..af29d7c43fb7df0386ff8fc559b8d323e1cbc0ed 100644 (file)
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,3 +1,7 @@
+AUX thttpd-2.25/fix-buffer-overflow.diff 947 RMD160 30b80b19e792e0dce3eb238f664501a61bc5a3a7 SHA1 645316b836c731dc0385cfa7851c4dea8edc530c SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad
+MD5 be5e988d692261221c38e9b6488aa270 files/thttpd-2.25/fix-buffer-overflow.diff 947
+RMD160 30b80b19e792e0dce3eb238f664501a61bc5a3a7 files/thttpd-2.25/fix-buffer-overflow.diff 947
+SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad files/thttpd-2.25/fix-buffer-overflow.diff 947
 AUX thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724 RMD160 45ebedb4c9786d09285e976a16f0b1d8b8f11a59 SHA1 7757351b3e7f4c98f99c14067021f38d33bee045 SHA256 1d8b5295d8240603d47f32825d7d4c3e954d0e951e61af3d7de53776ab6753f8
 MD5 1bff796b71d019369f581b053b480a72 files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724
 RMD160 45ebedb4c9786d09285e976a16f0b1d8b8f11a59 files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724
@@ -19,10 +23,14 @@ EBUILD thttpd-2.25b-r5.ebuild 1357 RMD160 c3dd07012808a1f61ee5d9597f342c9f5d68dd
 MD5 f924e24f539d6e313d69ae301ff675d3 thttpd-2.25b-r5.ebuild 1357
 RMD160 c3dd07012808a1f61ee5d9597f342c9f5d68ddcf thttpd-2.25b-r5.ebuild 1357
 SHA256 28a9f088b1f38c91475c4344774bfb226497b41b293c4b0ab88700f855cd5797 thttpd-2.25b-r5.ebuild 1357
-MISC ChangeLog 3780 RMD160 a896b14e1094192894602a506df8442c89ac60db SHA1 a1fbd6d27b99638e5f09b9b5140d0bd3758a8a64 SHA256 7012ce02c1c8af55703b3f11cb77ee0a3d6de7d0302ceafbacd51a0064148f0a
-MD5 a6add07e4ee30b1a5ca27b90668ff5db ChangeLog 3780
-RMD160 a896b14e1094192894602a506df8442c89ac60db ChangeLog 3780
-SHA256 7012ce02c1c8af55703b3f11cb77ee0a3d6de7d0302ceafbacd51a0064148f0a ChangeLog 3780
+EBUILD thttpd-2.25b-r6.ebuild 1318 RMD160 581c4386396d4ffe1c6ff156c91c2f8b1eb91baf SHA1 b4b6dfb3752dfee488a9cc4980d27682c3483f04 SHA256 6b79c7271dd5e2273da1ea8880cc7af1d2f663a7a6a0bcaea963e898ccbea0ac
+MD5 4ce3e257dc139e6e5cfa400218bbf84a thttpd-2.25b-r6.ebuild 1318
+RMD160 581c4386396d4ffe1c6ff156c91c2f8b1eb91baf thttpd-2.25b-r6.ebuild 1318
+SHA256 6b79c7271dd5e2273da1ea8880cc7af1d2f663a7a6a0bcaea963e898ccbea0ac thttpd-2.25b-r6.ebuild 1318
+MISC ChangeLog 3967 RMD160 4f003aa8963b4a3138e454f9e202afded2945ea7 SHA1 b64d4fdd3d446070ec95cee38d3dc83ef5fb2ab1 SHA256 53e225d3e2a60d9437930851b22a5ed51e950071c15c1e260d4679f10b84b410
+MD5 64528d42ec67961eee02e7d03a6b7afe ChangeLog 3967
+RMD160 4f003aa8963b4a3138e454f9e202afded2945ea7 ChangeLog 3967
+SHA256 53e225d3e2a60d9437930851b22a5ed51e950071c15c1e260d4679f10b84b410 ChangeLog 3967
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165
@@ -30,3 +38,6 @@ SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c metadata
 MD5 4bc6def57b02ee5c45bb3bd196b36642 files/digest-thttpd-2.25b-r5 238
 RMD160 ba623358749f8f3fe04f6ae043e7f76f10e67a4c files/digest-thttpd-2.25b-r5 238
 SHA256 6e08f96c75dcd361ad63bd4aab9229f8cf6d544622eb8612ae57fddca2ee2a6e files/digest-thttpd-2.25b-r5 238
+MD5 4bc6def57b02ee5c45bb3bd196b36642 files/digest-thttpd-2.25b-r6 238
+RMD160 ba623358749f8f3fe04f6ae043e7f76f10e67a4c files/digest-thttpd-2.25b-r6 238
+SHA256 6e08f96c75dcd361ad63bd4aab9229f8cf6d544622eb8612ae57fddca2ee2a6e files/digest-thttpd-2.25b-r6 238

diff --git a/www-servers/thttpd/files/digest-thttpd-2.25b-r6 b/www-servers/thttpd/files/digest-thttpd-2.25b-r6
new file mode 100644 (file)
index 0000000..f7daceb
--- /dev/null
+++ b/www-servers/thttpd/files/digest-thttpd-2.25b-r6
@@ -0,0 +1,3 @@
+MD5 a0e9cd87455d3a0ea11e5ea7e947adf6 thttpd-2.25b.tar.gz 132363
+RMD160 15020e8d04d27b30c4da3104387a281e35d58025 thttpd-2.25b.tar.gz 132363
+SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024 thttpd-2.25b.tar.gz 132363

diff --git a/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff b/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff
new file mode 100644 (file)
index 0000000..cacd732
--- /dev/null
+++ b/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff
@@ -0,0 +1,21 @@
+diff -Nrup thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c
+--- thttpd-2.25b.orig/libhttpd.c       2003-12-25 19:06:05.000000000 +0000
++++ thttpd-2.25b/libhttpd.c    2007-01-08 21:43:28.000000000 +0000
+@@ -1469,7 +1469,7 @@ expand_symlinks( char* path, char** rest
+           httpd_realloc_str( &checked, &maxchecked, checkedlen );
+           (void) strcpy( checked, path );
+           /* Trim trailing slashes. */
+-          while ( checked[checkedlen - 1] == '/' )
++          while ( checkedlen && checked[checkedlen - 1] == '/' )
+               {
+               checked[checkedlen - 1] = '\0';
+               --checkedlen;
+@@ -1488,7 +1488,7 @@ expand_symlinks( char* path, char** rest
+     restlen = strlen( path );
+     httpd_realloc_str( &rest, &maxrest, restlen );
+     (void) strcpy( rest, path );
+-    if ( rest[restlen - 1] == '/' )
++    if ( restlen && rest[restlen - 1] == '/' )
+       rest[--restlen] = '\0';         /* trim trailing slash */
+     if ( ! tildemapped )
+       /* Remove any leading slashes. */

diff --git a/www-servers/thttpd/thttpd-2.25b-r6.ebuild b/www-servers/thttpd/thttpd-2.25b-r6.ebuild
new file mode 100644 (file)
index 0000000..8503863
--- /dev/null
+++ b/www-servers/thttpd/thttpd-2.25b-r6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r6.ebuild,v 1.1 2007/01/08 21:49:51 beu 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="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="static"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${MY_P}/*.diff
+}
+
+src_compile() {
+       ## TODO: what to do with IPv6?
+
+       append-ldflags $(bindnow-flags)
+       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 !"
+}