From a027656fc33d4a076f0ec359c427bc2c62613a9b Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 14 Oct 2007 09:09:45 +0000 Subject: [PATCH] - upate to bugfix release 5.14 --- www/hiawatha/Makefile | 4 ++-- www/hiawatha/distinfo | 10 +++++----- www/hiawatha/patches/patch-doc_cgi-wrapper_1 | 8 ++++---- www/hiawatha/patches/patch-doc_hiawatha_1 | 10 +++++----- www/hiawatha/patches/patch-serverconfig_c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 1751d510311..bf9501d97e5 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/28 10:12:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2007/10/14 09:09:45 ajacoutot Exp $ COMMENT= secure webserver -DISTNAME= hiawatha-5.13 +DISTNAME= hiawatha-5.14 CATEGORIES= www net HOMEPAGE= http://hiawatha.leisink.org diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo index cd5ccfd3c2b..123e480aeec 100644 --- a/www/hiawatha/distinfo +++ b/www/hiawatha/distinfo @@ -1,5 +1,5 @@ -MD5 (hiawatha-5.13.tar.gz) = 0x6t/bm8xWPuUR4ZO9YnwQ== -RMD160 (hiawatha-5.13.tar.gz) = VEIZuDG79ygqsa3JBZKlAkMKosQ= -SHA1 (hiawatha-5.13.tar.gz) = aeEQX8MzHuLIgqKBk1W0bUCu3kA= -SHA256 (hiawatha-5.13.tar.gz) = RpJq70ildSmrGFBp3ccUqGnJZib74n7BdWrawWxOSOY= -SIZE (hiawatha-5.13.tar.gz) = 226427 +MD5 (hiawatha-5.14.tar.gz) = FkaGH/5m5u75nt7VOZbkbQ== +RMD160 (hiawatha-5.14.tar.gz) = xUWzOfgrHgRcoEKQWH2GHnIrKbU= +SHA1 (hiawatha-5.14.tar.gz) = vX51adGw3YGxnUgXIt0rlWSC7gg= +SHA256 (hiawatha-5.14.tar.gz) = z8muGOaesv5boJ4SastvGkMiAMjbHPpO1Iln9nTp+9g= +SIZE (hiawatha-5.14.tar.gz) = 227466 diff --git a/www/hiawatha/patches/patch-doc_cgi-wrapper_1 b/www/hiawatha/patches/patch-doc_cgi-wrapper_1 index 4a5a1a41110..c72d3a083b1 100644 --- a/www/hiawatha/patches/patch-doc_cgi-wrapper_1 +++ b/www/hiawatha/patches/patch-doc_cgi-wrapper_1 @@ -1,8 +1,8 @@ -$OpenBSD: patch-doc_cgi-wrapper_1,v 1.2 2007/04/25 13:55:58 ajacoutot Exp $ ---- doc/cgi-wrapper.1.orig Wed Mar 7 00:33:48 2007 -+++ doc/cgi-wrapper.1 Wed Apr 25 15:49:45 2007 +$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. As a result, the CGI-wrapper can only be executed by the Hiawatha webserver. + 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: diff --git a/www/hiawatha/patches/patch-doc_hiawatha_1 b/www/hiawatha/patches/patch-doc_hiawatha_1 index 7304f89a845..3f238f29c01 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.7 2007/09/28 10:12:23 ajacoutot Exp $ ---- doc/hiawatha.1.orig Mon Sep 24 11:21:07 2007 -+++ doc/hiawatha.1 Fri Sep 28 12:06:39 2007 +$OpenBSD: patch-doc_hiawatha_1,v 1.8 2007/10/14 09:09:46 ajacoutot Exp $ +--- doc/hiawatha.1.orig Fri Oct 12 11:10:43 2007 ++++ doc/hiawatha.1 Sun Oct 14 11:05:53 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 @@ -30,7 +30,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.7 2007/09/28 10:12:23 ajacoutot Exp $ 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 = /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. + 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 -Default = 65534:65534, example: ServerId = www-data +Default = 579:579, example: ServerId = www-data @@ -47,7 +47,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.7 2007/09/28 10:12:23 ajacoutot Exp $ .B [ ...] Example: image/jpeg jpg jpeg jpe @@ -779,15 +779,15 @@ Will unban all clients. - Will disconnect all clients. + Will close all open logfiles .SH FILES -.B /usr/sbin/hiawatha diff --git a/www/hiawatha/patches/patch-serverconfig_c b/www/hiawatha/patches/patch-serverconfig_c index fba48821e59..8d886787f63 100644 --- a/www/hiawatha/patches/patch-serverconfig_c +++ b/www/hiawatha/patches/patch-serverconfig_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-serverconfig_c,v 1.7 2007/09/28 10:12:23 ajacoutot Exp $ ---- serverconfig.c.orig Mon Sep 24 16:57:04 2007 -+++ serverconfig.c Fri Sep 28 12:06:39 2007 +$OpenBSD: patch-serverconfig_c,v 1.8 2007/10/14 09:09:46 ajacoutot Exp $ +--- serverconfig.c.orig Wed Oct 10 10:53:49 2007 ++++ serverconfig.c Sun Oct 14 11:05:53 2007 @@ -16,7 +16,7 @@ #include "libstr.h" #include "libfs.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-serverconfig_c,v 1.7 2007/09/28 10:12:23 ajacoutot Exp $ #define MAX_LENGTH_CONFIGLINE 512 #define MAX_CACHE_SIZE 50 #define MAX_UPLOAD_SIZE 100 -@@ -216,8 +216,8 @@ t_config *default_config(void) { +@@ -217,8 +217,8 @@ t_config *default_config(void) { #endif config->server_root = NULL;