Update to hiawatha 10.3. Change the port to use the ports version of
polarssl. Add myself as MAINTAINER. OK jca@.
This commit is contained in:
juanfra
parent
8b32d54310
commit
a2edba86a5
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2016/08/27 08:08:57 juanfra Exp $
|
||||
# $OpenBSD: Makefile,v 1.46 2016/08/27 08:17:54 juanfra Exp $
|
||||
|
||||
COMMENT = secure webserver
|
||||
DISTNAME = hiawatha-9.15
|
||||
DISTNAME = hiawatha-10.3
|
||||
CATEGORIES = www net
|
||||
|
||||
SHARED_LIBS += mbedcrypto 0.0 # 2.0
|
||||
SHARED_LIBS += mbedtls 1.0 # 1.3
|
||||
SHARED_LIBS += mbedx509 0.0 # 2.0
|
||||
HOMEPAGE = https://www.hiawatha-webserver.org/
|
||||
|
||||
HOMEPAGE = http://www.hiawatha-webserver.org/
|
||||
MAINTAINER = Juan Francisco Cantero Hurtado <juanfra@openbsd.org>
|
||||
|
||||
# GPLv2 only
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
@ -17,9 +15,10 @@ MASTER_SITES = ${HOMEPAGE}files/
|
||||
|
||||
MODULES = devel/cmake
|
||||
|
||||
WANTLIB += c pthread xml2 z xslt
|
||||
WANTLIB += c mbedcrypto mbedtls mbedx509 pthread xml2 xslt z
|
||||
|
||||
LIB_DEPENDS = textproc/libxslt
|
||||
LIB_DEPENDS = security/polarssl>=2.2.1p0 \
|
||||
textproc/libxslt
|
||||
|
||||
CONFIGURE_ARGS = -DWEBROOT_DIR="/var/hiawatha" \
|
||||
-DWORK_DIR="/var/db/hiawatha" \
|
||||
@ -27,7 +26,11 @@ CONFIGURE_ARGS = -DWEBROOT_DIR="/var/hiawatha" \
|
||||
-DLOG_DIR="/var/log/hiawatha" \
|
||||
-DCMAKE_INSTALL_MANDIR="${PREFIX}/man" \
|
||||
-DENABLE_XSLT=ON \
|
||||
-DPID_DIR="/var/run"
|
||||
-DPID_DIR="/var/run" \
|
||||
-DUSE_SYSTEM_MBEDTLS=ON
|
||||
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (hiawatha-9.15.tar.gz) = 6SUhM6ERQJXRqaiRRLiIKO47l1T0Nb2IJw979ETdlCE=
|
||||
SIZE (hiawatha-9.15.tar.gz) = 869922
|
||||
SHA256 (hiawatha-10.3.tar.gz) = mdGF+xa7GrcGckSU08rIZGTxSF7UsP/wmhkuym2l/44=
|
||||
SIZE (hiawatha-10.3.tar.gz) = 897607
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-config_hiawatha_conf_in,v 1.3 2015/05/02 15:42:02 ajacoutot Exp $
|
||||
--- config/hiawatha.conf.in.orig Sat Jan 17 10:53:00 2015
|
||||
+++ config/hiawatha.conf.in Sat May 2 17:36:56 2015
|
||||
$OpenBSD: patch-config_hiawatha_conf_in,v 1.4 2016/08/27 08:17:54 juanfra Exp $
|
||||
--- config/hiawatha.conf.in.orig Mon Jan 18 21:56:23 2016
|
||||
+++ config/hiawatha.conf.in Sat Aug 27 01:58:47 2016
|
||||
@@ -12,6 +12,7 @@
|
||||
# GENERAL SETTINGS
|
||||
#
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-config_hiawatha_conf_in,v 1.3 2015/05/02 15:42:02 ajacoutot Exp
|
||||
ConnectionsTotal = 1000
|
||||
ConnectionsPerIP = 25
|
||||
SystemLogfile = @LOG_DIR@/system.log
|
||||
@@ -50,12 +51,13 @@ Binding {
|
||||
@@ -47,12 +48,13 @@ Binding {
|
||||
# COMMON GATEWAY INTERFACE (CGI) SETTINGS
|
||||
# These settings can be used to run CGI applications.
|
||||
#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-man_hiawatha_1_in,v 1.6 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
--- man/hiawatha.1.in.orig Mon Oct 12 21:03:06 2015
|
||||
+++ man/hiawatha.1.in Tue Nov 17 15:33:02 2015
|
||||
$OpenBSD: patch-man_hiawatha_1_in,v 1.7 2016/08/27 08:17:54 juanfra Exp $
|
||||
--- man/hiawatha.1.in.orig Sun Jun 5 10:26:13 2016
|
||||
+++ man/hiawatha.1.in Sat Aug 27 01:58:47 2016
|
||||
@@ -158,12 +158,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.
|
||||
@ -25,7 +25,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.6 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
.TP
|
||||
.B KickOnBan = yes|no
|
||||
Close all other connections that originate from the same IP in case of a ban.
|
||||
@@ -293,7 +293,7 @@ Example: RequestLimitMask = deny 192.168.0.1
|
||||
@@ -296,7 +296,7 @@ Example: RequestLimitMask = deny 192.168.0.1
|
||||
.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 of user root are not allowed here. The userid or groupid can also be a name.
|
||||
.br
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.6 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
.TP
|
||||
.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.
|
||||
@@ -631,7 +631,7 @@ Example: ScriptAlias = /script.cgi:/usr/lib/script.cgi
|
||||
@@ -635,7 +635,7 @@ Example: ScriptAlias = /script.cgi:/usr/lib/script.cgi
|
||||
.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. An example of the XML output can be found in extra/index.xml inside the source package.
|
||||
.br
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.6 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
.br
|
||||
|
||||
(requires that Hiawatha was not compiled with -DENABLE_XSLT=off)
|
||||
@@ -1011,7 +1011,7 @@ and
|
||||
@@ -1021,7 +1021,7 @@ and
|
||||
(only valid in the root directory of a website)
|
||||
|
||||
.SH MIMETYPES
|
||||
@ -52,7 +52,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.6 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
.TP
|
||||
.B <mimetype> <extension> [<extension> ...]
|
||||
Example: image/jpeg jpg jpeg jpe
|
||||
@@ -1038,13 +1038,13 @@ Unban all IP addresses.
|
||||
@@ -1041,13 +1041,13 @@ Unban all IP addresses.
|
||||
Clear the internal cache (requires that Hiawatha was not compiled with -DENABLE_CACHE=off).
|
||||
|
||||
.SH FILES
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_serverconfig_c,v 1.7 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
--- src/serverconfig.c.orig Tue Oct 13 09:02:18 2015
|
||||
+++ src/serverconfig.c Tue Nov 17 15:33:02 2015
|
||||
$OpenBSD: patch-src_serverconfig_c,v 1.8 2016/08/27 08:17:54 juanfra Exp $
|
||||
--- src/serverconfig.c.orig Thu Jun 2 09:50:25 2016
|
||||
+++ src/serverconfig.c Sat Aug 27 01:58:47 2016
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "libfs.h"
|
||||
#include "memdbg.h"
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_serverconfig_c,v 1.7 2015/11/17 14:34:43 ajacoutot Exp $
|
||||
#define MAX_LENGTH_CONFIGLINE 1024
|
||||
#define MAX_CACHE_SIZE 1024
|
||||
#define MAX_UPLOAD_SIZE 2047
|
||||
@@ -285,8 +285,8 @@ t_config *default_config(void) {
|
||||
@@ -290,8 +290,8 @@ t_config *default_config(void) {
|
||||
config->tomahawk_port = NULL;
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.17 2015/08/14 09:59:06 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.18 2016/08/27 08:17:54 juanfra Exp $
|
||||
@newgroup _hiawatha:579
|
||||
@newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin
|
||||
@bin bin/ssi-cgi
|
||||
lib/hiawatha/
|
||||
@lib lib/hiawatha/libmbedcrypto.so.${LIBmbedcrypto_VERSION}
|
||||
@lib lib/hiawatha/libmbedtls.so.${LIBmbedtls_VERSION}
|
||||
@lib lib/hiawatha/libmbedx509.so.${LIBmbedx509_VERSION}
|
||||
@man man/man1/cgi-wrapper.1
|
||||
@man man/man1/hiawatha.1
|
||||
@man man/man1/ssi-cgi.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user