diff options
author | mrg <mrg@pkgsrc.org> | 2002-08-23 08:37:24 +0000 |
---|---|---|
committer | mrg <mrg@pkgsrc.org> | 2002-08-23 08:37:24 +0000 |
commit | 8c5e0252cd257bde26a15095dd35c5c48946f12c (patch) | |
tree | 8502ab0fd7ea8f9a7f5922891025dc1b235bce69 /www | |
parent | 9289b01b8fea37a8bc8f60735b60ddde3d376401 (diff) | |
download | pkgsrc-8c5e0252cd257bde26a15095dd35c5c48946f12c.tar.gz |
update to bozohttpd 5.14. changes include:
o allow -X mode to work for "/"
o work on systems without MADV_SEQUENTIAL
o make a local cut-down copy of "queue.h" (fixes linux & solaris
support at the very least)
o portability fixes for pre-ipv6 socket api systems (eg, solaris 7)
o portability fixes for missing _PATH_DEFPATH, LOG_FTP and __progname
o better documentation on virtual host support
Diffstat (limited to 'www')
-rw-r--r-- | www/bozohttpd/Makefile | 5 | ||||
-rw-r--r-- | www/bozohttpd/distinfo | 9 | ||||
-rw-r--r-- | www/bozohttpd/patches/patch-ab | 17 | ||||
-rw-r--r-- | www/bozohttpd/patches/patch-ac | 51 |
4 files changed, 19 insertions, 63 deletions
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index cabaca38364..8977736d919 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2002/08/21 02:43:45 grant Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/23 08:37:24 mrg Exp $ # -DISTNAME= bozohttpd-5.13 -PKGREVISION= 1 +DISTNAME= bozohttpd-5.14 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 4a198ab54d3..3e976b522e3 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.15 2002/08/05 16:37:50 mrg Exp $ +$NetBSD: distinfo,v 1.16 2002/08/23 08:37:24 mrg Exp $ -SHA1 (bozohttpd-5.13.tar.bz2) = 8ee68a14b9e1a3071a531df6885c9d303dd2f4c6 -Size (bozohttpd-5.13.tar.bz2) = 20444 bytes -SHA1 (patch-ab) = 24cc57867ecf94617a78025baf31c2f050d42470 -SHA1 (patch-ac) = 45bdc4e86be09424a9d0b93cad5acb69226a021e +SHA1 (bozohttpd-5.14.tar.bz2) = ce4eeb87b8005b4eac5d52c8647c0ed3cae9f56e +Size (bozohttpd-5.14.tar.bz2) = 21666 bytes +SHA1 (patch-ab) = 706f678d56bbedd1b2f02f543c265d48dae8011d diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab index 3a6e51eec89..0ada442a2d8 100644 --- a/www/bozohttpd/patches/patch-ab +++ b/www/bozohttpd/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2002/07/10 10:48:04 mrg Exp $ +$NetBSD: patch-ab,v 1.11 2002/08/23 08:37:25 mrg Exp $ ---- bozohttpd.8.in.orig Sat Sep 22 20:10:00 2001 -+++ bozohttpd.8.in -@@ -172,8 +169,8 @@ +--- bozohttpd.8.in.orig Fri Aug 23 15:43:44 2002 ++++ bozohttpd.8.in Fri Aug 23 15:48:04 2002 +@@ -197,8 +197,8 @@ .Xr inetd.conf 5 entry would be: .Bd -literal @@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.10 2002/07/10 10:48:04 mrg Exp $ .Ed .Pp This would serve web pages from +@@ -218,7 +218,7 @@ + .Pp + To configure set of virtual hosts, one would use an entry like: + .Bd -literal +-www stream tcp nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd -v /var/vroot /var/www ++www stream tcp nowait:600 httpd @PREFIX@/libexec/bozohttpd bozohttpd -v /var/vroot /var/www + .Ed + .Pp + and inside diff --git a/www/bozohttpd/patches/patch-ac b/www/bozohttpd/patches/patch-ac deleted file mode 100644 index 20ead1b551e..00000000000 --- a/www/bozohttpd/patches/patch-ac +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2002/08/05 16:37:50 mrg Exp $ - -Index: bozohttpd.c -=================================================================== -RCS file: /home/towers/mrg/cvsroot/eterna/bozohttpd/bozohttpd.c,v -retrieving revision 1.45 -retrieving revision 1.46 -diff -p -c -r1.45 -r1.46 -*** bozohttpd.c 2002/08/04 15:21:25 1.45 ---- bozohttpd.c 2002/08/05 16:28:26 1.46 -*************** -*** 1,4 **** -! /* $eterna: bozohttpd.c,v 1.45 2002/08/04 15:21:25 mrg Exp $ */ - - /* - * Copyright (c) 1997, 1998, 1999, 2000, 2001 Matthew R. Green ---- 1,4 ---- -! /* $eterna: bozohttpd.c,v 1.46 2002/08/05 16:28:26 mrg Exp $ */ - - /* - * Copyright (c) 1997, 1998, 1999, 2000, 2001 Matthew R. Green -*************** process_request(request) -*** 900,906 **** - else if (errno == ENOENT) { - #ifndef NO_DIRINDEX_SUPPORT - if (isindex && Xflag) { -! file[strlen(file) - strlen(index_html)] = '\0'; - debug((DEBUG_FAT, "trying dir index (%s)", - file)); - directory_index(request, file); ---- 900,909 ---- - else if (errno == ENOENT) { - #ifndef NO_DIRINDEX_SUPPORT - if (isindex && Xflag) { -! if (strlen(file) <= strlen(index_html)) -! (const char *)file = "."; -! else -! file[strlen(file) - strlen(index_html)] = '\0'; - debug((DEBUG_FAT, "trying dir index (%s)", - file)); - directory_index(request, file); -*************** directory_index(request, dirname) -*** 972,977 **** ---- 975,981 ---- - char buf[MAXPATHLEN]; - int l; - -+ debug((DEBUG_FAT, "directory_index: dirname ``%s''", dirname)); - if (stat(dirname, &sb) < 0 || - (dp = opendir(dirname)) == NULL) { - if (errno == EPERM) |