ervers/thttpd: Remove old, fixes applied upstream, #373631, #373629

19 files changed, 0 insertions, 682 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
deleted file mode 100644
index 7927271c..00000000
--- a/www-servers/thttpd/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-# ChangeLog for www-servers/thttpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
-  Add missing metadata.xml
-
-*thttpd-2.25b-r8 (02 Jul 2011)
-
-  02 Jul 2011; Bertrand Jacquin <beber@meleeweb.net>
-  +files/thttpd-2.25b-fix-illegal-path-info.patch,
-  +files/thttpd-2.25b-glibc-2.10.patch,
-  +files/thttpd-2.25b-monolithic-timer.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,
-  +thttpd-2.25b-r8.ebuild:
-  thttpd-2.25b-r8 define WANT_AUTOCONF=2.1 which is fine, but when
-  building
-  thttpd without sys-devel/autoconf:2.1 installed we get a m4
-
-  https://bugs.gentoo.org/show_bug.cgi?id=373629
-
-  As thttpd use autoconf 2.1, CC should be exported to configure script to
-  let
-  this capable to test CC
-
-  https://bugs.gentoo.org/show_bug.cgi?id=373631
-
-*thttpd-2.25b-r7 (24 May 2009)
-
-  24 May 2009; Bertrand Jacquin <beber@meleeweb.net>
-  +files/thttpd-2.25/additional-input-validation-httpd.c.diff,
-  +files/thttpd-2.25/fix-buffer-overflow.diff,
-  +files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff,
-  +files/thttpd-2.25/thttpd.conf.sample, +files/thttpd-2.25/thttpd.confd,
-  +files/thttpd-2.25/thttpd.init, +files/thttpd-getline.diff,
-  +files/thttpd.logrotate, +thttpd-2.25b-r7.ebuild:
-  thttpd: glibc 2.10 fix (getline redef)
-
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
deleted file mode 100644
index 2f2cf111..00000000
--- a/www-servers/thttpd/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX thttpd-2.25/additional-input-validation-httpd.c.diff 2249 SHA256 28fb9fa693a636df82627701df1e777bc28ffcefe90132391cbed1dc901ce51c WHIRLPOOL 5d2c434054b2e064bd985a4c92b51e81de3bc00ae7e9572ea7e47694a9093a51cef26b5c37d8b0ed045dbef1914b4fc9ed774550e24ff8d0686ae76542b3bc5e
-AUX thttpd-2.25/fix-buffer-overflow.diff 947 SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad WHIRLPOOL b3ccbaa4de926107e768427466c3d3d876f126923f03d22863a48bc276373ed20eeeff70f49291cc3f5fdfb81a8645ca86003043c1c3aa1526b4cefb34001d86
-AUX thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724 SHA256 1d8b5295d8240603d47f32825d7d4c3e954d0e951e61af3d7de53776ab6753f8 WHIRLPOOL b0a2e698ec9ce25bfd06e06894c5bc96abc7445401c90a20aa9664e44280dc2d36e4c166c958aaebb2a0d8777181ae8422fa5f437878f1e627ba0b03c15175c3
-AUX thttpd-2.25/thttpd.conf.sample 672 SHA256 36c778f749a1277569c72b23f9c4e25b80e10c7c74a43f493c99648ec8e5b787 WHIRLPOOL aa8235081c2a368c093235f470819d933296c7dddc423d2b529d6ae83c4b72fb82578f8bf495bb468af4872a129878275fc61f0e8587e431efd86441999a650c
-AUX thttpd-2.25/thttpd.confd 1152 SHA256 cb723bdc62b339a20c238989d45d26bfcd79fa3a8d31e9bd666fdef979c31c54 WHIRLPOOL c53f9ca7cb815852d89735da01f6a5717ed313f67fca1d71394d44f0cd93fb4a081551cf472a9069e125f9b3b06d0f1b027922bf3a3c28eaab8c208fa703f3c0
-AUX thttpd-2.25/thttpd.init 745 SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da WHIRLPOOL 154cd55312352f6458c4c36da79cf06708d22fa67307c96f3bc326c49bf420152408532dbc1823f52fc1ed8867072d6b1334a6ea72fe180044e1789b2d48cec2
-AUX thttpd-2.25b-fix-illegal-path-info.patch 646 SHA256 7dd3de6fea9de73b3f8352ad4b61d0d0d758edf4cf51b32d68e96eddeca3c16a WHIRLPOOL 01cb8a1618288b6e6a279644619906c2e402f3c58a868b0c8d4ebb8cb8444cf454c32069c794928693ee01671f73bcacf318b09147c38a25dc376980b10bbc54
-AUX thttpd-2.25b-glibc-2.10.patch 691 SHA256 30ad7d07c03b45497e8067dd9d5ef2abe2a8fc86de7ce40184c178144b3f03b3 WHIRLPOOL 5610db232766a85d8ba6a3073586e59663b33ee97add86ba69b3b5b440379dad5203846c264f726d11b53f7333ed84d07138489ec91e9ce8ac89ca2e9e7fad16
-AUX thttpd-2.25b-monolithic-timer.patch 3764 SHA256 b37d4a3b32fd30bf21b307a865dc4bb04d97cd846037fdb002847164b6668f56 WHIRLPOOL 5d596874d12c25e2a30dc2ef38423a7d65aa6ac80f7f94d1664491a4809c1fa3fcbfd1ce8bbc9a2cda427b9a4adc9e5b55fada178b3246f72d1ff9ba4b38faba
-AUX thttpd-2.25b-respect-CFLAGS--dont-link-static.patch 1722 SHA256 5916e36cc5666e8f07d5bfb096fa2a139d637d28d5ed763679f3ff0929dbfa49 WHIRLPOOL b2649775d098cf978c9ec976aab894558a8e0475d8b4305ed36621d780bee5b33bff395e81aadd797f9d961501618ba3a8f1e7010e7f074b331550287f6f1053
-AUX thttpd-2.25b-use-Status-header.patch 486 SHA256 bd7b51245a96f876160d3d97da665d646347f768d9f8b73135efdeb133195bb2 WHIRLPOOL 57ba5dcf6e5452c6f9c9a4c630f482810a725ed1e83a535f046dd3638c8ff8ae9d0acf40190ca2715122dd783f5eef90a16818af3fc2175f8c978c82f6c46083
-AUX thttpd-2.25b-use-X-Forwarded-For-header.patch 606 SHA256 9db45110e0729b0f5ff5ea65ca1ebbf636e3cd41afcc9572cc6b477035798fd9 WHIRLPOOL 2cf7ae0591e62441a1dfbab16698ae44e6d24fa5d80ea6b26aee9f25253b65543e29c3d9678532ffcbd3308be865dbe366d6cfb13274ce8bda7a7e984465d5bc
-AUX thttpd-getline.diff 600 SHA256 772092f58b93524571eb87a82906d25b5fb32c9040ea328d83aab4a5740927be WHIRLPOOL 02773dc4362e4b0432fe5fc88447c091db74742a1f170bee461454bcacb31b2995f849c762e4a8d726b08680886b52724147bd0721b4b62a7fae2ca70a919a2e
-AUX thttpd.logrotate 197 SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6 WHIRLPOOL 79577136bbfdf6b2b6026f1e114d4af8a66712abd0efc892f96f5ac0c084341621a3f413102764a750bf101237b9ae52424a2cd6f1b0b92b4430037faf954a6b
-DIST thttpd-2.25b.tar.gz 132363 SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
-EBUILD thttpd-2.25b-r7.ebuild 1573 SHA256 b7148c079ea0337ae6783afdf28c379333441343be9fd7a6511b13043553dee6 WHIRLPOOL b15a3c394bc9419ddba1326ea6b4e45ebea49cb8ded0bdde1b32a37e088b365b0bea0f34b9cf3fc9a449a60d19d69d477174a6fce534007b7cac4ebb77104241
-EBUILD thttpd-2.25b-r8.ebuild 1969 SHA256 c22ec026c5fafb5e4d2de67e221bfe83527a34c067e96352f3c39a0fc8b62b8c WHIRLPOOL d81a6c7494e922b413346ce314e8f383404a9bfd771c9fc7e04eee83dc40bf9912842f6fe1719afd2f38e26e68feb2891766492d75d4ee9e6432826edb7a9102
-MISC ChangeLog 1470 SHA256 39a6f6d74aa1a4f92f1a7f76425d5155ef64b624c761d55b7a943aafb2f69f1d WHIRLPOOL 1d45de6475dd836d09bf89c56cdf1d5ea962cf0ca20bd397baccf455ecbfec12e550923f53bedeeb784b1ef6f10f3baa0c5060052c7408df84443be471fa1609
-MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff b/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff
deleted file mode 100644
index 04f59eac..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff
+++ /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.25/fix-buffer-overflow.diff b/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff
deleted file mode 100644
index cacd7321..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff
+++ /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.25/fix-insecure-tmp-creation-CVE-2005-3124.diff b/www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff
deleted file mode 100644
index c41ec46b..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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.25/thttpd.conf.sample b/www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample
deleted file mode 100644
index e7017320..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample
+++ /dev/null
@@ -1,38 +0,0 @@
-## /etc/thttpd.conf
-##
-## do not leave empty lines in here!
-## format is: key=value
-##
-## run in debug-mode?
-#debug
-##
-## what interface to bind to?
-## (default is binding to any interface)
-#host=www.example.org
-port=8080
-user=nobody
-##
-## CGI:
-##	?	match a single char
-##	*	matches any string excluding "/"
-##	**	matches any string including "/"
-##	separate multiple patterns with "|"
-#cgipat=**.sh|**.cgi
-##
-## chroot:
-chroot
-#nochroot
-##
-logfile=/var/log/thttpd.log
-pidfile=/var/run/thttpd.pid
-##
-charset=iso-8859-1
-##
-## control the caching: (in secs)
-#maxage 60
-##
-## virtual hosting:
-#vhost
-##
-## cache-control: send this "max-age" in all HTTP-responses:
-#max-age=0
diff --git a/www-servers/thttpd/files/thttpd-2.25/thttpd.confd b/www-servers/thttpd/files/thttpd-2.25/thttpd.confd
deleted file mode 100644
index 453636c4..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/thttpd.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 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-2.25/thttpd.confd,v 1.1 2004/08/08 18:34:03 stuart 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"
-
-## 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 nobody -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-2.25/thttpd.init b/www-servers/thttpd/files/thttpd-2.25/thttpd.init
deleted file mode 100644
index 0821887c..00000000
--- a/www-servers/thttpd/files/thttpd-2.25/thttpd.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 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-2.25/thttpd.init,v 1.2 2006/09/06 14:31:17 dsd 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 --startas /usr/sbin/thttpd \
-		--pidfile /var/run/thttpd.pid --chdir "$THTTPD_DOCROOT" -- \
-			${THTTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	local rc
-
-	ebegin "Stopping thttpd"
-	start-stop-daemon --quiet --stop --pidfile /var/run/thttpd.pid
-	rc=$?
-	rm -f /var/run/thttpd.pid
-	eend $rc
-}
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 d1688f14..00000000
--- 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-glibc-2.10.patch b/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch
deleted file mode 100644
index c9722782..00000000
--- a/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
---- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-19 02:08:08.000000000 +0200
-+++ thttpd-2.25b/extras/htpasswd.c	2009-08-09 16:40:06.000000000 +0300
-@@ -49,7 +49,7 @@
-     while((line[y++] = line[x++]));
- }
- 
--static int getline(char *s, int n, FILE *f) {
-+static int get_line(char *s, int n, FILE *f) {
-     register int i=0;
- 
-     while(1) {
-@@ -189,7 +189,7 @@
-     strcpy(user,argv[2]);
- 
-     found = 0;
--    while(!(getline(line,MAX_STRING_LEN,f))) {
-+    while(!(get_line(line,MAX_STRING_LEN,f))) {
-         if(found || (line[0] == '#') || (!line[0])) {
-             putline(tfp,line);
-             continue;
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 9ff38aec..00000000
--- 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-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 ce915c70..00000000
--- 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 6aaae5a5..00000000
--- 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 0fec25ef..00000000
--- 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-getline.diff b/www-servers/thttpd/files/thttpd-getline.diff
deleted file mode 100644
index 8d162b74..00000000
--- a/www-servers/thttpd/files/thttpd-getline.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- extras/htpasswd.c.ori	2009-05-24 14:23:13.000000000 +0200
-+++ extras/htpasswd.c	2009-05-24 14:23:30.000000000 +0200
-@@ -49,7 +49,7 @@
-     while((line[y++] = line[x++]));
- }
- 
--static int getline(char *s, int n, FILE *f) {
-+static int thttpd_getline(char *s, int n, FILE *f) {
-     register int i=0;
- 
-     while(1) {
-@@ -228,7 +228,7 @@
-     strcpy(user,argv[2]);
- 
-     found = 0;
--    while(!(getline(line,MAX_STRING_LEN,f))) {
-+    while(!(thttpd_getline(line,MAX_STRING_LEN,f))) {
-         if(found || (line[0] == '#') || (!line[0])) {
-             putline(tfp,line);
-             continue;
diff --git a/www-servers/thttpd/files/thttpd.logrotate b/www-servers/thttpd/files/thttpd.logrotate
deleted file mode 100644
index 7e75c813..00000000
--- a/www-servers/thttpd/files/thttpd.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/thttpd.log {
-	daily
-	rotate 5
-	compress
-	delaycompress
-	missingok
-	notifempty
-	sharedscripts
-	postrotate
-		kill -HUP `cat /var/run/thttpd.pid 2>/dev/null` 2>/dev/null || true
-	endscript
-}
diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
deleted file mode 100644
index 097975e3..00000000
--- a/www-servers/thttpd/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/www-servers/thttpd/thttpd-2.25b-r7.ebuild b/www-servers/thttpd/thttpd-2.25b-r7.ebuild
deleted file mode 100644
index 2332c2f4..00000000
--- a/www-servers/thttpd/thttpd-2.25b-r7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.6 2008/06/26 08:39:18 bangert 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 ~mips ppc sparc x86 ~x86-fbsd"
-IUSE="static"
-
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${MY_P}/*.diff
-	epatch "${FILESDIR}"/${PN}-getline.diff
-}
-
-pkg_setup() {
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER}  -1 -1 -1 ${THTTPD_GROUP}
-}
-
-src_compile() {
-	## TODO: what to do with IPv6?
-	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=${THTTPD_GROUP} \
-		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/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-r8.ebuild b/www-servers/thttpd/thttpd-2.25b-r8.ebuild
deleted file mode 100644
index b9baf61f..00000000
--- a/www-servers/thttpd/thttpd-2.25b-r8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 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.1 2010/10/28 22:25:24 bangert 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
-
-	CC="$(tc-getCC)" \
-	  econf || die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	dodir /usr/share/man/man1
-	make prefix="${D}"/usr \
-		MANDIR="${D}"/usr/share/man \
-		WEBGROUP=${THTTPD_GROUP} \
-		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/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 !"
-}