Remove older ebuilds and patches migrated into forked code

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

16 files changed, 25 insertions, 529 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index d7cd7a736990..95677dad2edb 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,21 @@
 # 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.36 2012/04/04 12:24:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.37 2012/04/04 15:05:37 blueness Exp $
+
+  04 Apr 2012; Anthony G. Basile <blueness@gentoo.org> -thttpd-2.25b-r8.ebuild,
+  -thttpd-2.25b-r9.ebuild,
+  -files/thttpd-2.25b-additional-input-validation.patch,
+  -files/thttpd-2.25b-default-to-octet-stream.patch,
+  -files/thttpd-2.25b-fix-buffer-overflow.patch,
+  -files/thttpd-2.25b-fix-illegal-path-info.patch,
+  -files/thttpd-2.25b-fix-insecure-tmp-creation.patch,
+  -files/thttpd-2.25b-monolithic-timer.patch,
+  -files/thttpd-2.25b-ogg-mime-type.patch,
+  -files/thttpd-2.25b-respect-CFLAGS--dont-link-static.patch,
+  -files/thttpd-2.25b-use-Status-header.patch,
+  -files/thttpd-2.25b-use-X-Forwarded-For-header.patch,
+  files/thttpd.conf.sample, files/thttpd.confd:
+  Remove older ebuilds and patches migrated into forked code
 
 *thttpd-2.26.2 (04 Apr 2012)
 
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index f2430a0db558..330b8f745605 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -7,33 +7,21 @@ AUX thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724 RMD160 45ebedb4
 AUX thttpd-2.25/thttpd.conf.sample 672 RMD160 fd44c3f0c094b06aa6a18ff2b360e4cf9174ffc5 SHA1 2bd69756e0c17fe5e79a4eb76486d300defbd671 SHA256 36c778f749a1277569c72b23f9c4e25b80e10c7c74a43f493c99648ec8e5b787
 AUX thttpd-2.25/thttpd.confd 1152 RMD160 78503da6afa0bae20ecace503a3f5f8b7532c4ee SHA1 8599769e121d620eea18b27d51ce3d85414ee75d SHA256 cb723bdc62b339a20c238989d45d26bfcd79fa3a8d31e9bd666fdef979c31c54
 AUX thttpd-2.25/thttpd.init 745 RMD160 cb2eda2714728f8cee568b83013f3b5bb70974e7 SHA1 83fdd54a3ac959dc5c6a066a181a41c1d898ed9c SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da
-AUX thttpd-2.25b-additional-input-validation.patch 2249 RMD160 ad101512e54d1c154dc039d616067456e0130a7e SHA1 88eebce793c19d16a7a394b6142f412d92e511a2 SHA256 28fb9fa693a636df82627701df1e777bc28ffcefe90132391cbed1dc901ce51c
-AUX thttpd-2.25b-default-to-octet-stream.patch 470 RMD160 51123b9375c39f8a077534569385699ef47c8656 SHA1 dc058f10e1c2b46835bfee557de6223cbe50d9d8 SHA256 3700e15c0fdec670f534ae252cb1ed0a93aabca23a3d784f4904812599d2d74b
-AUX thttpd-2.25b-fix-buffer-overflow.patch 947 RMD160 30b80b19e792e0dce3eb238f664501a61bc5a3a7 SHA1 645316b836c731dc0385cfa7851c4dea8edc530c SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad
-AUX thttpd-2.25b-fix-illegal-path-info.patch 646 RMD160 e83cc6adcd4ac49893922b38157301b5d472b4b3 SHA1 2822d63bb8c9eec63280071d8d52afff2d860c12 SHA256 7dd3de6fea9de73b3f8352ad4b61d0d0d758edf4cf51b32d68e96eddeca3c16a
-AUX thttpd-2.25b-fix-insecure-tmp-creation.patch 749 RMD160 c86a1a2311f90e569c8da5f157402a2ef2382122 SHA1 386f78222136a88812f76961ae10f6c102c9399a SHA256 a2c39287ae89b2cfb92736bd753ce682437176003c0b100eb02a9f3d2348e745
 AUX thttpd-2.25b-glibc-2.10.patch 691 RMD160 0fa29c1e864e75fd4a0e0dd097a304435379f63d SHA1 f7a7d121bbfcbfc87d3c500743484db9b415094c SHA256 30ad7d07c03b45497e8067dd9d5ef2abe2a8fc86de7ce40184c178144b3f03b3
