diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index bfde5196b1f..31e67893ae3 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2007/03/26 06:57:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2007/04/25 13:55:58 ajacoutot Exp $ COMMENT= "secure webserver" -DISTNAME= hiawatha-5.7 +DISTNAME= hiawatha-5.8 CATEGORIES= www net HOMEPAGE= http://hiawatha.leisink.org diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo index 42312f5b15b..4877143c398 100644 --- a/www/hiawatha/distinfo +++ b/www/hiawatha/distinfo @@ -1,5 +1,5 @@ -MD5 (hiawatha-5.7.tar.gz) = XN8zPW8AM2fijFgWtBfRTQ== -RMD160 (hiawatha-5.7.tar.gz) = PulQq3wacNUIWBNuM0NQUXRmDgU= -SHA1 (hiawatha-5.7.tar.gz) = 0O3Xq06e/aD/3V7JC0iGr5LoONc= -SHA256 (hiawatha-5.7.tar.gz) = yi1q/0/Ch7374JGc6qnrNcoh6i0OowEQ9JqWnx0/A+A= -SIZE (hiawatha-5.7.tar.gz) = 193206 +MD5 (hiawatha-5.8.tar.gz) = 2kqYyzZ8BuN0T9OhUlTq8w== +RMD160 (hiawatha-5.8.tar.gz) = VnEa+PsScTOI+eOgd25/0wI6Irc= +SHA1 (hiawatha-5.8.tar.gz) = BKVwnYHIfiwEleYIaGhN4BRLuqA= +SHA256 (hiawatha-5.8.tar.gz) = oH1+d8fFqLE+UbRjnpsbsmoPHqBvvhM+G7IluoVVPHo= +SIZE (hiawatha-5.8.tar.gz) = 196801 diff --git a/www/hiawatha/patches/patch-Makefile_in b/www/hiawatha/patches/patch-Makefile_in index 09d0787af1f..16b6fd6f4f7 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.2 2007/03/26 06:57:56 ajacoutot Exp $ ---- Makefile.in.orig Sat Feb 17 19:22:27 2007 -+++ Makefile.in Sat Feb 17 19:23:01 2007 -@@ -785,9 +785,8 @@ info: info-am +$OpenBSD: patch-Makefile_in,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $ +--- Makefile.in.orig Wed Apr 25 10:20:11 2007 ++++ Makefile.in Wed Apr 25 15:49:45 2007 +@@ -781,9 +781,8 @@ info: info-am info-am: diff --git a/www/hiawatha/patches/patch-doc_cgi-wrapper_1 b/www/hiawatha/patches/patch-doc_cgi-wrapper_1 index bca96676f1d..4a5a1a41110 100644 --- a/www/hiawatha/patches/patch-doc_cgi-wrapper_1 +++ b/www/hiawatha/patches/patch-doc_cgi-wrapper_1 @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_cgi-wrapper_1,v 1.1 2007/03/26 06:57:56 ajacoutot Exp $ ---- doc/cgi-wrapper.1.orig Sat Feb 17 19:16:27 2007 -+++ doc/cgi-wrapper.1 Sat Feb 17 19:17:10 2007 +$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 @@ -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. @@ -9,4 +9,4 @@ $OpenBSD: patch-doc_cgi-wrapper_1,v 1.1 2007/03/26 06:57:56 ajacoutot Exp $ +The CGI-wrapper can be configured via the configuration file !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf. The following options are available: .TP .B CGIhandler = [, , ...] - Normally, only files inside the DocumentRoot will be executed. CGI-handlers are usually not inside this directory. Use this option to specify binaries that are outside the DocumentRoot and the CGI-wrapper is still allowed to execute. + 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. diff --git a/www/hiawatha/patches/patch-doc_hiawatha_1 b/www/hiawatha/patches/patch-doc_hiawatha_1 index 8f2df8da6b7..cf49939251e 100644 --- a/www/hiawatha/patches/patch-doc_hiawatha_1 +++ b/www/hiawatha/patches/patch-doc_hiawatha_1 @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ ---- doc/hiawatha.1.orig Sat Feb 17 19:17:43 2007 -+++ doc/hiawatha.1 Sat Feb 17 19:22:12 2007 -@@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserve +$OpenBSD: patch-doc_hiawatha_1,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $ +--- doc/hiawatha.1.orig Tue Mar 13 15:50:39 2007 ++++ doc/hiawatha.1 Wed Apr 25 15:49:45 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 @@ -10,7 +10,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ .\" ==========[ Configuration files ]========================================== .SH CONFIGURATION FILES -@@ -150,7 +150,7 @@ Example: CGIhandler = /usr/bin/php4-cgi: +@@ -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. .br @@ -19,7 +19,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ .TP .B CommandChannel = , The port and the password for the CommandChannel. You can use telnet to connect to the CommandChannel (localhost:). Type 'help' in the CommandChannel for more information. -@@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawa +@@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawatha/garbage.lo .B Include Include another configurationfile. .br @@ -28,7 +28,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ .TP .B KickOnBan = yes|no Close all other connections that originate from the same IP in case of a ban. -@@ -223,7 +223,7 @@ Default = /var/run/hiawatha.pid, example +@@ -228,7 +228,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 @@ -37,7 +37,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ .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. -@@ -251,7 +251,7 @@ Default = /var/log/hiawatha/system.log, +@@ -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 @@ -46,7 +46,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ .TP .B TimeForCGI =