Hiawatha updated to the version 10.3. Disable the internal copy of polarssl. Tested with http and https.
You will need to apply my previous patch to polarssl before of test this update. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/www/hiawatha/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- Makefile 17 Nov 2015 14:34:43 -0000 1.44 +++ Makefile 27 Aug 2016 02:34:09 -0000 @@ -1,35 +1,38 @@ # $OpenBSD: Makefile,v 1.44 2015/11/17 14:34:43 ajacoutot Exp $ -COMMENT= secure webserver -DISTNAME = hiawatha-9.15 -CATEGORIES= www net - -SHARED_LIBS += mbedcrypto 0.0 # 2.0 -SHARED_LIBS += mbedtls 1.0 # 1.3 -SHARED_LIBS += mbedx509 0.0 # 2.0 +COMMENT = secure webserver +DISTNAME = hiawatha-10.3 +CATEGORIES = www net -HOMEPAGE= http://www.hiawatha-webserver.org/ +HOMEPAGE = https://www.hiawatha-webserver.org/ + +MAINTAINER = Juan Francisco Cantero Hurtado <juan...@openbsd.org> # GPLv2 only -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM = Yes + +MASTER_SITES = ${HOMEPAGE}files/ -MASTER_SITES= ${HOMEPAGE}files/ +MODULES = devel/cmake -MODULES= devel/cmake +WANTLIB += c mbedcrypto mbedtls mbedx509 pthread xml2 xslt z -WANTLIB += c pthread xml2 z xslt +LIB_DEPENDS = security/polarssl \ + textproc/libxslt -LIB_DEPENDS= textproc/libxslt +CONFIGURE_ARGS = -DWEBROOT_DIR="/var/hiawatha" \ + -DWORK_DIR="/var/db/hiawatha" \ + -DCONFIG_DIR="${SYSCONFDIR}/hiawatha" \ + -DLOG_DIR="/var/log/hiawatha" \ + -DCMAKE_INSTALL_MANDIR="${PREFIX}/man" \ + -DENABLE_XSLT=ON \ + -DPID_DIR="/var/run" \ + -DUSE_SYSTEM_MBEDTLS=ON -CONFIGURE_ARGS= -DWEBROOT_DIR="/var/hiawatha" \ - -DWORK_DIR="/var/db/hiawatha" \ - -DCONFIG_DIR="${SYSCONFDIR}/hiawatha" \ - -DLOG_DIR="/var/log/hiawatha" \ - -DCMAKE_INSTALL_MANDIR="${PREFIX}/man" \ - -DENABLE_XSLT=ON \ - -DPID_DIR="/var/run" +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" -NO_TEST= Yes +NO_TEST = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/config/hiawatha.conf.in \ Index: distinfo =================================================================== RCS file: /cvs/ports/www/hiawatha/distinfo,v retrieving revision 1.36 diff -u -p -r1.36 distinfo --- distinfo 17 Nov 2015 14:34:43 -0000 1.36 +++ distinfo 27 Aug 2016 02:34:09 -0000 @@ -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 Index: patches/patch-config_hiawatha_conf_in =================================================================== RCS file: /cvs/ports/www/hiawatha/patches/patch-config_hiawatha_conf_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_hiawatha_conf_in --- patches/patch-config_hiawatha_conf_in 2 May 2015 15:42:02 -0000 1.3 +++ patches/patch-config_hiawatha_conf_in 27 Aug 2016 02:34:09 -0000 @@ -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 +--- 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, 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. # Index: patches/patch-man_hiawatha_1_in =================================================================== RCS file: /cvs/ports/www/hiawatha/patches/patch-man_hiawatha_1_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-man_hiawatha_1_in --- patches/patch-man_hiawatha_1_in 17 Nov 2015 14:34:43 -0000 1.6 +++ patches/patch-man_hiawatha_1_in 27 Aug 2016 02:34:09 -0000 @@ -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 +--- 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 .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 .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 .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 .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 Index: patches/patch-src_serverconfig_c =================================================================== RCS file: /cvs/ports/www/hiawatha/patches/patch-src_serverconfig_c,v retrieving revision 1.7 diff -u -p -r1.7 patch-src_serverconfig_c --- patches/patch-src_serverconfig_c 17 Nov 2015 14:34:43 -0000 1.7 +++ patches/patch-src_serverconfig_c 27 Aug 2016 02:34:09 -0000 @@ -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 +--- 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 #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 Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/www/hiawatha/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- pkg/DESCR 31 Dec 2006 19:15:51 -0000 1.2 +++ pkg/DESCR 27 Aug 2016 02:34:09 -0000 @@ -1,6 +1,7 @@ Hiawatha is a webserver that has been written with 'being secure' as its main goal. Hiawatha has many security features that no other webserver has. + Hiawatha does not have all the fancy features, but it is fast and really easy to configure. Rootjail, run CGIs under any uid/gid you want, prevention of SQL injection and cross-site scripting, banning of clients Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/hiawatha/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 14 Aug 2015 09:59:06 -0000 1.17 +++ pkg/PLIST 27 Aug 2016 02:34:09 -0000 @@ -2,10 +2,6 @@ @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
