Update www/thttpd to 2.26.

Changes from previous:
----------------------
- Ignore ECONNABORTED on accept().
- Correctly implemented the config-file option change from "nosymlink" to
  "nosymlinkcheck", which was supposedly done in version 2.24.
- Removed mailto: link from default index page.
- Allow CGIs to provide both Location and Status headers. (A. Skrobov)
- Better logic for figuring out CGI SERVER_NAME environment variable. (Oleg)
- Updated for clang, and general cleanup.

3 files changed, 9 insertions, 35 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index b93959b90bc..c4c97b0ba29 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2014/09/25 08:18:35 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2015/03/12 01:00:26 hiramatsu Exp $
 
-DISTNAME=	thttpd-2.25b
-PKGREVISION=	5
+DISTNAME=	thttpd-2.26
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
index a486147b4d6..7b3606bfc0a 100644
--- a/www/thttpd/distinfo
+++ b/www/thttpd/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.15 2009/12/13 17:42:36 asau Exp $
+$NetBSD: distinfo,v 1.16 2015/03/12 01:00:26 hiramatsu Exp $
 
-SHA1 (thttpd-2.25b/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
-RMD160 (thttpd-2.25b/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
-Size (thttpd-2.25b/thttpd-2.25b.tar.gz) = 132275 bytes
-SHA1 (thttpd-2.25b/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-RMD160 (thttpd-2.25b/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
-Size (thttpd-2.25b/sitedrivenby.gif) = 8519 bytes
+SHA1 (thttpd-2.26/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
+RMD160 (thttpd-2.26/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
+Size (thttpd-2.26/sitedrivenby.gif) = 8519 bytes
+SHA1 (thttpd-2.26/thttpd-2.26.tar.gz) = 9b943aeeab9ef92dfd60595649cbe9cf7394968c
+RMD160 (thttpd-2.26/thttpd-2.26.tar.gz) = 4ffb98bc275a3a097e09209a25438008bda04027
+Size (thttpd-2.26/thttpd-2.26.tar.gz) = 133224 bytes
 SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
 SHA1 (patch-ab) = c6d6a20a00b4ceaf409b849982b8e963debf9530
 SHA1 (patch-ac) = f7fe1fed88b4cb33c9456d6fdc13e2bbc175ced6
 SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac
 SHA1 (patch-af) = 5160b635cdf9b3c997e93e039ef2764f77857018
 SHA1 (patch-ag) = 01410f8d293e2d4033f2a1119b21c05e21dfefbe
-SHA1 (patch-ah) = 97c9ff3c4abc494b137e93f459f5b776f35879df
diff --git a/www/thttpd/patches/patch-ah b/www/thttpd/patches/patch-ah
deleted file mode 100644
index b70bfc55680..00000000000
--- a/www/thttpd/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/12/13 17:42:36 asau Exp $
-
-NetBSD provides another "getline".
-
---- extras/htpasswd.c.orig	2009-12-13 20:24:50.000000000 +0300
-+++ extras/htpasswd.c	2009-12-13 20:26:45.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;