- bugfix update update to hiawatha-6.6

- add XSLT support

www/hiawatha/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2008/03/15 10:16:30 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2008/04/29 08:47:43 ajacoutot Exp $
 
 COMMENT=	secure webserver
 
-DISTNAME=	hiawatha-6.5
+DISTNAME=	hiawatha-6.6
 CATEGORIES=	www net
 
 HOMEPAGE=	http://hiawatha.leisink.org
@@ -17,21 +17,27 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}/files/
 
-WANTLIB=	c crypto pthread ssl
+WANTLIB=	c crypto pthread ssl xml2
+
+LIB_DEPENDS=	xslt.>=3::textproc/libxslt
 
 WEBROOTDIR=	/var/hiawatha
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	webrootdir=${WEBROOTDIR}
-CONFIGURE_ARGS=	--localstatedir=/var
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/libxml2" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		webrootdir=${WEBROOTDIR}
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--enable-xslt
 
 pre-configure:
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \
+		-e 's,!!PREFIX!!,${PREFIX},g;' \
 		-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
 		${WRKSRC}/etc/hiawatha/httpd.conf.in \
 		${WRKSRC}/etc/hiawatha/cgi-wrapper.conf \
-		${WRKSRC}/doc/cgi-wrapper.1 \
-		${WRKSRC}/doc/hiawatha.1
+		${WRKSRC}/doc/hiawatha.1.in
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hiawatha/

www/hiawatha/distinfo

@@ -1,5 +1,5 @@
-MD5 (hiawatha-6.5.tar.gz) = BT/yC9FuJvFYsmF03hQZfw==
-RMD160 (hiawatha-6.5.tar.gz) = UPBP5Rg8sxyrZE6sktJFTpvjvSA=
-SHA1 (hiawatha-6.5.tar.gz) = KSehW2ziZKnOULrl+sjLl0GoToQ=
-SHA256 (hiawatha-6.5.tar.gz) = doKEkWOKwQFrB10qRkEITC4I+2hw01C88DsF3Pshgyc=
-SIZE (hiawatha-6.5.tar.gz) = 233527
+MD5 (hiawatha-6.6.tar.gz) = +Qir+HaRYx9vC7vJmUyq5A==
+RMD160 (hiawatha-6.6.tar.gz) = iP8PftyKTY5HCc2/vhxuef+exxk=
+SHA1 (hiawatha-6.6.tar.gz) = l9coDQm/nS2yMTWUzKAl/9tl8ys=
+SHA256 (hiawatha-6.6.tar.gz) = 7wyKHwsXJXKIxgRwak15jMz/uCJd4XKw2yTgMCbaQxc=
+SIZE (hiawatha-6.6.tar.gz) = 235389

www/hiawatha/patches/patch-Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2007/12/13 13:03:32 ajacoutot Exp $
---- Makefile.in.orig	Tue Dec 11 09:13:22 2007
-+++ Makefile.in	Thu Dec 13 13:56:01 2007
-@@ -1144,9 +1144,8 @@ info: info-am
+$OpenBSD: patch-Makefile_in,v 1.9 2008/04/29 08:47:43 ajacoutot Exp $
+--- Makefile.in.orig	Fri Apr 25 16:48:45 2008
++++ Makefile.in	Tue Apr 29 10:10:37 2008
+@@ -1164,9 +1164,8 @@ info: info-am
  
  info-am:
  

www/hiawatha/patches/patch-doc_cgi-wrapper_1

@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_cgi-wrapper_1,v 1.3 2007/10/14 09:09:46 ajacoutot Exp $
---- doc/cgi-wrapper.1.orig	Fri Oct 12 11:08:41 2007
-+++ doc/cgi-wrapper.1	Sun Oct 14 11:05:53 2007
-@@ -11,7 +11,7 @@ cgi-wrapper
- The CGI-wrapper can be used to run certain CGI programs with a different userid then the webserver's userid. To function properly, the CGI-wrapper binary needs the su-bit. To prevent abuse, it has the necessary security checks. The CGI-wrapper can only be executed by the Hiawatha webserver. It uses the Hiawatha PID-file for this verification.
- 
- .SH CONFIGURATION
--The CGI-wrapper can be configured via the configuration file /etc/hiawatha/cgi-wrapper.conf. The following options are available:
-+The CGI-wrapper can be configured via the configuration file !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf. The following options are available:
- .TP
- .B CGIhandler = <CGI handler>[, <CGI handler>, ...]
- Normally, only files inside the WebsiteRoot will be executed. CGI-handlers are usually not inside this directory. Use this option to specify binaries that are outside the WebsiteRoot and the CGI-wrapper is still allowed to execute.

