From bc89da4037ba4a5ba21a201e955a2c02cf419b10 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 16 Jun 2002 19:10:25 +0000 Subject: Update to 2.23beta1, as requested in pkg/17251 by Oliver Tonnhofer. Changes since 2.21b: * Added some Microsoft MIME types (Kevin Day). * Switch htpasswd from using tmpnam to mkstemp. * Rewrote figure_mime() to do binary search. * Removed the x- from gzip and compress in mime_encodings.txt. * Added rudimentary option to set cache-control headers. * Simplified the IPv6 ifdefs. * Allow filenames with ? in them (Cameron Gregory). * Some improvements to the mmap cache - added a "panic mode" if you run out of address space, added DESIRED_MAX_MAPPED_BYTES config.h option. * Lowered OCCASIONAL_TIME from five minutes to two minutes. * Fix CGI variable AUTH_TYPE (Alexandre CHERIF). * Split clear_connection() into two routines, one which sends a possible buffered response and the other which ignores such (David Burgess). * Remove /./ in de_dotdot() (Dana Dahlstrom). * Shortened LINGER_TIME from two seconds to half a second. * Changed some write() calls to httpd_write_fully(), as suggested by Neale Pickett. * Changed the non-mmap() read() call in mmc.c to httpd_read_fully(), as suggested by Cameron Gregory. * Added an madvise(MADV_SEQUENTIAL) call in mmc.c. * Added .xhtml and .xht to mime_types.txt (suggested by Dave Hodder). * Added index.xhtml and index.xht to INDEX_NAMES (suggested by Dave Hodder). * Got rid of the custom-jiggered syslog.c, now we just use the standard system version. Also added a paragraph in the man page about the syslogd flags needed to make syslogging work from inside a chroot tree. * Added some OpenOffice MIME types (Dave Hodder). * Lowered the default DESIRED_MAX_MAPPED_FILES from 2000 to 1000. * Set up accept filters after listen() (Kris Spinka). * Preserve query string when doing a missing-slash directory redirect. * Special-case logging to '-' as stdout (Matt Armstrong). * Added -s to usage line (Pavel Janík). * Fix for security hole that exposed contents of .htpasswd in some cases (noticed by zeno@cgisecurity.com). * Allow (and ignore) extra fields in .htpasswd files. * Added some calls to shutdown() in strategic places. * Added a timer-kill of the CGI interpose input and output process. These processes also now close the listen fd(s). * Fixed rare file descriptor leak, when we get an unknown sockaddr family (George Schlossnagle). * Put virtual hostname in non-local referer syslog (Craig Leres). * Added a P3P server privacy header setting (Henrik Schack Jensen). And lots of other bug fixes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/thttpd/Makefile | 5 +++-- www/thttpd/distinfo | 10 +++++----- www/thttpd/patches/patch-aa | 10 +++++++--- www/thttpd/patches/patch-ac | 6 +++--- 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'www/thttpd') diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index ce8a6875553..43cbe44e08f 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2002/05/12 14:47:28 joda Exp $ +# $NetBSD: Makefile,v 1.19 2002/06/16 19:10:25 wiz Exp $ -DISTNAME= thttpd-2.21b +DISTNAME= thttpd-2.23beta1 +PKGNAME= thttpd-2.23.0.1 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 f7c95246123..447fa7f0f6a 100644 --- a/www/thttpd/distinfo +++ b/www/thttpd/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2001/06/09 11:26:33 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/06/16 19:10:25 wiz Exp $ -SHA1 (thttpd-2.21b.tar.gz) = 4ad90204802b2456a59c9bfdf20695e4a3ebb6fd -Size (thttpd-2.21b.tar.gz) = 127824 bytes +SHA1 (thttpd-2.23beta1.tar.gz) = 22331276c2e5f6f1850f0b1ca2b739d0db88bf51 +Size (thttpd-2.23beta1.tar.gz) = 128696 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (patch-aa) = e8dab4830fe993da8eb35de8250502e807b60444 +SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66 SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df -SHA1 (patch-ac) = 7ea638e2d9b33efddd1c98d263b56887362e5cf2 +SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2 SHA1 (patch-ad) = 1d7777516ff0c5e7b03643809854bf96707759ec diff --git a/www/thttpd/patches/patch-aa b/www/thttpd/patches/patch-aa index c8b39dedfd4..e4c6a1a3013 100644 --- a/www/thttpd/patches/patch-aa +++ b/www/thttpd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2000/12/17 22:21:44 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/06/16 19:10:26 wiz Exp $ ---- Makefile.in.orig Tue Jul 4 12:21:32 2000 +--- Makefile.in.orig Wed Apr 3 04:49:35 2002 +++ Makefile.in @@ -34,7 +34,7 @@ # Pathname of directory to install the man page. @@ -29,15 +29,19 @@ $NetBSD: patch-aa,v 1.5 2000/12/17 22:21:44 jlam Exp $ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ NETLIBS = @V_NETLIBS@ -@@ -111,10 +111,10 @@ +@@ -109,12 +109,12 @@ install: installthis install-man installsubdirs installthis: +- -mkdir -p $(DESTDIR)$(BINDIR) - $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR) + $(BSD_INSTALL_PROGRAM) thttpd $(DESTDIR)$(BINDIR) install-man: +- -mkdir -p $(DESTDIR)$(MANDIR)/man8 - $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8 ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(MANDIR)/man8 + $(BSD_INSTALL_MAN) thttpd.8 $(DESTDIR)$(MANDIR)/man8 installsubdirs: diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac index 0bb0df4849e..b08efe27de7 100644 --- a/www/thttpd/patches/patch-ac +++ b/www/thttpd/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2001/01/14 06:14:14 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2002/06/16 19:10:26 wiz Exp $ ---- cgi-src/Makefile.in.orig Tue Sep 26 16:20:14 2000 +--- cgi-src/Makefile.in.orig Mon Nov 12 22:52:00 2001 +++ cgi-src/Makefile.in @@ -34,7 +34,7 @@ CCOPT = @V_CCOPT@ @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.5 2001/01/14 06:14:14 jlam Exp $ NETLIBS = @V_NETLIBS@ @@ -69,15 +69,15 @@ install: all - -mkdir $(CGIBINDIR) + -mkdir -p $(CGIBINDIR) rm -f $(CGIBINDIR)/redirect - cp redirect $(CGIBINDIR)/redirect + $(BSD_INSTALL_PROGRAM) redirect $(CGIBINDIR)/redirect -- cgit v1.2.3