Sat Apr 18 21:06:15 2009 UTC ()
update to bozohttpd 20090418.  changes include:

o  avoid dying in daemon mode for some uncommon, but recoverable, errors
o  close leaking file descriptors for CGI and daemon mode
o  handle poll errors properly
o  don't try to handle more than one request per process yet


(mrg)
diff -r1.64 -r1.65 pkgsrc/www/bozohttpd/Makefile
diff -r1.46 -r1.47 pkgsrc/www/bozohttpd/distinfo
diff -r1.17 -r1.18 pkgsrc/www/bozohttpd/patches/patch-aa
cvs diff -r1.64 -r1.65 pkgsrc/www/bozohttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/bozohttpd/Makefile 2009/04/18 07:01:38 1.64
+++ pkgsrc/www/bozohttpd/Makefile 2009/04/18 21:06:15 1.65
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.64 2009/04/18 07:01:38 mrg Exp $ 1# $NetBSD: Makefile,v 1.65 2009/04/18 21:06:15 mrg Exp $
2# 2#
3 3
4DISTNAME= bozohttpd-20090417 4DISTNAME= bozohttpd-20090418
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_LOCAL} 6MASTER_SITES= ${MASTER_SITE_LOCAL}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= mrg@eterna.com.au 9MAINTAINER= mrg@eterna.com.au
10HOMEPAGE= http://www.eterna.com.au/bozohttpd/ 10HOMEPAGE= http://www.eterna.com.au/bozohttpd/
11COMMENT= Bozotic HTTP server; small and secure 11COMMENT= Bozotic HTTP server; small and secure
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16.include "options.mk" 16.include "options.mk"
17 17
cvs diff -r1.46 -r1.47 pkgsrc/www/bozohttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/bozohttpd/distinfo 2009/04/18 07:01:38 1.46
+++ pkgsrc/www/bozohttpd/distinfo 2009/04/18 21:06:15 1.47
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.46 2009/04/18 07:01:38 mrg Exp $ 1$NetBSD: distinfo,v 1.47 2009/04/18 21:06:15 mrg Exp $
2 2
3SHA1 (bozohttpd-20090417.tar.bz2) = 3ffacc60ceb15ca4a4b247a07df74f2fbd99269a 3SHA1 (bozohttpd-20090418.tar.bz2) = fa63ceb04d70f6928e92110d50a89ec541371b03
4RMD160 (bozohttpd-20090417.tar.bz2) = 1dae43331e9e8a3ef9190d666e5b62bebb4b9f74 4RMD160 (bozohttpd-20090418.tar.bz2) = 46d5aa4d7c4852337821c4fc78865571b206a62e
5Size (bozohttpd-20090417.tar.bz2) = 36304 bytes 5Size (bozohttpd-20090418.tar.bz2) = 41488 bytes
6SHA1 (patch-aa) = f1934786cb309cee8ec1c77e0760ee1e79b90f8f 6SHA1 (patch-aa) = ed75188890b62910fc66e0bc83976c785193eaaa
7SHA1 (patch-ab) = 010c130d315975d8a5ffcc3995bd951f6ecb619a 7SHA1 (patch-ab) = 010c130d315975d8a5ffcc3995bd951f6ecb619a
cvs diff -r1.17 -r1.18 pkgsrc/www/bozohttpd/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/bozohttpd/patches/Attic/patch-aa 2007/09/07 23:01:59 1.17
+++ pkgsrc/www/bozohttpd/patches/Attic/patch-aa 2009/04/18 21:06:15 1.18
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1$NetBSD: patch-aa,v 1.17 2007/09/07 23:01:59 jlam Exp $ 1$NetBSD: patch-aa,v 1.18 2009/04/18 21:06:15 mrg Exp $
2 2
3--- auth-bozo.c.orig Wed May 17 08:19:10 2006 3--- auth-bozo.c.orig 2009-04-18 00:38:56.000000000 -0700
4+++ auth-bozo.c 4+++ auth-bozo.c 2009-04-18 14:03:57.000000000 -0700
5@@ -37,7 +37,12 @@ 5@@ -38,6 +38,10 @@
6 #include <sys/param.h> 6 #include <stdlib.h>
 7 #include <unistd.h>
7  8
8 #include <string.h> 
9+ 
10+#ifndef NO_SSL_SUPPORT 9+#ifndef NO_SSL_SUPPORT
11+#include <openssl/des.h> 10+#include <openssl/des.h>
12+#else 
13 #include <unistd.h> 
14+#endif 11+#endif
15  12+
16 #include "bozohttpd.h" 13 #include "bozohttpd.h"
17  14
18@@ -97,7 +102,7 @@ auth_check(http_req *request, const char 15 #ifndef AUTH_FILE
 16@@ -98,7 +102,7 @@
19 request->hr_authpass)); 17 request->hr_authpass));
20 if (strcmp(request->hr_authuser, user) != 0) 18 if (strcmp(request->hr_authuser, user) != 0)
21 continue; 19 continue;
22- if (strcmp(crypt(request->hr_authpass, pass), pass)) 20- if (strcmp(crypt(request->hr_authpass, pass), pass))
23+ if (strcmp(DES_crypt(request->hr_authpass, pass), pass)) 21+ if (strcmp(DES_crypt(request->hr_authpass, pass), pass))
24 break; 22 break;
25 fclose(fp); 23 fclose(fp);
26 return; 24 return 0;