cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to hiawatha-5.8 (mainly bugfixes and improvements)

Browse Source 
- regen patches while here
This commit is contained in:
ajacoutot 2007-04-25 13:55:58 +00:00
parent dd37bcbff2
commit d1c0d51d44
7 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/hiawatha/Makefile
View File

@ -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" COMMENT= "secure webserver"
DISTNAME= hiawatha-5.7 DISTNAME= hiawatha-5.8
CATEGORIES= www net CATEGORIES= www net
HOMEPAGE= http://hiawatha.leisink.org HOMEPAGE= http://hiawatha.leisink.org

10
www/hiawatha/distinfo
View File

@ -1,5 +1,5 @@
MD5 (hiawatha-5.7.tar.gz) = XN8zPW8AM2fijFgWtBfRTQ== MD5 (hiawatha-5.8.tar.gz) = 2kqYyzZ8BuN0T9OhUlTq8w==
RMD160 (hiawatha-5.7.tar.gz) = PulQq3wacNUIWBNuM0NQUXRmDgU= RMD160 (hiawatha-5.8.tar.gz) = VnEa+PsScTOI+eOgd25/0wI6Irc=
SHA1 (hiawatha-5.7.tar.gz) = 0O3Xq06e/aD/3V7JC0iGr5LoONc= SHA1 (hiawatha-5.8.tar.gz) = BKVwnYHIfiwEleYIaGhN4BRLuqA=
SHA256 (hiawatha-5.7.tar.gz) = yi1q/0/Ch7374JGc6qnrNcoh6i0OowEQ9JqWnx0/A+A= SHA256 (hiawatha-5.8.tar.gz) = oH1+d8fFqLE+UbRjnpsbsmoPHqBvvhM+G7IluoVVPHo=
SIZE (hiawatha-5.7.tar.gz) = 193206 SIZE (hiawatha-5.8.tar.gz) = 196801

8
www/hiawatha/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ $OpenBSD: patch-Makefile_in,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $
--- Makefile.in.orig Sat Feb 17 19:22:27 2007 --- Makefile.in.orig Wed Apr 25 10:20:11 2007
+++ Makefile.in Sat Feb 17 19:23:01 2007 +++ Makefile.in Wed Apr 25 15:49:45 2007
@@ -785,9 +785,8 @@ info: info-am @@ -781,9 +781,8 @@ info: info-am
info-am: info-am:

8
www/hiawatha/patches/patch-doc_cgi-wrapper_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_cgi-wrapper_1,v 1.1 2007/03/26 06:57:56 ajacoutot Exp $ $OpenBSD: patch-doc_cgi-wrapper_1,v 1.2 2007/04/25 13:55:58 ajacoutot Exp $
--- doc/cgi-wrapper.1.orig Sat Feb 17 19:16:27 2007 --- doc/cgi-wrapper.1.orig Wed Mar 7 00:33:48 2007
+++ doc/cgi-wrapper.1 Sat Feb 17 19:17:10 2007 +++ doc/cgi-wrapper.1 Wed Apr 25 15:49:45 2007
@@ -11,7 +11,7 @@ cgi-wrapper @@ -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. 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: +The CGI-wrapper can be configured via the configuration file !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf. The following options are available:
.TP .TP
.B CGIhandler = <CGI handler>[, <CGI handler>, ...] .B CGIhandler = <CGI handler>[, <CGI handler>, ...]
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.

20
www/hiawatha/patches/patch-doc_hiawatha_1
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ $OpenBSD: patch-doc_hiawatha_1,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $
--- doc/hiawatha.1.orig Sat Feb 17 19:17:43 2007 --- doc/hiawatha.1.orig Tue Mar 13 15:50:39 2007
+++ doc/hiawatha.1 Sat Feb 17 19:22:12 2007 +++ doc/hiawatha.1 Wed Apr 25 15:49:45 2007
@@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserve @@ -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. 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 .br
@ -10,7 +10,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.\" ==========[ Configuration files ]========================================== .\" ==========[ Configuration files ]==========================================
.SH 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 = <CGI wrapper> .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. Specify the wrapper for CGI processes. A secure CGI wrapper is included in the Hiawatha package. See cgi-wrapper(1) for more information.
.br .br
@ -19,7 +19,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.TP .TP
.B CommandChannel = <portnumber>,<MD5 hash of password> .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. 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/hiawa @@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawatha/garbage.lo
.B Include <filename> .B Include <filename>
Include another configurationfile. Include another configurationfile.
.br .br
@ -28,7 +28,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.TP .TP
.B KickOnBan = yes|no .B KickOnBan = yes|no
Close all other connections that originate from the same IP in case of a ban. 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 = <userid>|<userid>:<groupid>[,<groupid>, ...] .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 '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 'root' are not allowed here.
.br .br
@ -37,7 +37,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.TP .TP
.B ServerKey = <SSL certificate file> .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 the BINDING section. 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 = <configurationfile> .B ThrottleConfig = <configurationfile>
The location of the throttle configurationfile. It the path is omitted, Hiawatha's configurationfile directory will be used. The location of the throttle configurationfile. It the path is omitted, Hiawatha's configurationfile directory will be used.
.br .br
@ -46,7 +46,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.TP .TP
.B TimeForCGI = <time> .B TimeForCGI = <time>
Maximum time in seconds for a CGI-process to finish its job. Maximum time in seconds for a CGI-process to finish its job.
@@ -580,13 +580,13 @@ and @@ -595,13 +595,13 @@ and
.B UseGZfile .B UseGZfile
.SH MIMETYPES .SH MIMETYPES
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
.TP .TP
.B <main-mimetype>/[<sub-mimetype>]:<uploadspeed in kB/s> .B <main-mimetype>/[<sub-mimetype>]:<uploadspeed in kB/s>
Example: audio/mpeg:30 or video/:30 Example: audio/mpeg:30 or video/:30
@@ -613,15 +613,15 @@ Will unban all clients. @@ -628,15 +628,15 @@ Will unban all clients.
Will disconnect all clients. Will disconnect all clients.
.SH FILES .SH FILES

8
www/hiawatha/patches/patch-serverconfig_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-serverconfig_c,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ $OpenBSD: patch-serverconfig_c,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $
--- serverconfig.c.orig Sat Feb 17 19:30:11 2007 --- serverconfig.c.orig Wed Apr 25 10:19:10 2007
+++ serverconfig.c Sat Feb 17 19:31:38 2007 +++ serverconfig.c Wed Apr 25 15:49:45 2007
@@ -13,7 +13,7 @@ @@ -15,7 +15,7 @@
#include "libstr.h" #include "libstr.h"
#include "libfs.h" #include "libfs.h"

3
www/hiawatha/pkg/PLIST
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $
@newgroup _hiawatha:579 @newgroup _hiawatha:579
@newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin @newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin
@man man/man1/cgi-wrapper.1 @man man/man1/cgi-wrapper.1
@man man/man1/hiawatha.1 @man man/man1/hiawatha.1
@man man/man1/newroot.1
@man man/man1/php-fcgi.1 @man man/man1/php-fcgi.1
@man man/man1/wigwam.1 @man man/man1/wigwam.1
@mode u+s @mode u+s