-AUX thttpd-2.25b-monolithic-timer.patch 3764 RMD160 630a9ecf7f986156cd3e886357427d668e9392c5 SHA1 d8459c47e7596a6a0bf95634ef1575c35e52e0ef SHA256 b37d4a3b32fd30bf21b307a865dc4bb04d97cd846037fdb002847164b6668f56
-AUX thttpd-2.25b-ogg-mime-type.patch 376 RMD160 f3f401f188e04338039920b184f96ff6aa68ed47 SHA1 51fc44340295db3bc3d2755aba59e46165eb1760 SHA256 815bfcf4ecbff603b0eba50eac3e77afaf11a03f0d67f601df910be0e345d039
-AUX thttpd-2.25b-respect-CFLAGS--dont-link-static.patch 1722 RMD160 af3b614bc3b9f9f916d2097559766473a29d969c SHA1 53b0ecba535daa8d1825fc5f878a06e66a81ffbb SHA256 5916e36cc5666e8f07d5bfb096fa2a139d637d28d5ed763679f3ff0929dbfa49
-AUX thttpd-2.25b-use-Status-header.patch 486 RMD160 51cc1029b88f8527ff8d6c5aececba33a9d4d06a SHA1 9610f7b002d6679b625959edbdea51e1350168bd SHA256 bd7b51245a96f876160d3d97da665d646347f768d9f8b73135efdeb133195bb2
-AUX thttpd-2.25b-use-X-Forwarded-For-header.patch 606 RMD160 b3f7c330a8fb9bb2c036a83527f5e536d559bacb SHA1 0495d26c4827151a306329aff5c9c123ac278d1c SHA256 9db45110e0729b0f5ff5ea65ca1ebbf636e3cd41afcc9572cc6b477035798fd9
-AUX thttpd.conf.sample 670 RMD160 4d84d544e4f69ff675ee0cdbe1744bd1231d8d96 SHA1 f7ffe4e0d5a0fcb50ebfffc63956f0b05a75531f SHA256 abdf9f7c6685f846ee2bd482d60b8f8cedc3747cbc3d32c0dd21d6ca8a4dd8de
-AUX thttpd.confd 1140 RMD160 4a29feb4aff4229f2b29bc7cbe5eec3caea879a7 SHA1 6e5ef7e2f1ed8c0f5ae4817a954d97b0aa028073 SHA256 e40877613014041646c5bd3af8aa9a1cdcd37f1bdf8496f014b4a729868be1de
+AUX thttpd.conf.sample 672 RMD160 527604eb70e10d5127d68b614a0ed6be476c6693 SHA1 0cd2bc31a4864dab10cfd30a7b4771446768cd26 SHA256 756d1ca7568d328c2ad8f440e6d50a43aa0dba1575ec79b4502595e2b3b363b8
+AUX thttpd.confd 1142 RMD160 ae338de61e523ec81ce753046f1a6dc4a9ac51ba SHA1 c054a0a5965b1455c7bbc833cec9d1195997ba0a SHA256 7a6d7c973dddd83d4d3b3bcaeecd0e67d880bb1addccaec46280fbf105c09556
 AUX thttpd.init 689 RMD160 1d794efed66800329d09d28fb532646548b895fc SHA1 4fde72a009c046e4cc0c1cfa6c99d582e6627125 SHA256 1702eae9920794188e3405b629c49ce68bce42e42c439862f90e6900fc26c403
 AUX thttpd.logrotate 197 RMD160 28c782571b226e49680a80bcbe5313ccc2a92d5c SHA1 384127ca1725a08fcfcd08de46a200c53966c24e SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6
 DIST sthttpd-2.26.2.tar.gz 194591 RMD160 ea1275187a75035e7b1c2e08c49f538074539caf SHA1 b1c929025d1db96cec6088b84ba3c60c9a10d92c SHA256 605f54371211bd11b6c75fb56899ead62118ecf80fca90c21656eacb76cd60d2
 DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
 EBUILD thttpd-2.25b-r7.ebuild 1578 RMD160 b8cdcfc2fc24fdcd8c0ccef8999ac633bd3e32d8 SHA1 18e4c99ec97d51731563105c29b5b443c29e0072 SHA256 df2f96c1da3633d0799fb250544bde270d936ebf0fea4f414f09569457fe1d3d
