import bozohttpd 20100509. it has these changes:

o  major rework and clean up of internal interfaces.  move the main
   program into main.c, the remaining parts are useable as library.
   add bindings for lua.  by Alistair G. Crooks <agc@netbsd.org>
o  fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=566325


special thanks to al for the majority of these changes.

4 files changed, 20 insertions, 21 deletions

diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index d39f7ac485a..7c79f4e2f51 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2010/01/17 12:02:48 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2010/05/10 03:42:18 mrg Exp $
 #
 
-DISTNAME=	bozohttpd-20090522
-PKGREVISION=	1
+DISTNAME=	bozohttpd-20100509
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo
index 1cb67958bdf..fe76d22235d 100644
--- a/www/bozohttpd/distinfo
+++ b/www/bozohttpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.48 2009/05/23 03:58:16 mrg Exp $
+$NetBSD: distinfo,v 1.49 2010/05/10 03:42:18 mrg Exp $
 
-SHA1 (bozohttpd-20090522.tar.bz2) = c4de054b3ce77b9d826fd8c31a9de1e9d7677c93
-RMD160 (bozohttpd-20090522.tar.bz2) = f262e1ece815a8c2bf997b62def6fe5284c79809
-Size (bozohttpd-20090522.tar.bz2) = 38327 bytes
-SHA1 (patch-aa) = ed75188890b62910fc66e0bc83976c785193eaaa
-SHA1 (patch-ab) = 010c130d315975d8a5ffcc3995bd951f6ecb619a
+SHA1 (bozohttpd-20100509.tar.bz2) = fb3f5578487103d5e20a2d18871ab5445b1b1f8d
+RMD160 (bozohttpd-20100509.tar.bz2) = 4fe2e42f77ccf6bd8b7a7590b4ed6bc5cd179190
+Size (bozohttpd-20100509.tar.bz2) = 45671 bytes
+SHA1 (patch-aa) = 2e70d3d10aa8bc228331cc1a229ef04106aca210
+SHA1 (patch-ab) = e454bc52ac64bf78eba167e5bec8c6510a2ba31f
diff --git a/www/bozohttpd/patches/patch-aa b/www/bozohttpd/patches/patch-aa
index d78f767c221..278900915cd 100644
--- a/www/bozohttpd/patches/patch-aa
+++ b/www/bozohttpd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.18 2009/04/18 21:06:15 mrg Exp $
+$NetBSD: patch-aa,v 1.19 2010/05/10 03:42:18 mrg Exp $
 
---- auth-bozo.c.orig	2009-04-18 00:38:56.000000000 -0700
-+++ auth-bozo.c	2009-04-18 14:03:57.000000000 -0700
+--- auth-bozo.c.orig	2010-05-09 19:51:28.000000000 -0700
++++ auth-bozo.c	2010-05-09 20:13:45.000000000 -0700
 @@ -38,6 +38,10 @@
  #include <stdlib.h>
  #include <unistd.h>
@@ -13,12 +13,12 @@ $NetBSD: patch-aa,v 1.18 2009/04/18 21:06:15 mrg Exp $
  #include "bozohttpd.h"
  
  #ifndef AUTH_FILE
-@@ -98,7 +102,7 @@
+@@ -99,7 +103,7 @@
  			    request->hr_authpass));
  			if (strcmp(request->hr_authuser, user) != 0)
  				continue;
--			if (strcmp(crypt(request->hr_authpass, pass), pass))
-+			if (strcmp(DES_crypt(request->hr_authpass, pass), pass))
+-			if (strcmp(crypt(request->hr_authpass, pass),
++			if (strcmp(DES_crypt(request->hr_authpass, pass),
+ 					pass) != 0)
  				break;
  			fclose(fp);
- 			return 0;
diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab
index db0d7d269d5..264163edb89 100644
--- a/www/bozohttpd/patches/patch-ab
+++ b/www/bozohttpd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.17 2007/09/08 01:44:52 jlam Exp $
+$NetBSD: patch-ab,v 1.18 2010/05/10 03:42:18 mrg Exp $
 
---- Makefile.boot.orig	Tue Sep 27 20:09:20 2005
-+++ Makefile.boot
+--- Makefile.boot.orig	2010-05-09 19:24:30.000000000 -0700
++++ Makefile.boot	2010-05-09 20:12:09.000000000 -0700
 @@ -4,7 +4,6 @@
  # see Makefile for a list of compile options that may be placed in CFLAGS.
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.17 2007/09/08 01:44:52 jlam Exp $
  
  GROFF=	groff -Tascii
  CRYPTOLIBDIR=	# -L/usr/local/lib
-@@ -14,7 +13,7 @@ FILES=	bozohttpd.c auth-bozo.c cgi-bozo.
- 	dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c
+@@ -14,7 +13,7 @@
+ 	dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c main.c
  
  all:
 -	$(CC) $(CFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)