Update to hiawatha-6.17.1.
* Main configuration file httpd.conf renamed to hiawatha.conf. * Several crash/bugfixes and improvements.
This commit is contained in:
ajacoutot
parent
16d319382f
commit
76d8a8d45b
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
|
||||
COMMENT= secure webserver
|
||||
|
||||
DISTNAME= hiawatha-6.15
|
||||
DISTNAME= hiawatha-6.17.1
|
||||
CATEGORIES= www net
|
||||
|
||||
HOMEPAGE= http://www.hiawatha-webserver.org/
|
||||
@ -30,7 +30,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--enable-xslt
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/etc/hiawatha/httpd.conf.in \
|
||||
${SUBST_CMD} ${WRKSRC}/etc/hiawatha/hiawatha.conf.in \
|
||||
${WRKSRC}/etc/hiawatha/cgi-wrapper.conf \
|
||||
${WRKSRC}/etc/hiawatha/php-fcgi.conf \
|
||||
${WRKSRC}/doc/hiawatha.1.in
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (hiawatha-6.15.tar.gz) = 0IZGEqaLo8AlGnIfi6kRpQ==
|
||||
RMD160 (hiawatha-6.15.tar.gz) = 4jKEPBcRSC1sEGhJU4evQSN5DeU=
|
||||
SHA1 (hiawatha-6.15.tar.gz) = h2bfjbt7dJhGe3vrE8TPt0AP9QY=
|
||||
SHA256 (hiawatha-6.15.tar.gz) = hrKfWnlwKe/eX+ieDYIRtduASroeulUFkBxiQtgPpV8=
|
||||
SIZE (hiawatha-6.15.tar.gz) = 255844
|
||||
MD5 (hiawatha-6.17.1.tar.gz) = drUqonJ8snNqnRGBUCPrEA==
|
||||
RMD160 (hiawatha-6.17.1.tar.gz) = AdNKvyArg14Iq5wZLfTaHwvNrGQ=
|
||||
SHA1 (hiawatha-6.17.1.tar.gz) = xWGq7eVch325TxhAsrohp1UfdnY=
|
||||
SHA256 (hiawatha-6.17.1.tar.gz) = wbUpQ+8dPkd5nCFENUPdlVgAfEbrcHHrX7Zh1vXAXOs=
|
||||
SIZE (hiawatha-6.17.1.tar.gz) = 264875
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.11 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
--- Makefile.in.orig Sat Jul 4 15:29:14 2009
|
||||
+++ Makefile.in Thu Jul 23 07:48:49 2009
|
||||
@@ -1218,9 +1218,8 @@ info: info-am
|
||||
$OpenBSD: patch-Makefile_in,v 1.12 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
--- Makefile.in.orig Fri Sep 4 14:39:25 2009
|
||||
+++ Makefile.in Tue Sep 22 11:08:50 2009
|
||||
@@ -1219,9 +1219,8 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
|
||||
@ -1,15 +1,6 @@
|
||||
$OpenBSD: patch-doc_hiawatha_1_in,v 1.6 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
--- doc/hiawatha.1.in.orig Thu Jul 2 08:06:18 2009
|
||||
+++ doc/hiawatha.1.in Thu Jul 23 07:48:49 2009
|
||||
@@ -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
|
||||
|
||||
-Hiawatha has been tested and runs perfectly on Linux, FreeBSD, MacOS X and Cygwin.
|
||||
+Hiawatha has been tested and runs perfectly on Linux, {Open,Free}BSD, MacOS X and Cygwin.
|
||||
|
||||
.\" ==========[ Configuration files ]==========================================
|
||||
.SH CONFIGURATION FILES
|
||||
$OpenBSD: patch-doc_hiawatha_1_in,v 1.7 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
--- doc/hiawatha.1.in.orig Tue Sep 22 11:02:23 2009
|
||||
+++ doc/hiawatha.1.in Tue Sep 22 11:04:59 2009
|
||||
@@ -150,12 +150,12 @@ Example: CGIextension = cgi
|
||||
.B CGIhandler = <CGI handler>:<extension>[, <extension>, ...]
|
||||
Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script.
|
||||
@ -39,11 +30,11 @@ $OpenBSD: patch-doc_hiawatha_1_in,v 1.6 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
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
|
||||
+Default = 579:579, example: ServerId = _hiawatha
|
||||
.TP
|
||||
.B ServerRoot = <directory>
|
||||
Rootdirectory for the webserver. Hiawatha will chroot() to this directory after reading the configurationfile and writing the PID file. Cannot be used in combination with UserWebsites.
|
||||
@@ -816,7 +816,7 @@ and
|
||||
@@ -821,7 +821,7 @@ and
|
||||
.B UseGZfile
|
||||
|
||||
.SH MIMETYPES
|
||||
@ -52,15 +43,15 @@ $OpenBSD: patch-doc_hiawatha_1_in,v 1.6 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
.TP
|
||||
.B <mimetype> <extension> [<extension> ...]
|
||||
Example: image/jpeg jpg jpeg jpe
|
||||
@@ -843,15 +843,15 @@ Unban all IP addresses.
|
||||
@@ -848,15 +848,15 @@ Unban all IP addresses.
|
||||
Clear the internal cache (requires that Hiawatha was not compiled with --disable-cache).
|
||||
|
||||
.SH FILES
|
||||
-.B /usr/sbin/hiawatha
|
||||
+.B ${PREFIX}/sbin/hiawatha
|
||||
.br
|
||||
-.B /etc/hiawatha/httpd.conf
|
||||
+.B ${SYSCONFDIR}/hiawatha/httpd.conf
|
||||
-.B /etc/hiawatha/hiawatha.conf
|
||||
+.B ${SYSCONFDIR}/hiawatha/hiawatha.conf
|
||||
.br
|
||||
-.B /etc/hiawatha/mime.types
|
||||
+.B ${SYSCONFDIR}/hiawatha/mime.types
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.6 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
--- etc/hiawatha/cgi-wrapper.conf.orig Thu Jul 23 07:47:20 2009
|
||||
+++ etc/hiawatha/cgi-wrapper.conf Thu Jul 23 07:47:54 2009
|
||||
@@ -5,10 +5,10 @@
|
||||
$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.7 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
--- etc/hiawatha/cgi-wrapper.conf.orig Tue Sep 22 11:05:08 2009
|
||||
+++ etc/hiawatha/cgi-wrapper.conf Tue Sep 22 11:05:44 2009
|
||||
@@ -5,9 +5,9 @@
|
||||
# CGIhandler = /path/to/cgi-handler
|
||||
#
|
||||
#CGIhandler = /usr/bin/ssi-cgi
|
||||
-#CGIhandler = /usr/bin/php-cgi
|
||||
+#CGIhandler = ${LOCALBASE}/bin/php-fastcgi
|
||||
#CGIhandler = /usr/bin/perl
|
||||
-#CGIhandler = /usr/bin/php-cgi
|
||||
-#CGIhandler = /usr/bin/python
|
||||
-#CGIhandler = /usr/bin/ruby
|
||||
+#CGIhandler = ${LOCALBASE}/bin/php-fastcgi
|
||||
+#CGIhandler = ${LOCALBASE}/bin/python
|
||||
+#CGIhandler = ${LOCALBASE}/bin/ruby
|
||||
#CGIhandler = /usr/bin/ssi-cgi
|
||||
|
||||
# Wrap = <wrap-id>;<cgiroot>;<userid>[:<group>]
|
||||
#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.6 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
--- etc/hiawatha/httpd.conf.in.orig Thu Jul 23 07:45:55 2009
|
||||
+++ etc/hiawatha/httpd.conf.in Thu Jul 23 07:48:11 2009
|
||||
$OpenBSD: patch-etc_hiawatha_hiawatha_conf_in,v 1.1 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
--- etc/hiawatha/hiawatha.conf.in.orig Tue Sep 22 11:06:11 2009
|
||||
+++ etc/hiawatha/hiawatha.conf.in Tue Sep 22 11:08:10 2009
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
# GENERAL SETTINGS
|
||||
@ -10,17 +10,20 @@ $OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.6 2009/07/23 05:54:15 ajacoutot E
|
||||
ConnectionsTotal = 150
|
||||
ConnectionsPerIP = 10
|
||||
SystemLogfile = @logdir@/system.log
|
||||
@@ -45,10 +45,10 @@ Binding {
|
||||
@@ -45,11 +45,13 @@ Binding {
|
||||
# tool to start PHP as a FastCGI daemon.
|
||||
#
|
||||
#CGIhandler = /usr/bin/ssi-cgi:shtml
|
||||
-#CGIhandler = /usr/bin/php-cgi:php
|
||||
+#CGIhandler = ${LOCALBASE}/bin/php-fastcgi:php
|
||||
#CGIhandler = /usr/bin/perl:pl
|
||||
-#CGIhandler = /usr/bin/php-cgi:php
|
||||
-#CGIhandler = /usr/bin/python:py
|
||||
-#CGIhandler = /usr/bin/ruby:rb
|
||||
+#CGIhandler = #CGIhandler = ${LOCALBASE}/bin/python:py
|
||||
+#CGIhandler = ${LOCALBASE}/bin/php-fastcgi:php
|
||||
+#CGIhandler = ${LOCALBASE}/bin/python:py
|
||||
+#CGIhandler = ${LOCALBASE}/bin/ruby:rb
|
||||
#CGIhandler = /usr/bin/ssi-cgi:shtml
|
||||
#CGIextension = cgi
|
||||
+#
|
||||
+#CGIwrapper = ${LOCALBASE}/sbin/cgi-wrapper
|
||||
#
|
||||
#FastCGIserver {
|
||||
# FastCGIid = PHP5
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-serverconfig_c,v 1.12 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
--- serverconfig.c.orig Thu Jul 2 08:05:50 2009
|
||||
+++ serverconfig.c Thu Jul 23 07:48:49 2009
|
||||
$OpenBSD: patch-serverconfig_c,v 1.13 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
--- serverconfig.c.orig Wed Aug 19 11:45:11 2009
|
||||
+++ serverconfig.c Tue Sep 22 11:08:50 2009
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "libstr.h"
|
||||
#include "libfs.h"
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-serverconfig_c,v 1.12 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
#define MAX_LENGTH_CONFIGLINE 512
|
||||
#define MAX_CACHE_SIZE 50
|
||||
#define MAX_UPLOAD_SIZE 100
|
||||
@@ -224,8 +224,8 @@ t_config *default_config(void) {
|
||||
@@ -228,8 +228,8 @@ t_config *default_config(void) {
|
||||
#endif
|
||||
|
||||
config->server_root = NULL;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2009/07/23 05:54:15 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2009/09/22 09:29:25 ajacoutot Exp $
|
||||
@newgroup _hiawatha:579
|
||||
@newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin
|
||||
@bin bin/ssi-cgi
|
||||
@ -9,7 +9,7 @@
|
||||
@man man/man1/ssi-cgi.1
|
||||
@man man/man1/wigwam.1
|
||||
@mode u+s
|
||||
sbin/cgi-wrapper
|
||||
@bin sbin/cgi-wrapper
|
||||
@mode
|
||||
@bin sbin/hiawatha
|
||||
sbin/newroot
|
||||
@ -18,10 +18,10 @@ sbin/newroot
|
||||
share/examples/hiawatha/
|
||||
@sample ${SYSCONFDIR}/hiawatha/
|
||||
share/examples/hiawatha/cgi-wrapper.conf
|
||||
@sample ${SYSCONFDIR}/hiawatha/cgi_wrapper.conf
|
||||
share/examples/hiawatha/httpd.conf
|
||||
@sample ${SYSCONFDIR}/hiawatha/httpd.conf
|
||||
@sample ${SYSCONFDIR}/hiawatha/cgi-wrapper.conf
|
||||
@sample /var/hiawatha/
|
||||
share/examples/hiawatha/hiawatha.conf
|
||||
@sample ${SYSCONFDIR}/hiawatha/hiawatha.conf
|
||||
share/examples/hiawatha/index.html
|
||||
@sample /var/hiawatha/index.html
|
||||
share/examples/hiawatha/mimetype.conf
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user