diff options
author | hubertf <hubertf> | 2000-02-09 20:55:27 +0000 |
---|---|---|
committer | hubertf <hubertf> | 2000-02-09 20:55:27 +0000 |
commit | ed3a817981d2c1e62d437a0a63f82d3ca535c6eb (patch) | |
tree | f1d15f6b936a6b0397cd0eac871594c4e37f5056 /www/thttpd | |
parent | f28627afe585f6d0289b8efe7b14ad70a3c69126 (diff) | |
download | pkgsrc-ed3a817981d2c1e62d437a0a63f82d3ca535c6eb.tar.gz |
Update to V2.15.
Main reason: IPv6. Changes:
New in version 2.15:
* Use standard isxdigit macro instead of is_hexit routine.
* Portability fix for Debian, which lacks gai_strerror().
* Fix for .htpasswd authorization, broken by 2.14's custom error pages
change.
New in version 2.14:
* Fix to non-local referer code - it was trying to dereference a null
pointer under some circumstances.
* Fix to If-Modified-Since - some leap year problems.
* Rewrote match() - it was using a whole lot of CPU time for patterns
with lots of |'s, such as those used by the new non-local-referer
filtering.
* Fix to host lookup code for -h flag.
* Fix custom error pages to work with 401 Unauthorized.
* Removed unused variable.
New in version 2.13:
* Portability fix for fdwatch on systems with poll() but not select().
* Renamed nph-redirect to redirect, now that thttpd does header parsing.
* Always chdir to / after a chroot.
* Some minor de-linting changes.
* Revived code that closes stdin/stdout/stderr, after adding a fix in the
CGI code to prevent descriptors from getting screwed up.
* Bugfix for CGI header parsing - if the CGI was sending binary data
(e.g. images), the result could get truncated or corrupted.
* Disallow ".." listing of virtual host directory.
* Revised snprintf portability fix.
* Rearranged the hc initialization so it's all in one place.
* New IPv6 code from KIKUCHI Takahiro.
* New non-local referer filtering code from Craig Leres.
* New custom error pages code from Catalin Ionescu.
New in version 2.12:
* Better heuristic for deciding between select() and poll().
* Added Red Hat RPM spec file.
New in version 2.11:
* Use poll() instead of select() when favorable.
* Do lazy allocation of part of the connection data structure, to save on
memory now that we can have thousands of simultaneous connections.
* Some speed optimizations.
* Add HTTP_HOST to CGI environment.
* Bugfix for rare uninitialized variable.
New in version 2.10:
* Bugfix for CGI header parsing.
* Call setlogin() if it's available.
Diffstat (limited to 'www/thttpd')
-rw-r--r-- | www/thttpd/Makefile | 15 | ||||
-rw-r--r-- | www/thttpd/files/md5 | 4 | ||||
-rw-r--r-- | www/thttpd/files/patch-sum | 8 | ||||
-rw-r--r-- | www/thttpd/patches/patch-aa | 6 | ||||
-rw-r--r-- | www/thttpd/patches/patch-ab | 6 | ||||
-rw-r--r-- | www/thttpd/patches/patch-ac | 28 | ||||
-rw-r--r-- | www/thttpd/pkg/PLIST | 8 |
7 files changed, 43 insertions, 32 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 55cecc13e50..b4667d547ca 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 1999/12/15 14:48:48 abs Exp $ +# $NetBSD: Makefile,v 1.4 2000/02/09 20:55:27 hubertf Exp $ -DISTNAME= thttpd-2.09 +DISTNAME= thttpd-2.15 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/thttpd/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -12,20 +12,29 @@ HOMEPAGE= http://www.acme.com/software/thttpd/ EXTRACT_ONLY= ${DISTFILES:N*.gif} GNU_CONFIGURE= yes +# Note: this pkg auto-detects IPv6 without regarding USE_INET6. +# (Leave the above line in to still get it into the README-IPv6.html!) + pre-build: + ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1 ${MV} ${WRKSRC}/extras/Makefile ${WRKSRC}/extras/Makefile.orig ${SED} -e "s/htpasswd/thtpasswd/g" \ <${WRKSRC}/extras/Makefile.orig >${WRKSRC}/extras/Makefile ${SED} -e "s/htpasswd/thtpasswd/g" \ <${WRKSRC}/extras/htpasswd.c >${WRKSRC}/extras/thtpasswd.c -pre-install: +re-install: ${MKDIR} ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/www ${SED} -e "s/htpasswd/thtpasswd/g" \ <${WRKSRC}/extras/htpasswd.1 >${WRKSRC}/extras/thtpasswd.1 ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/www/index.html +pre-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/www + post-install: + ${INSTALL_DATA} ${WRKSRC}/index.html \ + ${PREFIX}/share/www ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \ ${PREFIX}/share/www diff --git a/www/thttpd/files/md5 b/www/thttpd/files/md5 index 46052d5e991..ad50ae21de4 100644 --- a/www/thttpd/files/md5 +++ b/www/thttpd/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.3 1999/12/15 14:48:49 abs Exp $ +$NetBSD: md5,v 1.4 2000/02/09 20:55:28 hubertf Exp $ -MD5 (thttpd-2.09.tar.gz) = 356fd48ab28b45fc913a62bb05e043ca +MD5 (thttpd-2.15.tar.gz) = 8046fce64ed2bd636dc212599749646c MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1 diff --git a/www/thttpd/files/patch-sum b/www/thttpd/files/patch-sum index f5bdca80734..dea909ea909 100644 --- a/www/thttpd/files/patch-sum +++ b/www/thttpd/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 1999/12/15 14:48:49 abs Exp $ +$NetBSD: patch-sum,v 1.4 2000/02/09 20:55:28 hubertf Exp $ -MD5 (patch-aa) = 192f42a43d37e9d1fdb9b9cdff9ff940 -MD5 (patch-ab) = 6f8e0104156a70b7962d7fdab0baffd3 -MD5 (patch-ac) = a3c8ea60a2b5d114d26539731a1f61e4 +MD5 (patch-aa) = d9e7d902f59ac1bde877c0ea31a8e513 +MD5 (patch-ab) = 2aa3d6ab165cc262aea5781558437f04 +MD5 (patch-ac) = 793b59d0eaf047c5c65373e1fa9ba53c MD5 (patch-ad) = ad2a6a25ae9091206afaf651271776da diff --git a/www/thttpd/patches/patch-aa b/www/thttpd/patches/patch-aa index 8c17b537b2b..4aacf694ac9 100644 --- a/www/thttpd/patches/patch-aa +++ b/www/thttpd/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 1999/11/21 23:03:38 tron Exp $ +$NetBSD: patch-aa,v 1.3 2000/02/09 20:55:29 hubertf Exp $ ---- Makefile.in.orig Mon Oct 11 20:45:38 1999 -+++ Makefile.in Sun Nov 21 23:52:46 1999 +--- Makefile.in.BAK Wed Feb 9 21:05:49 2000 ++++ Makefile.in Wed Feb 9 21:06:50 2000 @@ -34,7 +34,7 @@ # Pathname of directory to install the man page. MANDIR = @mandir@ diff --git a/www/thttpd/patches/patch-ab b/www/thttpd/patches/patch-ab index 4f22d1f880b..ca00c036235 100644 --- a/www/thttpd/patches/patch-ab +++ b/www/thttpd/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1 1999/11/21 23:03:38 tron Exp $ +$NetBSD: patch-ab,v 1.2 2000/02/09 20:55:29 hubertf Exp $ ---- extras/Makefile.in.orig Wed Sep 15 18:00:14 1999 -+++ extras/Makefile.in Sun Nov 21 23:55:25 1999 +--- extras/Makefile.in.BAK Wed Feb 9 21:07:16 2000 ++++ extras/Makefile.in Wed Feb 9 21:11:37 2000 @@ -67,17 +67,15 @@ install: all diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac index 0d04604afd6..f7c05d54006 100644 --- a/www/thttpd/patches/patch-ac +++ b/www/thttpd/patches/patch-ac @@ -1,25 +1,27 @@ -$NetBSD: patch-ac,v 1.1 1999/11/21 23:03:38 tron Exp $ +$NetBSD: patch-ac,v 1.2 2000/02/09 20:55:29 hubertf Exp $ +$NetBSD: patch-ac,v 1.2 2000/02/09 20:55:29 hubertf Exp $ ---- cgi-src/Makefile.in.orig Wed Sep 15 17:57:19 1999 -+++ cgi-src/Makefile.in Sun Nov 21 23:57:31 1999 -@@ -66,15 +66,15 @@ - + +--- cgi-src/Makefile.in.BAK Wed Feb 9 21:12:32 2000 ++++ cgi-src/Makefile.in Wed Feb 9 21:13:16 2000 +@@ -67,15 +67,15 @@ install: all - rm -f $(CGIBINDIR)/nph-redirect -- cp nph-redirect $(CGIBINDIR)/nph-redirect -+ $(BSD_INSTALL_PROGRAM) nph-redirect $(CGIBINDIR)/nph-redirect - rm -f $(MANDIR)/man8/nph-redirect.8 -- cp nph-redirect.8 $(MANDIR)/man8/nph-redirect.8 -+ $(BSD_INSTALL_MAN) nph-redirect.8 $(MANDIR)/man8/nph-redirect.8 + -mkdir $(CGIBINDIR) + rm -f $(CGIBINDIR)/redirect +- cp redirect $(CGIBINDIR)/redirect ++ $(BSD_INSTALL_PROGRAM) redirect $(CGIBINDIR)/redirect + rm -f $(MANDIR)/man8/redirect.8 +- cp redirect.8 $(MANDIR)/man8/redirect.8 ++ $(BSD_INSTALL_MAN) redirect.8 $(MANDIR)/man8/redirect.8 rm -f $(CGIBINDIR)/ssi - cp ssi $(CGIBINDIR)/ssi -+ $(BSD_INSTALL_PROGRAM) ssi $(CGIBINDIR)/ssi ++ $(BSD_INSTALL_MAN) ssi $(CGIBINDIR)/ssi rm -f $(MANDIR)/man8/ssi.8 - cp ssi.8 $(MANDIR)/man8/ssi.8 + $(BSD_INSTALL_MAN) ssi.8 $(MANDIR)/man8/ssi.8 rm -f $(CGIBINDIR)/phf - cp phf $(CGIBINDIR)/phf -+ $(BSD_INSTALL_PROGRAM) phf $(CGIBINDIR)/phf ++ $(BSD_INSTALL_MAN) phf $(CGIBINDIR)/phf clean: rm -f $(CLEANFILES) diff --git a/www/thttpd/pkg/PLIST b/www/thttpd/pkg/PLIST index f3fa4c8877f..a0f8462a479 100644 --- a/www/thttpd/pkg/PLIST +++ b/www/thttpd/pkg/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 1999/12/15 14:48:50 abs Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/02/09 20:55:29 hubertf Exp $ sbin/thttpd sbin/syslogtocern sbin/makeweb sbin/thtpasswd man/man8/thttpd.8 man/man8/syslogtocern.8 -man/man8/nph-redirect.8 +man/man8/redirect.8 man/man8/ssi.8 man/man1/makeweb.1 man/man1/thtpasswd.1 -libexec/cgi-bin/nph-redirect +libexec/cgi-bin/redirect libexec/cgi-bin/phf libexec/cgi-bin/ssi share/www/index.html share/www/sitedrivenby.gif -@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true +@dirrm %D/libexec/cgi-bin @dirrm share/www |