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

- update to hiawatha-5.10

Browse Source 
note that throttle configuration has been merged into httpd.conf ;
small bug fixes and improvements
This commit is contained in:
ajacoutot 2007-07-06 12:09:12 +00:00
parent 001a3ed6f1
commit 25dfed2b46
6 changed files with 28 additions and 46 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.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

10
www/hiawatha/distinfo
View File

@ -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

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

@ -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:

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

@ -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 = <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
-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 = <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.
.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 = <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.
@@ -256,7 +256,7 @@ Default = /var/log/hiawatha/system.log, example: Syste
.B ThrottleConfig = <configurationfile>
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 = <time>
Maximum time in seconds for a CGI-process to finish its job.
@@ -633,13 +633,13 @@ and
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).
@@ -652,7 +652,7 @@ and
.B UseGZfile
.SH MIMETYPES
@ -54,15 +45,8 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $
+Specify the mimetypes of files in !!SYSCONFDIR!!/hiawatha/mimetypes.conf.
.TP
.B <mimetype> <extension> [<extension> ...]
Example: image/jpeg jpg jpeg
.SH CONTROL UPLOADSPEED
-The uploadspeed of some files can be controled via /etc/hiawatha/throttle.conf.
+The uploadspeed of some files can be controled via !!SYSCONFDIR!!/hiawatha/throttle.conf.
.TP
.B <main-mimetype>/[<sub-mimetype>]:<uploadspeed in kB/s>
Example: audio/mpeg:30 or video/:30
@@ -666,15 +666,15 @@ Will unban all clients.
Example: image/jpeg jpg jpeg jpe
@@ -676,15 +676,15 @@ Will unban all clients.
Will disconnect all clients.
.SH FILES
@ -75,11 +59,11 @@ $OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $
-.B /etc/hiawatha/mime.types
+.B !!SYSCONFDIR!!/hiawatha/mime.types
.br
-.B /etc/hiawatha/throttle.conf
+.B !!SYSCONFDIR!!/hiawatha/throttle.conf
.br
-.B /etc/hiawatha/cgi-wrapper.conf
+.B !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf
.br
-.B /etc/hiawatha/php-fcgi.conf
+.B !!SYSCONFDIR!!/hiawatha/php-fcgi.conf
.SH SEE ALSO

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

@ -1,6 +1,6 @@
$OpenBSD: patch-serverconfig_c,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $
--- serverconfig.c.orig Sat Jun 16 09:31:44 2007
+++ serverconfig.c Mon Jun 18 09:42:06 2007
$OpenBSD: patch-serverconfig_c,v 1.5 2007/07/06 12:09:12 ajacoutot Exp $
--- serverconfig.c.orig Thu Jul 5 15:52:37 2007
+++ serverconfig.c Fri Jul 6 13:46:45 2007
@@ -16,7 +16,7 @@
#include "libstr.h"
#include "libfs.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-serverconfig_c,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $
#define MAX_LENGTH_CONFIGLINE 512
#define MAX_CACHE_SIZE 50
@@ -187,8 +187,8 @@ t_config *default_config(void) {
@@ -190,8 +190,8 @@ t_config *default_config(void) {
#endif
config->server_root = NULL;

4
www/hiawatha/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2007/04/25 13:55:58 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/07/06 12:09:12 ajacoutot Exp $
@newgroup _hiawatha:579
@newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin
@man man/man1/cgi-wrapper.1
@ -25,6 +25,4 @@ share/examples/hiawatha/index.html
share/examples/hiawatha/mimetype.conf
@sample ${SYSCONFDIR}/hiawatha/mimetype.conf
share/examples/hiawatha/php-fcgi.conf
share/examples/hiawatha/throttle.conf
@sample ${SYSCONFDIR}/hiawatha/throttle.conf
@sample /var/log/hiawatha/