www/hiawatha/patches/patch-doc_hiawatha_1_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_hiawatha_1,v 1.11 2008/02/10 15:59:10 ajacoutot Exp $
---- doc/hiawatha.1.orig	Sun Feb 10 10:33:05 2008
-+++ doc/hiawatha.1	Sun Feb 10 16:53:52 2008
+$OpenBSD: patch-doc_hiawatha_1_in,v 1.1 2008/04/29 08:47:43 ajacoutot Exp $
+--- doc/hiawatha.1.in.orig	Tue Apr 29 10:19:44 2008
++++ doc/hiawatha.1.in	Tue Apr 29 10:24:00 2008
 @@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserver
  Hiawatha is a secure webserver for Unix. It has been written with 'being secure' as its main goal. Hiawatha has lots of features that no other webserver has. This and the fact that Hiawatha's source code is free of security-bugs, makes Hiawatha the most secure webserver available.
  .br
@@ -10,16 +10,22 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.11 2008/02/10 15:59:10 ajacoutot Exp $
  
  .\" ==========[ Configuration files ]==========================================
  .SH CONFIGURATION FILES
-@@ -150,7 +150,7 @@ Example: CGIhandler = /usr/bin/php4-cgi:php,php4
+@@ -145,12 +145,12 @@ Example: CGIextension = cgi
+ .B CGIhandler = <CGI handler>:<extension>[, <extension>, ...]
+ Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script.
+ .br
+-Example: CGIhandler = /usr/bin/php4-cgi:php,php4
++Example: CGIhandler = !!LOCALBASE!!/bin/php-fastcgi:php,php5
+ .TP
  .B CGIwrapper = <CGI wrapper>
  Specify the wrapper for CGI processes. A secure CGI wrapper is included in the Hiawatha package (see cgi-wrapper(1) for more information).
  .br
 -Example: CGIwrapper = /usr/sbin/cgi-wrapper
-+Example: CGIwrapper = !!LOCALBASE!!/sbin/cgi-wrapper
++Example: CGIwrapper = !!PREFIX!!/sbin/cgi-wrapper
  .TP
  .B CommandChannel = <portnumber>,<MD5 hash of password>
  The port and the password for the CommandChannel. You can use telnet to connect to the CommandChannel (localhost:<portnumber>). Type 'help' in the CommandChannel for more information.
-@@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawatha/garbage.lo
+@@ -183,7 +183,7 @@ Example: GarbageLogfile = @logdir@/garbage.log
  .B Include <filename>
  Include another configurationfile.
  .br
@@ -28,7 +34,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.11 2008/02/10 15:59:10 ajacoutot Exp $
  .TP
  .B KickOnBan = yes|no
  Close all other connections that originate from the same IP in case of a ban.
-@@ -235,7 +235,7 @@ Default = /var/run/hiawatha.pid, example: PIDfile = /d
+@@ -235,7 +235,7 @@ Default = @pidfiledir@/hiawatha.pid, example: PIDfile 
  .B ServerId = <userid>|<userid>:<groupid>[,<groupid>, ...]
  The userid and groupid(s) the server will change to. If only a userid is specified, the groupid(s) will be looked up in /etc/passwd and /etc/group. The userid en groupid of user root are not allowed here.
  .br
@@ -37,7 +43,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.11 2008/02/10 15:59:10 ajacoutot Exp $
  .TP
  .B ServerKey = <SSL certificate file>
  The file containing the SSL private key and certificate. These will be used for all SSL bindings that don't have their own certificate file (see ServerKey and UseSSL in BINDING CONFIGURATION).
-@@ -777,7 +777,7 @@ and
+@@ -785,7 +785,7 @@ and
  .B UseGZfile
  
  .SH MIMETYPES
@@ -46,12 +52,12 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.11 2008/02/10 15:59:10 ajacoutot Exp $
  .TP
  .B <mimetype> <extension> [<extension> ...]
  Example: image/jpeg jpg jpeg jpe
-@@ -801,15 +801,15 @@ Will unban all clients.
+@@ -809,15 +809,15 @@ Will unban all clients.
  Will close all open logfiles
  
  .SH FILES
 -.B /usr/sbin/hiawatha
-+.B !!LOCALBASE!!/sbin/hiawatha
++.B !!PREFIX!!/sbin/hiawatha
  .br
 -.B /etc/hiawatha/httpd.conf
 +.B !!SYSCONFDIR!!/hiawatha/httpd.conf

www/hiawatha/patches/patch-serverconfig_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-serverconfig_c,v 1.9 2007/12/13 13:03:32 ajacoutot Exp $
---- serverconfig.c.orig	Tue Dec  4 09:40:22 2007
-+++ serverconfig.c	Thu Dec 13 13:56:01 2007
+$OpenBSD: patch-serverconfig_c,v 1.10 2008/04/29 08:47:43 ajacoutot Exp $
+--- serverconfig.c.orig	Sat Apr 19 21:46:07 2008
++++ serverconfig.c	Tue Apr 29 10:10:38 2008
 @@ -16,7 +16,7 @@
  #include "libstr.h"
  #include "libfs.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-serverconfig_c,v 1.9 2007/12/13 13:03:32 ajacoutot Exp $
  #define MAX_LENGTH_CONFIGLINE   512
  #define MAX_CACHE_SIZE           50
  #define MAX_UPLOAD_SIZE         100
-@@ -219,8 +219,8 @@ t_config *default_config(void) {
+@@ -222,8 +222,8 @@ t_config *default_config(void) {
  #endif
  
  		config->server_root        = NULL;