From 25dfed2b46942db1a9b6aa43aa4478f9804174a2 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 6 Jul 2007 12:09:12 +0000 Subject: [PATCH] - update to hiawatha-5.10 note that throttle configuration has been merged into httpd.conf ; small bug fixes and improvements --- www/hiawatha/Makefile | 4 +-- www/hiawatha/distinfo | 10 +++--- www/hiawatha/patches/patch-Makefile_in | 8 ++--- www/hiawatha/patches/patch-doc_hiawatha_1 | 40 +++++++---------------- www/hiawatha/patches/patch-serverconfig_c | 8 ++--- www/hiawatha/pkg/PLIST | 4 +-- 6 files changed, 28 insertions(+), 46 deletions(-) diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 70451e6d4e3..244fd515da1 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2007/06/18 07:51:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2007/07/06 12:09:12 ajacoutot Exp $ COMMENT= secure webserver -DISTNAME= hiawatha-5.9 +DISTNAME= hiawatha-5.10 CATEGORIES= www net HOMEPAGE= http://hiawatha.leisink.org diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo index 00f616dbcd6..56dc06181eb 100644 --- a/www/hiawatha/distinfo +++ b/www/hiawatha/distinfo @@ -1,5 +1,5 @@ -MD5 (hiawatha-5.9.tar.gz) = uC/gmdisL0UYdvP4GcP2GQ== -RMD160 (hiawatha-5.9.tar.gz) = w7Mu66q3AXkP7UONoxKUi2M1ElE= -SHA1 (hiawatha-5.9.tar.gz) = PI6v+H7k70eBtzKB31qKI0nKGIE= -SHA256 (hiawatha-5.9.tar.gz) = WlN/iqe+Qz73miCTm9+feY/aKVFLP7RYVZ9yIG6x7gI= -SIZE (hiawatha-5.9.tar.gz) = 215213 +MD5 (hiawatha-5.10.tar.gz) = Il8n9TYtPyZxlL6yh29QUA== +RMD160 (hiawatha-5.10.tar.gz) = 0skOiW9LFCSDvL5v+Gq/b9lVtvI= +SHA1 (hiawatha-5.10.tar.gz) = OdyivC33Vps0yNmEtm1mxlW11Sk= +SHA256 (hiawatha-5.10.tar.gz) = HsbFnX28j+HOwojBTh6sIZVxG5i5dysLKvZLrmaJSTE= +SIZE (hiawatha-5.10.tar.gz) = 217672 diff --git a/www/hiawatha/patches/patch-Makefile_in b/www/hiawatha/patches/patch-Makefile_in index 09f9ca178f3..e3cc37ba007 100644 --- a/www/hiawatha/patches/patch-Makefile_in +++ b/www/hiawatha/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $ ---- Makefile.in.orig Thu Jun 7 00:13:50 2007 -+++ Makefile.in Mon Jun 18 09:42:05 2007 -@@ -1088,9 +1088,8 @@ info: info-am +$OpenBSD: patch-Makefile_in,v 1.5 2007/07/06 12:09:12 ajacoutot Exp $ +--- Makefile.in.orig Tue Jul 3 11:00:20 2007 ++++ Makefile.in Fri Jul 6 13:46:45 2007 +@@ -1092,9 +1092,8 @@ info: info-am info-am: diff --git a/www/hiawatha/patches/patch-doc_hiawatha_1 b/www/hiawatha/patches/patch-doc_hiawatha_1 index 0de439ab186..1831bef5718 100644 --- a/www/hiawatha/patches/patch-doc_hiawatha_1 +++ b/www/hiawatha/patches/patch-doc_hiawatha_1 @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $ ---- doc/hiawatha.1.orig Fri Jun 15 10:41:04 2007 -+++ doc/hiawatha.1 Mon Jun 18 09:42:06 2007 +$OpenBSD: patch-doc_hiawatha_1,v 1.5 2007/07/06 12:09:12 ajacoutot Exp $ +--- doc/hiawatha.1.orig Thu Jul 5 15:51:58 2007 ++++ doc/hiawatha.1 Fri Jul 6 13:49:17 2007 @@ -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 @@ -12,7 +12,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $ .SH CONFIGURATION FILES @@ -150,7 +150,7 @@ Example: CGIhandler = /usr/bin/php4-cgi:php,php4 .B CGIwrapper = - Specify the wrapper for CGI processes. A secure CGI wrapper is included in the Hiawatha package. See cgi-wrapper(1) for more information. + 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 @@ -28,7 +28,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $ .TP .B KickOnBan = yes|no Close all other connections that originate from the same IP in case of a ban. -@@ -228,7 +228,7 @@ Default = /var/run/hiawatha.pid, example: PIDfile = /u +@@ -235,7 +235,7 @@ Default = /var/run/hiawatha.pid, example: PIDfile = /u .B ServerId = |:[,, ...] 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 'root' are not allowed here. .br @@ -36,17 +36,8 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $ +Default = 579:579, example: ServerId = www-data .TP .B ServerKey = - 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 the BINDING section. -@@ -256,7 +256,7 @@ Default = /var/log/hiawatha/system.log, example: Syste - .B ThrottleConfig = - The location of the throttle configurationfile. It the path is omitted, Hiawatha's configurationfile directory will be used. - .br --Default = throttle.conf, example: ThrottleConfig = /etc/somewhere/throttle.conf -+Default = throttle.conf, example: ThrottleConfig = /etc/somewhere/throttle.conf - .TP - .B TimeForCGI =