-EBUILD thttpd-2.25b-r8.ebuild 1951 RMD160 f975a8ce7bcf0ea31ad0b7b6d38f9b13081a4ae2 SHA1 f233e77e26df5c2facd783227363d448059ffb23 SHA256 dc82770a4487b9864fa61e890266f11cab8f5335851a5198f6e4b743684bf391
-EBUILD thttpd-2.25b-r9.ebuild 2119 RMD160 580f35a4cc5e319b2b83334b50683a08f73e35f9 SHA1 5e907e36abd8a1798e78f8f1b1c844a36a446d13 SHA256 89c113a8764fed3b75cef6f62798bf1bb3bf32dd6a3dedf7b57bb886316f6d88
 EBUILD thttpd-2.26.2.ebuild 1434 RMD160 3660b7aca72adeb0a6db58d50bf19d04498e0ccc SHA1 f8f1faa64afd49ab798990ff474e83c14148a00e SHA256 8c27e2f29505c1a4f22cb31e459037095ba63d41180e02ee03c43aeefa631012
-MISC ChangeLog 7359 RMD160 42c1ac04395caf43492a92695153c1fb02f3166d SHA1 8a63961a449d3dc19227cd99bb049fedfd858a54 SHA256 85148bf2da1b6f4566f5521b14b7d6f53a846a2f0501241d73443a963f062278
+MISC ChangeLog 8095 RMD160 43d4650f9e3033fc2731428080d5411cfa25b5f3 SHA1 e32f27c68f6766780dd7bff2109c45cd38d4703c SHA256 baff8bb4333b0646728c270e5a1f897e5d5c00c9a8f5e18f2f933094045d3363
 MISC metadata.xml 234 RMD160 59e569023e48130b98d1b9f67416af7ef133a7c5 SHA1 8c7c05396c1846e09239cef8844ef3417ce96bbc SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk98PX8ACgkQl5yvQNBFVTWVMwCfbhL7tlS9qZogKtVhpYFC39AX
