update to hiawatha 9.1

This commit is contained in:
sthen 2013-04-26 09:15:24 +00:00
parent 7e766295eb
commit abb66513c7
4 changed files with 20 additions and 20 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.35 2013/04/14 20:21:15 sthen Exp $ # $OpenBSD: Makefile,v 1.36 2013/04/26 09:15:24 sthen Exp $
COMMENT= secure webserver COMMENT= secure webserver
DISTNAME= hiawatha-9.0 DISTNAME= hiawatha-9.1
CATEGORIES= www net CATEGORIES= www net
HOMEPAGE= http://www.hiawatha-webserver.org/ HOMEPAGE= http://www.hiawatha-webserver.org/
# GPLv2 # GPLv2 only
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}files/ MASTER_SITES= ${HOMEPAGE}files/
@ -18,10 +18,10 @@ WANTLIB += c pthread xml2 z xslt
LIB_DEPENDS= textproc/libxslt LIB_DEPENDS= textproc/libxslt
CONFIGURE_ARGS= -DWEBROOT_DIR="/var/hiawatha" \ CONFIGURE_ARGS= -DWEBROOT_DIR="/var/hiawatha" \
-DWORK_DIR="/var/db/hiawatha/" \ -DWORK_DIR="/var/db/hiawatha" \
-DCONFIG_DIR="${SYSCONFDIR}/hiawatha/" \ -DCONFIG_DIR="${SYSCONFDIR}/hiawatha" \
-DLOG_DIR="/var/log/hiawatha/" \ -DLOG_DIR="/var/log/hiawatha" \
-DCMAKE_INSTALL_MANDIR="${PREFIX}/man/" \ -DCMAKE_INSTALL_MANDIR="${PREFIX}/man" \
-DENABLE_XSLT=ON -DENABLE_XSLT=ON
NO_TEST= Yes NO_TEST= Yes

View File

@ -1,2 +1,2 @@
SHA256 (hiawatha-9.0.tar.gz) = XkARmvsFCxFzclDAjYmse6dHJkVzikjAaqeZeaGXKfw= SHA256 (hiawatha-9.1.tar.gz) = aZlYwXh1e+ClB0CTwVoTbNQ4dAPmCRHSlSDTYvNFq0g=
SIZE (hiawatha-9.0.tar.gz) = 666274 SIZE (hiawatha-9.1.tar.gz) = 668747

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_hiawatha_1_in,v 1.2 2013/04/14 20:21:15 sthen Exp $ $OpenBSD: patch-man_hiawatha_1_in,v 1.3 2013/04/26 09:15:24 sthen Exp $
--- man/hiawatha.1.in.orig Sat Mar 30 22:41:13 2013 --- man/hiawatha.1.in.orig Tue Apr 16 12:10:26 2013
+++ man/hiawatha.1.in Sun Apr 14 21:05:40 2013 +++ man/hiawatha.1.in Fri Apr 26 10:04:40 2013
@@ -147,12 +147,12 @@ Example: CGIextension = cgi @@ -147,12 +147,12 @@ Example: CGIextension = cgi
.B CGIhandler = <CGI handler>:<extension>[, <extension>, ...] .B CGIhandler = <CGI handler>:<extension>[, <extension>, ...]
Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script. Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script.
@ -34,7 +34,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.2 2013/04/14 20:21:15 sthen Exp $
.TP .TP
.B ServerString = <text> .B ServerString = <text>
The text behind 'Server:' in the HTTP header of a response. Use 'none' to completely remove the Server string from the HTTP header. The text behind 'Server:' in the HTTP header of a response. Use 'none' to completely remove the Server string from the HTTP header.
@@ -557,7 +557,7 @@ Example: Setenv PHPRC = /var/www/conf @@ -562,7 +562,7 @@ Example: Setenv PHPRC = /var/www/conf
.B ShowIndex = yes|no|<XSLT file with full path>|xml .B ShowIndex = yes|no|<XSLT file with full path>|xml
Return a directory listing in HTML format for a directory request when the startfile does not exist. If you want to change the index layout completely, specify the path of a XSLT file. If the XSLT file is not found or 'xml' is used, Hiawatha will output the XML of the directory index. The content of a .hiawatha_index in that directory will be included in the XML. Return a directory listing in HTML format for a directory request when the startfile does not exist. If you want to change the index layout completely, specify the path of a XSLT file. If the XSLT file is not found or 'xml' is used, Hiawatha will output the XML of the directory index. The content of a .hiawatha_index in that directory will be included in the XML.
.br .br
@ -43,7 +43,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.2 2013/04/14 20:21:15 sthen Exp $
.br .br
(requires that Hiawatha was not compiled with -DENABLE_XSLT=off) (requires that Hiawatha was not compiled with -DENABLE_XSLT=off)
@@ -922,7 +922,7 @@ and @@ -924,7 +924,7 @@ and
.B UseGZfile .B UseGZfile
.SH MIMETYPES .SH MIMETYPES
@ -52,7 +52,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.2 2013/04/14 20:21:15 sthen Exp $
.TP .TP
.B <mimetype> <extension> [<extension> ...] .B <mimetype> <extension> [<extension> ...]
Example: image/jpeg jpg jpeg jpe Example: image/jpeg jpg jpeg jpe
@@ -949,13 +949,13 @@ Unban all IP addresses. @@ -951,13 +951,13 @@ Unban all IP addresses.
Clear the internal cache (requires that Hiawatha was not compiled with -DENABLE_CACHE=off). Clear the internal cache (requires that Hiawatha was not compiled with -DENABLE_CACHE=off).
.SH FILES .SH FILES

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_serverconfig_c,v 1.2 2013/04/14 20:21:15 sthen Exp $ $OpenBSD: patch-src_serverconfig_c,v 1.3 2013/04/26 09:15:24 sthen Exp $
--- src/serverconfig.c.orig Sat Mar 30 22:41:13 2013 --- src/serverconfig.c.orig Mon Apr 15 16:57:46 2013
+++ src/serverconfig.c Sun Apr 14 21:04:44 2013 +++ src/serverconfig.c Fri Apr 26 10:04:40 2013
@@ -29,7 +29,7 @@ @@ -28,7 +28,7 @@
#include "libstr.h" #include "libstr.h"
#include "libfs.h" #include "libfs.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-src_serverconfig_c,v 1.2 2013/04/14 20:21:15 sthen Exp $
#define MAX_LENGTH_CONFIGLINE 512 #define MAX_LENGTH_CONFIGLINE 512
#define MAX_CACHE_SIZE 100 #define MAX_CACHE_SIZE 100
#define MAX_UPLOAD_SIZE 100 #define MAX_UPLOAD_SIZE 100
@@ -263,8 +263,8 @@ t_config *default_config(void) { @@ -265,8 +265,8 @@ t_config *default_config(void) {
config->tomahawk_port = NULL; config->tomahawk_port = NULL;
#endif #endif