Update to 2.24. Closes PR pkg/22198 (fix was integratedin that version).

New in version 2.24:

    * Added a bunch of MIME types.
    * Fix minor problem with returning unknown protocol on some errors.
    * Changed the config-file option for diabling symlink checking from "nosymlink" to "nosymlinkcheck" to make its function clearer.
    * Allow blank lines in the config file.
    * Handle more than one SIGHUP and SIGUSR2 (Cameron Gregory).
    * Slight change to handle_newconnect() to better deal with unexpected errors from accept(), such as running out of file descriptors (Alex Keahan).
    * Added optional minimum rate to throttles.
    * Stats syslog messages downgraded from LOG_NOTICE to LOG_INFO.
    * Use unsigned short consistently for port number.
    * Prohibit slashes in the Host: header (Marcus Breiing).
    * Added a -dd data_dir flag and corresponding config-file option.
    * Got rid of the old timer-based zombie process reaper, replacing it with a SIGCHLD handler.
    * Changed the idle connection checking from using a separate timer for each connection to using a single timer that checks all active connections.
    * Correction to missing-slash directory redirect with query string.
    * Added a watchdog alarm handler that forces a core dump if thttpd stops running its timers for too long.
    * Don't send Content-Length header on 304 Not Modified responses.
    * Allow user-agent log entries to be up to 200 characters long, instead only of 80.
    * Fixed buffer overflow bug in defang().
    * Re-arranged the order of calling de_dotdot() so that it doesn't get applied to query strings.
    * Some fixes for the syslogtocern script (paul fox).
    * Changed configure script to use "gcc -dumpversion" instead of "gcc --version" (Ed Goforth).
    * Changed most uses of \r and \n to \015 and \012 (Jens Bauer).
    * In ssi.c, lack of PATH_INFO is now non-fatal (David Phillips).
    * Some improvements to fdwatch (David Burgess).

4 files changed, 7 insertions, 23 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 94440cd1324..18aa4bd65cd 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2003/09/19 17:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2003/10/27 20:29:52 cube Exp $
 
-DISTNAME=	thttpd-2.23beta1
-PKGNAME=	thttpd-2.23.0.1
-PKGREVISION=	1
+DISTNAME=	thttpd-2.24
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/www/thttpd/PLIST b/www/thttpd/PLIST
index 976cc5c6a79..d3814219d5c 100644
--- a/www/thttpd/PLIST
+++ b/www/thttpd/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/10/27 20:29:52 cube Exp $
 etc/rc.d/thttpd
-libexec/cgi-bin/redirect
 libexec/cgi-bin/phf
+libexec/cgi-bin/redirect
 libexec/cgi-bin/ssi
 man/man1/makeweb.1
 man/man1/thtpasswd.1
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
index 0dbb1848287..6bed8348ade 100644
--- a/www/thttpd/distinfo
+++ b/www/thttpd/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.5 2003/09/19 17:54:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/10/27 20:29:52 cube Exp $
 
-SHA1 (thttpd-2.23beta1.tar.gz) = 22331276c2e5f6f1850f0b1ca2b739d0db88bf51
-Size (thttpd-2.23beta1.tar.gz) = 128696 bytes
+SHA1 (thttpd-2.24.tar.gz) = 2a851b225c7af73f22be8a0a4cf29e4200b3248f
+Size (thttpd-2.24.tar.gz) = 130116 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
 SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df
 SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2
 SHA1 (patch-ad) = 1d7777516ff0c5e7b03643809854bf96707759ec
-SHA1 (patch-ae) = f31dfec4d9a6531c8a195c6d539a6859799f3ffb
diff --git a/www/thttpd/patches/patch-ae b/www/thttpd/patches/patch-ae
deleted file mode 100644
index 68bbf6c09cb..00000000000
--- a/www/thttpd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/09/19 17:54:18 wiz Exp $
-
---- libhttpd.c.orig	Mon May 27 03:22:26 2002
-+++ libhttpd.c
-@@ -818,7 +818,7 @@ defang( char* str, char* dfstr, int dfsi
-     char* cp2;
- 
-     for ( cp1 = str, cp2 = dfstr;
--	  *cp1 != '\0' && cp2 - dfstr < dfsize - 1;
-+	  *cp1 != '\0' && cp2 - dfstr < dfsize - 5;
- 	  ++cp1, ++cp2 )
- 	{
- 	switch ( *cp1 )