-ZM0AnjfvE1/bP4HD5EueafvJ4VXMPzII
-=2F9c
+iEYEAREIAAYFAk98Y0oACgkQl5yvQNBFVTULJACdF5KslZBWl99tumz1J9HHMgVd
+BJMAn0nD7puT+YKRU5TmvvK+JNEvKfPi
+=KE7e
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/thttpd-2.25b-additional-input-validation.patch b/www-servers/thttpd/files/thttpd-2.25b-additional-input-validation.patch
deleted file mode 100644
index 04f59eac8e39..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-additional-input-validation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- thttpd-2.25b/extras/htpasswd.c.orig	2006-03-31 04:12:42.281317000 +0000
-+++ thttpd-2.25b/extras/htpasswd.c	2006-03-31 05:21:37.741632392 +0000
-@@ -151,6 +151,7 @@ void interrupted(int signo) {
- int main(int argc, char *argv[]) {
-     FILE *tfp,*f;
-     char user[MAX_STRING_LEN];
-+    char pwfilename[MAX_STRING_LEN];
-     char line[MAX_STRING_LEN];
-     char l[MAX_STRING_LEN];
-     char w[MAX_STRING_LEN];
-@@ -168,6 +169,25 @@ int main(int argc, char *argv[]) {
-             perror("fopen");
-             exit(1);
-         }
-+        if (strlen(argv[2]) > (sizeof(pwfilename) - 1)) {
-+            fprintf(stderr, "%s: filename is too long\n", argv[0]);
-+	    exit(1);
-+        }
-+        if (((strchr(argv[2], ';')) != NULL) || ((strchr(argv[2], '>')) != NULL)) {
-+	    fprintf(stderr, "%s: filename contains an illegal character\n",
-+		argv[0]);
-+	    exit(1);
-+        }
-+        if (strlen(argv[3]) > (sizeof(user) - 1)) {
-+	    fprintf(stderr, "%s: username is too long\n", argv[0],
-+		sizeof(user) - 1);
-+	    exit(1);
-+        }
-+        if ((strchr(argv[3], ':')) != NULL) {
-+            fprintf(stderr, "%s: username contains an illegal character\n",
-+                argv[0]);
-+            exit(1);
-+        }
-         printf("Adding password for %s.\n",argv[3]);
-         add_password(argv[3],tfp);
-         fclose(tfp);
-@@ -180,6 +200,25 @@ int main(int argc, char *argv[]) {
-         exit(1);
-     }
- 
-+    if (strlen(argv[1]) > (sizeof(pwfilename) - 1)) {
-+        fprintf(stderr, "%s: filename is too long\n", argv[0]);
-+        exit(1);
-+    }
-+    if (((strchr(argv[1], ';')) != NULL) || ((strchr(argv[1], '>')) != NULL)) {
-+        fprintf(stderr, "%s: filename contains an illegal character\n",
-+                argv[0]);
-+        exit(1);
-+    }
-+    if (strlen(argv[2]) > (sizeof(user) - 1)) {
-+        fprintf(stderr, "%s: username is too long\n", argv[0],
-+                sizeof(user) - 1);
-+        exit(1);
-+    }
-+    if ((strchr(argv[2], ':')) != NULL) {
-+        fprintf(stderr, "%s: username contains an illegal character\n",
-+                argv[0]);
-+        exit(1);
-+    }
-     if(!(f = fopen(argv[1],"r"))) {
-         fprintf(stderr,
-                 "Could not open passwd file %s for reading.\n",argv[1]);
diff --git a/www-servers/thttpd/files/thttpd-2.25b-default-to-octet-stream.patch b/www-servers/thttpd/files/thttpd-2.25b-default-to-octet-stream.patch
deleted file mode 100644
index f056c1409290..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-default-to-octet-stream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/libhttpd.c b/libhttpd.c
---- a/libhttpd.c	2012-02-21 05:43:57.949988934 +0000
-+++ b/libhttpd.c	2012-02-21 05:46:44.446655700 +0000
-@@ -2549,7 +2549,7 @@ figure_mime( httpd_conn* hc )
-     size_t ext_len, encodings_len;
-     int i, top, bot, mid;
-     int r;
--    char* default_type = "text/plain; charset=%s";
-+    char* default_type = "application/octet-stream";
- 
-     /* Peel off encoding extensions until there aren't any more. */
-     n_me_indexes = 0;
diff --git a/www-servers/thttpd/files/thttpd-2.25b-fix-buffer-overflow.patch b/www-servers/thttpd/files/thttpd-2.25b-fix-buffer-overflow.patch
deleted file mode 100644
index cacd7321486a..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/thttpd-2.25b-fix-illegal-path-info.patch b/www-servers/thttpd/files/thttpd-2.25b-fix-illegal-path-info.patch
deleted file mode 100644
index d1688f144681..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-fix-illegal-path-info.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c
---- thttpd-2.25b.orig/libhttpd.c	2007-10-14 10:09:55.000000000 +0000
-+++ thttpd-2.25b/libhttpd.c	2007-10-14 10:09:11.000000000 +0000
-@@ -2322,8 +2320,11 @@
- 	{
- 	int i;
- 	i = strlen( hc->origfilename ) - strlen( hc->pathinfo );
--	if ( i > 0 && strcmp( &hc->origfilename[i], hc->pathinfo ) == 0 )
--	    hc->origfilename[i - 1] = '\0';
-+	if ( strcmp( &hc->origfilename[i], hc->pathinfo ) == 0 )
-+	    {
-+	    if ( i == 0 ) hc->origfilename[0] = '\0';
-+	    else hc->origfilename[i - 1] = '\0';
-+	    }
- 	}
- 
-     /* If the expanded filename is an absolute path, check that it's still
diff --git a/www-servers/thttpd/files/thttpd-2.25b-fix-insecure-tmp-creation.patch b/www-servers/thttpd/files/thttpd-2.25b-fix-insecure-tmp-creation.patch
deleted file mode 100644
index 2918db11ed17..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-fix-insecure-tmp-creation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Addresses CVE-2005-3124
-
-diff -ru thttpd-2.23beta1.orig/extras/syslogtocern thttpd-2.23beta1/extras/syslogtocern
---- thttpd-2.23beta1.orig/extras/syslogtocern	1999-09-15 18:00:54.000000000 +0200
-+++ thttpd-2.23beta1/extras/syslogtocern	2005-10-26 01:45:34.000000000 +0200
-@@ -31,8 +31,8 @@
-     exit 1
- fi
- 
--tmp1=/tmp/stc1.$$
--rm -f $tmp1
-+tmp1=``mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
- 
- # Gather up all the thttpd entries.
- egrep ' thttpd\[' $* > $tmp1
-@@ -65,4 +65,3 @@
-   sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log
- 
- # Done.
--rm -f $tmp1
diff --git a/www-servers/thttpd/files/thttpd-2.25b-monolithic-timer.patch b/www-servers/thttpd/files/thttpd-2.25b-monolithic-timer.patch
deleted file mode 100644
index 9ff38aec4574..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-monolithic-timer.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Nru thttpd-2.25b.orig/configure.in thttpd-2.25b/configure.in
---- thttpd-2.25b.orig/configure.in	2003-12-25 20:41:13.000000000 +0200
-+++ thttpd-2.25b/configure.in	2010-07-08 00:04:25.000000000 +0300
-@@ -123,6 +123,8 @@
- 	;;
- esac
- 
-+AC_CHECK_LIB(rt, clock_gettime)
-+
- AC_ACME_TM_GMTOFF
- AC_ACME_INT64T
- AC_ACME_SOCKLENT
-diff -Nru thttpd-2.25b.orig/thttpd.c thttpd-2.25b/thttpd.c
---- thttpd-2.25b.orig/thttpd.c	2003-12-25 21:06:52.000000000 +0200
-+++ thttpd-2.25b/thttpd.c	2010-07-08 00:41:28.000000000 +0300
-@@ -742,7 +742,7 @@
- 	}
- 
-     /* Main loop. */
--    (void) gettimeofday( &tv, (struct timezone*) 0 );
-+    tmr_prepare_timeval( &tv );
-     while ( ( ! terminate ) || num_connects > 0 )
- 	{
- 	/* Do we need to re-open the log file? */
-@@ -761,7 +761,7 @@
- 	    syslog( LOG_ERR, "fdwatch - %m" );
- 	    exit( 1 );
- 	    }
--	(void) gettimeofday( &tv, (struct timezone*) 0 );
-+	tmr_prepare_timeval( &tv );
- 
- 	if ( num_ready == 0 )
- 	    {
-diff -Nru thttpd-2.25b.orig/timers.c thttpd-2.25b/timers.c
---- thttpd-2.25b.orig/timers.c	2002-08-22 04:04:12.000000000 +0300
-+++ thttpd-2.25b/timers.c	2010-07-08 11:47:03.000000000 +0300
-@@ -41,7 +41,13 @@
- 
- ClientData JunkClientData;
- 
--
-+#undef HAVE_LIBRT_MONO
-+#if defined(HAVE_LIBRT) && defined(CLOCK_MONOTONIC)
-+#define HAVE_LIBRT_MONO
-+#include <time.h>
-+static int use_monotonic = 0;		/* monotonic clock runtime availability flag */
-+static struct timeval tv_diff;		/* system time - monotonic difference at start */
-+#endif
- 
- static unsigned int
- hash( Timer* t )
-@@ -145,6 +151,26 @@
- 	timers[h] = (Timer*) 0;
-     free_timers = (Timer*) 0;
-     alloc_count = active_count = free_count = 0;
-+
-+    /* Check for monotonic clock availability */
-+#ifdef HAVE_LIBRT_MONO
-+    struct timespec ts;
-+    struct timeval tv_start, tv;
-+    
-+    /* Try to get monotonic clock time */
-+    if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
-+	use_monotonic = 1;
-+
-+	/* Get current system time */
-+	(void) gettimeofday( &tv_start , (struct timezone*) 0 );
-+	tv.tv_sec = ts.tv_sec;
-+	tv.tv_usec = ts.tv_nsec / 1000L;
-+	/* Calculate and save the difference: tv_start is since the Epoch, so tv_start > ts
-+	    tv_diff = tv_start - tv	*/
-+	timersub( &tv_start, &tv, &tv_diff );
-+    }
-+#endif
-+
-     }
- 
- 
-@@ -176,7 +202,7 @@
-     if ( nowP != (struct timeval*) 0 )
- 	t->time = *nowP;
-     else
--	(void) gettimeofday( &t->time, (struct timezone*) 0 );
-+	tmr_prepare_timeval( &t->time );
-     t->time.tv_sec += msecs / 1000L;
-     t->time.tv_usec += ( msecs % 1000L ) * 1000L;
-     if ( t->time.tv_usec >= 1000000L )
-@@ -349,3 +375,27 @@
-     if ( active_count + free_count != alloc_count )
- 	syslog( LOG_ERR, "timer counts don't add up!" );
-     }
-+
-+/* Fill timeval structure for further usage by the package. */
-+void
-+tmr_prepare_timeval( struct timeval *tv )
-+{
-+#ifdef HAVE_LIBRT_MONO
-+    struct timespec ts;
-+    struct timeval tv0;
-+
-+    if (use_monotonic) {	/* use monotonic clock source ? */
-+	if (clock_gettime(CLOCK_MONOTONIC,&ts) < 0) {
-+	    perror("clock_gettime"); return;
-+	}
-+	tv0.tv_sec = ts.tv_sec;
-+	tv0.tv_usec = ts.tv_nsec / 1000L;
-+	/* Return system time value like it was running accurately */
-+	timeradd( &tv_diff, &tv0, tv );
-+    } else {
-+#endif
-+	(void) gettimeofday( tv , (struct timezone*) 0 );
-+#ifdef HAVE_LIBRT_MONO
-+    }
-+#endif
-+}
-diff -Nru thttpd-2.25b.orig/timers.h thttpd-2.25b/timers.h
---- thttpd-2.25b.orig/timers.h	2001-04-13 08:37:41.000000000 +0300
-+++ thttpd-2.25b/timers.h	2010-07-08 00:09:15.000000000 +0300
-@@ -106,4 +106,7 @@
- /* Generate debugging statistics syslog message. */
- extern void tmr_logstats( long secs );
- 
-+/* Fill timeval structure for further usage by the package. */
-+extern void tmr_prepare_timeval( struct timeval *tv );
-+
- #endif /* _TIMERS_H_ */
diff --git a/www-servers/thttpd/files/thttpd-2.25b-ogg-mime-type.patch b/www-servers/thttpd/files/thttpd-2.25b-ogg-mime-type.patch
deleted file mode 100644
index a7801052577b..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-ogg-mime-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durPN mime_types.txt mime_types.txt
---- mime_types.txt	2003-10-26 11:00:45.000000000 -0600
-+++ mime_types.txt	2011-06-06 11:30:57.000000000 -0500
-@@ -95,7 +95,7 @@
- nc	application/x-netcdf
- o	application/octet-stream
- oda	application/oda
--ogg	application/x-ogg
-+ogg	application/ogg
- pac	application/x-ns-proxy-autoconfig
- pbm	image/x-portable-bitmap
- pdb	chemical/x-pdb
diff --git a/www-servers/thttpd/files/thttpd-2.25b-respect-CFLAGS--dont-link-static.patch b/www-servers/thttpd/files/thttpd-2.25b-respect-CFLAGS--dont-link-static.patch
deleted file mode 100644
index ce915c706b67..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-respect-CFLAGS--dont-link-static.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur thttpd-2.25b.orig/cgi-src/Makefile.in thttpd-2.25b/cgi-src/Makefile.in
---- thttpd-2.25b.orig/cgi-src/Makefile.in	2010-10-28 23:33:28.000000000 +0200
-+++ thttpd-2.25b/cgi-src/Makefile.in	2010-10-29 00:05:43.000000000 +0200
-@@ -31,10 +31,9 @@
- MANDIR =	@mandir@
- 
- CC =		@CC@
--CCOPT =		@V_CCOPT@
- DEFS =		@DEFS@
- INCLS =		-I..
--CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
-+CFLAGS +=	$(DEFS) $(INCLS)
- LDFLAGS =	@LDFLAGS@ @V_STATICFLAG@
- LIBS =		@LIBS@
- NETLIBS =	@V_NETLIBS@
-diff -Naur thttpd-2.25b.orig/extras/Makefile.in thttpd-2.25b/extras/Makefile.in
---- thttpd-2.25b.orig/extras/Makefile.in	2010-10-28 23:33:28.000000000 +0200
-+++ thttpd-2.25b/extras/Makefile.in	2010-10-29 00:06:36.000000000 +0200
-@@ -32,11 +32,9 @@
- MANDIR =	@mandir@
- 
- CC =		@CC@
--CCOPT =		@V_CCOPT@
- DEFS =		@DEFS@
- INCLS =		-I..
--CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
--STATICFLAG =	@V_STATICFLAG@
-+CFLAGS +=	$(DEFS) $(INCLS)
- LDFLAGS =	@LDFLAGS@
- LIBS =		@LIBS@
- NETLIBS =	@V_NETLIBS@
-@@ -59,7 +57,7 @@
- 	$(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c
- 
- htpasswd:	htpasswd.o
--	$(CC) $(LDFLAGS) $(STATICFLAG) htpasswd.o -o htpasswd $(LIBS)
-+	$(CC) $(LDFLAGS) htpasswd.o -o htpasswd $(LIBS)
- 
- htpasswd.o:	htpasswd.c ../config.h
- 	$(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c htpasswd.c
-diff -Naur thttpd-2.25b.orig/Makefile.in thttpd-2.25b/Makefile.in
---- thttpd-2.25b.orig/Makefile.in	2010-10-28 23:33:28.000000000 +0200
-+++ thttpd-2.25b/Makefile.in	2010-10-29 00:05:43.000000000 +0200
-@@ -47,10 +47,9 @@
- # You shouldn't need to edit anything below here.
- 
- CC =		@CC@
--CCOPT =		@V_CCOPT@
- DEFS =		@DEFS@
- INCLS =		-I.
--CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
-+CFLAGS +=	$(DEFS) $(INCLS)
- LDFLAGS =	@LDFLAGS@
- LIBS =		@LIBS@
- NETLIBS =	@V_NETLIBS@
diff --git a/www-servers/thttpd/files/thttpd-2.25b-use-Status-header.patch b/www-servers/thttpd/files/thttpd-2.25b-use-Status-header.patch
deleted file mode 100644
index 6aaae5a5d91c..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-use-Status-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c
---- thttpd-2.25b.orig/libhttpd.c	2007-10-14 10:09:11.000000000 +0000
-+++ thttpd-2.25b/libhttpd.c	2007-10-14 10:21:37.000000000 +0000
-@@ -3279,7 +3279,7 @@
- 	cp += strspn( cp, " \t" );
- 	status = atoi( cp );
- 	}
--    if ( ( cp = strstr( headers, "Location:" ) ) != (char*) 0 &&
-+    else if ( ( cp = strstr( headers, "Location:" ) ) != (char*) 0 &&
- 	 cp < br &&
- 	 ( cp == headers || *(cp-1) == '\012' ) )
- 	status = 302;
diff --git a/www-servers/thttpd/files/thttpd-2.25b-use-X-Forwarded-For-header.patch b/www-servers/thttpd/files/thttpd-2.25b-use-X-Forwarded-For-header.patch
deleted file mode 100644
index 0fec25ef7c19..000000000000
--- a/www-servers/thttpd/files/thttpd-2.25b-use-X-Forwarded-For-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- thttpd-2.25b/libhttpd.c	2003-12-25 20:06:05.000000000 +0100
-+++ thttpd-2.25b-patched/libhttpd.c	2005-01-09 00:26:04.867255248 +0100
-@@ -2207,6 +2207,12 @@
- 		if ( strcasecmp( cp, "keep-alive" ) == 0 )
- 		    hc->keep_alive = 1;
- 		}
-+	    else if ( strncasecmp( buf, "X-Forwarded-For:", 16 ) == 0 )
-+		{ // Use real IP if available 
-+		cp = &buf[16];
-+		cp += strspn( cp, " \t" );
-+		inet_aton( cp, &(hc->client_addr.sa_in.sin_addr) );
-+	        }
- #ifdef LOG_UNKNOWN_HEADERS
- 	    else if ( strncasecmp( buf, "Accept-Charset:", 15 ) == 0 ||
- 		      strncasecmp( buf, "Accept-Language:", 16 ) == 0 ||
diff --git a/www-servers/thttpd/files/thttpd.conf.sample b/www-servers/thttpd/files/thttpd.conf.sample
index 462bd0c198d0..85660fede36a 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=80
+port=8080
 user=thttpd
 ##
 ## CGI:
diff --git a/www-servers/thttpd/files/thttpd.confd b/www-servers/thttpd/files/thttpd.confd
index 222d25f1548e..a98718e4492f 100644
--- a/www-servers/thttpd/files/thttpd.confd
+++ b/www-servers/thttpd/files/thttpd.confd
@@ -1,6 +1,6 @@
 # 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.1 2012/03/24 02:59:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.2 2012/04/04 15:05:36 blueness Exp $
 
 ## Config file for /etc/init.d/thttpd
 
@@ -16,7 +16,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 80 -u thttpd -r -i /var/run/thttpd.pid -l /var/log/thttpd.log"
+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.
diff --git a/www-servers/thttpd/thttpd-2.25b-r8.ebuild b/www-servers/thttpd/thttpd-2.25b-r8.ebuild
deleted file mode 100644
index 0e6be6a0a2ce..000000000000
--- a/www-servers/thttpd/thttpd-2.25b-r8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r8.ebuild,v 1.2 2011/08/03 20:34:00 zmedico Exp $
-
-EAPI="3"
-
-WANT_AUTOCONF=2.1
-inherit eutils flag-o-matic autotools
-
-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 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="static"
-
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}/*.diff
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-fix-illegal-path-info.patch
-	epatch "${FILESDIR}"/${P}-monolithic-timer.patch
-	epatch "${FILESDIR}"/${P}-use-Status-header.patch
-	epatch "${FILESDIR}"/${P}-use-X-Forwarded-For-header.patch
-	epatch "${FILESDIR}"/${P}-respect-CFLAGS--dont-link-static.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-	eend ${?}
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	dodir /usr/share/man/man1
-	make prefix="${ED}"/usr \
-		MANDIR="${ED}"/usr/share/man \
-		WEBGROUP=${THTTPD_GROUP} \
-		WEBDIR="${ED}"/var/www/localhost \
-		"$@" install || die "make install failed"
-
-	mv "${ED}"/usr/sbin/{,th_}htpasswd
-	mv "${ED}"/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/logrotate.d
-	newins "${FILESDIR}/thttpd.logrotate" thttpd
-
-	insinto /etc/thttpd
-	doins "${FILESDIR}"/${MY_P}/thttpd.conf.sample
-}
-
-pkg_postinst() {
-	elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
-}
diff --git a/www-servers/thttpd/thttpd-2.25b-r9.ebuild b/www-servers/thttpd/thttpd-2.25b-r9.ebuild
deleted file mode 100644
index 3e765fe74a68..000000000000
--- a/www-servers/thttpd/thttpd-2.25b-r9.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.25b-r9.ebuild,v 1.1 2012/03/24 02:59:02 blueness Exp $
-
-EAPI="4"
-
-WANT_AUTOCONF=2.1
-inherit eutils flag-o-matic autotools
-
-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 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="static"
-
-RDEPEND=""
-DEPEND="sys-devel/autoconf:2.1"
-
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-additional-input-validation.patch
-	epatch "${FILESDIR}"/${P}-fix-buffer-overflow.patch
-	epatch "${FILESDIR}"/${P}-fix-insecure-tmp-creation.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-fix-illegal-path-info.patch
-	epatch "${FILESDIR}"/${P}-monolithic-timer.patch
-	epatch "${FILESDIR}"/${P}-use-Status-header.patch
-	epatch "${FILESDIR}"/${P}-use-X-Forwarded-For-header.patch
-	epatch "${FILESDIR}"/${P}-respect-CFLAGS--dont-link-static.patch
-	epatch "${FILESDIR}"/${P}-ogg-mime-type.patch
-	epatch "${FILESDIR}"/${P}-default-to-octet-stream.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-	eend ${?}
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	tc-export CC
-	econf
-}
-
-src_install () {
-	dodir /usr/share/man/man1
-	make prefix="${ED}"/usr \
-		MANDIR="${ED}"/usr/share/man \
-		WEBGROUP=${THTTPD_GROUP} \
-		WEBDIR="${ED}"/var/www/localhost \
-		"$@" install || die "make install failed"
-
-	mv "${ED}"/usr/sbin/{,th_}htpasswd
-	mv "${ED}"/usr/share/man/man1/{,th_}htpasswd.1
-
-	newinitd "${FILESDIR}"/thttpd.init thttpd
-	newconfd "${FILESDIR}"/thttpd.confd thttpd
-
-	dodoc README INSTALL TODO
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/thttpd.logrotate" thttpd
-
-	insinto /etc/thttpd
-	doins "${FILESDIR}"/thttpd.conf.sample
-}
-
-pkg_postinst() {
-	elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
-}