pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/hiawatha
Module Name: pkgsrc
Committed By: hauke
Date: Mon Apr 15 14:52:34 UTC 2024
Modified Files:
pkgsrc/www/hiawatha: DESCR Makefile PLIST distinfo
pkgsrc/www/hiawatha/files: hiawatha.sh
Added Files:
pkgsrc/www/hiawatha: options.mk
pkgsrc/www/hiawatha/patches: patch-CMakeLists.txt
patch-config_hiawatha.conf.in
patch-extra_letsencrypt_letsencrypt.conf.in
Removed Files:
pkgsrc/www/hiawatha: MESSAGE
pkgsrc/www/hiawatha/files: hiawatha.cfg index.xml index.xsl
Log Message:
Update www/hiawatha to v11.5
Given a version jump of *two* orders of magnitude, changes are too
many to enumerate.
This package integrates some of the ideas in ktnb@'s wip/hiawatha, in
particular statically linking the included mbedtls.
See the discussion at
<http://mail-index.netbsd.org/tech-pkg/2024/03/23/msg029036.html> --
built-in letsencrypt with its php dependency is an option.
Also: Upstream is not going away, but just changing its domain name.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/hiawatha/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/www/hiawatha/MESSAGE
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/hiawatha/PLIST \
pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/hiawatha/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/hiawatha/files/hiawatha.cfg \
pkgsrc/www/hiawatha/files/index.xml pkgsrc/www/hiawatha/files/index.xsl
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/hiawatha/files/hiawatha.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt \
pkgsrc/www/hiawatha/patches/patch-config_hiawatha.conf.in \
pkgsrc/www/hiawatha/patches/patch-extra_letsencrypt_letsencrypt.conf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/hiawatha/DESCR
diff -u pkgsrc/www/hiawatha/DESCR:1.1 pkgsrc/www/hiawatha/DESCR:1.2
--- pkgsrc/www/hiawatha/DESCR:1.1 Thu Nov 1 02:16:49 2001
+++ pkgsrc/www/hiawatha/DESCR Mon Apr 15 14:52:33 2024
@@ -1,3 +1,12 @@
-Hiawatha is a standalone webserver with build-in support for XML,
-XSL, XSLScript, HTTP, and CGI (GET and POST). Hiawatha is written
-in Java and it is Open Source ( and 100% free ).
+Hiawatha is an advanced and secure webserver for Unix.
+
+Hiawatha offers protection against SQL injections, Cross-site
+Scripting (XSS), Cross-site Request Forgery (CSRF/XSRF) and DoS
+attacks.
+
+Hiawatha supports the FastCGI protocol, including load balancing, for
+improved CGI performance.
+
+Via Hiawatha's built-in reverse proxy, you can easily integrate other
+web solutions or use Hiawatha as an application firewall to protect
+other webservers.
Index: pkgsrc/www/hiawatha/Makefile
diff -u pkgsrc/www/hiawatha/Makefile:1.32 pkgsrc/www/hiawatha/Makefile:1.33
--- pkgsrc/www/hiawatha/Makefile:1.32 Tue Oct 25 15:59:05 2016
+++ pkgsrc/www/hiawatha/Makefile Mon Apr 15 14:52:33 2024
@@ -1,57 +1,135 @@
-# $NetBSD: Makefile,v 1.32 2016/10/25 15:59:05 maya Exp $
-#
+# $NetBSD: Makefile,v 1.33 2024/04/15 14:52:33 hauke Exp $
-DISTNAME= hiawatha
-PKGNAME= hiawatha-0.1
-PKGREVISION= 5
-CATEGORIES= textproc www
-MASTER_SITES= ${HOMEPAGE} ${MASTER_SITE_BACKUP}
-EXTRACT_SUFX= .zip
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- sitedrivenby.gif
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.hiawatha-webserver.org/
-COMMENT= Barebones HTTP server with XML and XSLT support (and more)
-
-DEPENDS+= saxon-[0-9]*:../../textproc/saxon
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-WRKSRC= ${WRKDIR}
-USE_JAVA= run
-USE_TOOLS+= pax
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-RCD_SCRIPTS= hiawatha
-
-EGDIR= ${PREFIX}/share/examples/hiawatha
-CONF_FILES= ${EGDIR}/hiawatha.cfg ${PKG_SYSCONFDIR}/hiawatha.cfg
-
-OWN_DIRS= /var/spool/hiawatha
-
-post-extract:
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" \
- < ${FILESDIR}/hiawatha.cfg > ${WRKDIR}/hiawatha.cfg
- ${CHMOD} -R go-w ${WRKSRC}/[A-Za-z0-9]*
-
-INSTALLATION_DIRS= lib/java/hiawatha ${EGDIR}/WEBROOT/images
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/hiawatha.jar ${DESTDIR}${PREFIX}/lib/java/hiawatha
- ${INSTALL_DATA} ${WRKSRC}/xsls.jar ${DESTDIR}${PREFIX}/lib/java/hiawatha
- ${INSTALL_DATA} ${WRKSRC}/simple.cfg ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/SeeAlso/pault_com.cfg ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${DESTDIR}${EGDIR}
- cd ${WRKSRC} && chmod -R go-w WEBROOT
- cd ${WRKSRC} && pax -s '/^WEBROOT/pault.com/' -rw WEBROOT ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/index.xml ${DESTDIR}${EGDIR}/WEBROOT
- ${INSTALL_DATA} ${FILESDIR}/index.xsl ${DESTDIR}${EGDIR}/WEBROOT
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/sitedrivenby.gif ${DESTDIR}${EGDIR}/WEBROOT/images
+PKGNAME= hiawatha-${PKGVER}
+DISTNAME= hiawatha-v${PKGVER}
+PKGVER= 11.5
+CATEGORIES= www
+MASTER_SITES= ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
+EXTRACT_SUFX= .tar.gz
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER= hauke%NetBSD.org@localhost
+HOMEPAGE= https://hiawatha.leisink.net/
+COMMENT= Advanced and secure webserver
+LICENSE= gnu-gpl-v2
+
+HIAWATHA_CGIDIR= libexec/ssi-cgi
+HIAWATHA_DATADIR= ${VARBASE}/db/hiawatha
+HIAWATHA_LOGDIR= ${VARBASE}/log/hiawatha
+HIAWATHA_PIDDIR= ${VARBASE}/run
+HIAWATHA_WEBROOT= ${VARBASE}/hiawatha
+
+BUILD_DEFS+= VARBASE
+
+USE_CMAKE= yes
+
+CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=${PREFIX}/${HIAWATHA_CGIDIR}
+CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
+CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+= -DWORK_DIR=${VARBASE}/db/${PKGBASE}
+CMAKE_ARGS+= -DLOG_DIR=${HIAWATHA_LOGDIR}
+CMAKE_ARGS+= -DPID_DIR=${HIAWATHA_PIDDIR}
+CMAKE_ARGS+= -DWEBROOT_DIR=${HIAWATHA_WEBROOT}
+CMAKE_ARGS+= -DWORK_DIR=${HIAWATHA_DATADIR}
+CMAKE_ARGS+= -DCONFIG_DIR=${PKG_SYSCONFDIR}
+
+.include "options.mk"
+
+HIAWATHA_USER?= hiawatha
+HIAWATHA_GROUP?= hiawatha
+
+PKG_USERS_VARS+= HIAWATHA_USER
+PKG_GROUPS_VARS+= HIAWATHA_GROUP
+PKG_GROUPS= ${HIAWATHA_GROUP}
+PKG_USERS= ${HIAWATHA_USER}:${HIAWATHA_GROUP}
+
+PKG_GECOS.${HIAWATHA_USER}= HIAWATHA web server user
+PKG_HOME.${HIAWATHA_USER}= ${HIAWATHA_DATADIR}
+PKG_SHELL.${HIAWATHA_USER}= ${NOLOGIN}
+
+PKG_SYSCONFSUBDIR= hiawatha
+
+RCD_SCRIPTS= hiawatha
+
+EGDIR= share/examples/hiawatha
+CONFIG_FILES= hiawatha.conf mimetype.conf cgi-wrapper.conf
+
+INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8
+INSTALLATION_DIRS+= ${HIAWATHA_CGIDIR}
+INSTALLATION_DIRS+= share/examples/hiawatha/conf
+INSTALLATION_DIRS+= share/examples/hiawatha/html
+
+OWN_DIRS= ${HIAWATHA_LOGDIR} ${HIAWATHA_WEBROOT}
+OWN_DIRS_PERMS+= ${HIAWATHA_DATADIR} ${HIAWATHA_USER} \
+ ${HIAWATHA_GROUP} 0750
+
+SUBST_CLASSES+= path
+SUBST_STAGE.path= pre-configure
+SUBST_MESSAGE.path= Fixing PREFIX path.
+SUBST_FILES.path= man/hiawatha.1.in man/cgi-wrapper.1.in
+SUBST_FILES.path+= config/cgi-wrapper.conf config/hiawatha.conf.in
+SUBST_SED.path= -e 's,/usr,${PREFIX},g'
+
+SUBST_CLASSES+= uid
+SUBST_STAGE.uid= pre-configure
+SUBST_MESSAGE.uid= Configure Hiawatha user & group
+SUBST_FILES.uid= config/hiawatha.conf.in
+SUBST_VARS.uid= HIAWATHA_USER HIAWATHA_GROUP
+
+# mbedtls-private
+PRINT_PLIST_AWK+= { gsub(/^lib\/hiawatha\/libmbed.+$$/, "$${PLIST.mbedtls-private}&"); }
+# urltoolkit
+PRINT_PLIST_AWK+= { gsub(/^${EGDIR:S/\//\\\//g}\/toolkit.conf$$/, "$${PLIST.urltoolkit}&"); }
+# xslt
+PRINT_PLIST_AWK+= { gsub(/^${EGDIR:S/\//\\\//g}\/error.xslt$$/, "$${PLIST.xslt}&"); }
+PRINT_PLIST_AWK+= { gsub(/^${EGDIR:S/\//\\\//g}\/index.xslt$$/, "$${PLIST.xslt}&"); }
+# letsencrypt
+PRINT_PLIST_AWK+= { gsub(/^lib\/hiawatha\/letsencrypt\/.+$$/, "$${PLIST.letsencrypt}&"); }
+PRINT_PLIST_AWK+= { gsub(/^man\/man1\/lefh\.1$$/, "$${PLIST.letsencrypt}&"); }
+PRINT_PLIST_AWK+= { gsub(/^sbin\/lefh$$/, "$${PLIST.letsencrypt}&"); }
+PRINT_PLIST_AWK+= { gsub(/^${EGDIR:S/\//\\\//g}\/letsencrypt.conf$$/, "$${PLIST.letsencrypt}&"); }
+
+.for f in ${CONFIG_FILES}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+.if !empty(PKG_OPTIONS:Mletsencrypt)
+CONF_FILES+= ${EGDIR}/letsencrypt.conf ${PKG_SYSCONFDIR}/letsencrypt.conf
+.endif
+CONF_FILES+= ${EGDIR}/index.html.sample ${HIAWATHA_WEBROOT}/index.html
+
+.include "../../mk/bsd.prefs.mk"
+
+post-install:
+.if !empty(PKG_OPTIONS:Mmbedtls-private)
+ rm -r ${DESTDIR}${PREFIX}/include
+ rm ${DESTDIR}${PREFIX}/lib/hiawatha/*.a
+.endif
+.if empty(PKG_OPTIONS:Mletsencrypt)
+ rm -r ${DESTDIR}${PREFIX}/lib/hiawatha
+ rm ${DESTDIR}${PREFIX}/sbin/lefh
+ rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lefh.1
+.else
+ ${INSTALL_DATA} ${WRKSRC}/letsencrypt.conf \
+ ${DESTDIR}${PREFIX}/${EGDIR}/letsencrypt.conf
+.endif
+.for f in ${CONFIG_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/config/${f} ${DESTDIR}${PREFIX}/${EGDIR}/${f}
+.endfor
+.if !empty(PKG_OPTIONS:Murltoolkit)
+ ${INSTALL_DATA} ${WRKSRC}/config/toolkit.conf \
+ ${DESTDIR}${PREFIX}/${EGDIR}/toolkit.conf
+.endif
+.if !empty(PKG_OPTIONS:Mxslt)
+ ${INSTALL_DATA} ${WRKSRC}/config/error.xslt \
+ ${DESTDIR}${PREFIX}/${EGDIR}/error.xslt
+ ${INSTALL_DATA} ${WRKSRC}/config/index.xslt \
+ ${DESTDIR}${PREFIX}/${EGDIR}/index.xslt
+.endif
+ ${INSTALL_DATA} ${WRKSRC}/extra/index.html \
+ ${DESTDIR}${PREFIX}/${EGDIR}/index.html.sample
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/hiawatha/PLIST
diff -u pkgsrc/www/hiawatha/PLIST:1.6 pkgsrc/www/hiawatha/PLIST:1.7
--- pkgsrc/www/hiawatha/PLIST:1.6 Mon Jan 1 22:30:02 2018
+++ pkgsrc/www/hiawatha/PLIST Mon Apr 15 14:52:33 2024
@@ -1,79 +1,32 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:30:02 rillig Exp $
-lib/java/hiawatha/hiawatha.jar
-lib/java/hiawatha/xsls.jar
-share/examples/hiawatha/WEBROOT/images/sitedrivenby.gif
-share/examples/hiawatha/WEBROOT/index.xml
-share/examples/hiawatha/WEBROOT/index.xsl
-share/examples/hiawatha/hiawatha.cfg
-share/examples/hiawatha/pault.com/css/home-page.css
-share/examples/hiawatha/pault.com/css/resume.css
-share/examples/hiawatha/pault.com/css/xslscript.css
-share/examples/hiawatha/pault.com/images/connector.gif
-share/examples/hiawatha/pault.com/images/dtdgen1.gif
-share/examples/hiawatha/pault.com/images/dtdgen2.gif
-share/examples/hiawatha/pault.com/images/fish.gif
-share/examples/hiawatha/pault.com/images/hiawatha.gif
-share/examples/hiawatha/pault.com/images/hiawatha.jpeg
-share/examples/hiawatha/pault.com/images/kay.gif
-share/examples/hiawatha/pault.com/images/pagebg.gif
-share/examples/hiawatha/pault.com/images/paultlogo.gif
-share/examples/hiawatha/pault.com/images/pxsl.gif
-share/examples/hiawatha/pault.com/images/resume.jpg
-share/examples/hiawatha/pault.com/images/some2xml.gif
-share/examples/hiawatha/pault.com/images/ux.gif
-share/examples/hiawatha/pault.com/images/w3cval.gif
-share/examples/hiawatha/pault.com/index-plain.xsls
-share/examples/hiawatha/pault.com/index.xml
-share/examples/hiawatha/pault.com/index.xsls
-share/examples/hiawatha/pault.com/prod/Hiawatha/common.xsls
-share/examples/hiawatha/pault.com/prod/Hiawatha/index-plain.xsls
-share/examples/hiawatha/pault.com/prod/Hiawatha/index.xml
-share/examples/hiawatha/pault.com/prod/Hiawatha/index.xsls
-share/examples/hiawatha/pault.com/prod/Ux/index-plain.xsls
-share/examples/hiawatha/pault.com/prod/Ux/index.xml
-share/examples/hiawatha/pault.com/prod/Ux/index.xsls
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/aliases.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/commands.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/concepts.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/history.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/index.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/index.xsls
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/kernel.xml
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/links.xsls
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/master.xsl
-share/examples/hiawatha/pault.com/prod/Ux/uxdoc/ux-beans.xml
-share/examples/hiawatha/pault.com/prod/XSLScript/common.xsls
-share/examples/hiawatha/pault.com/prod/XSLScript/index-plain.xsls
-share/examples/hiawatha/pault.com/prod/XSLScript/index.xml
-share/examples/hiawatha/pault.com/prod/XSLScript/index.xsls
-share/examples/hiawatha/pault.com/resume-plain.xsls
-share/examples/hiawatha/pault.com/resume.xml
-share/examples/hiawatha/pault.com/resume.xsls
-share/examples/hiawatha/pault.com/unsup/PJC/index-plain.xsls
-share/examples/hiawatha/pault.com/unsup/PJC/index.xml
-share/examples/hiawatha/pault.com/unsup/PJC/index.xsls
-share/examples/hiawatha/pault.com/unsup/Phttpd/index-plain.xsls
-share/examples/hiawatha/pault.com/unsup/Phttpd/index.xml
-share/examples/hiawatha/pault.com/unsup/Phttpd/index.xsls
-share/examples/hiawatha/pault.com/unsup/Pxsl/index-plain.xsls
-share/examples/hiawatha/pault.com/unsup/Pxsl/index.xml
-share/examples/hiawatha/pault.com/unsup/Pxsl/index.xsls
-share/examples/hiawatha/pault.com/unsup/Some2XML/index-plain.xsls
-share/examples/hiawatha/pault.com/unsup/Some2XML/index.xml
-share/examples/hiawatha/pault.com/unsup/Some2XML/index.xsls
-share/examples/hiawatha/pault.com/xsl-bin/cat.xsls
-share/examples/hiawatha/pault.com/xsl-include/dbg.xsls
-share/examples/hiawatha/pault.com/xsl-include/font.xsls
-share/examples/hiawatha/pault.com/xsl-include/htmlpage.xsls
-share/examples/hiawatha/pault.com/xsl-include/link.xsls
-share/examples/hiawatha/pault.com/xsl-include/page-data.xsls
-share/examples/hiawatha/pault.com/xsl-include/page-footer.xsls
-share/examples/hiawatha/pault.com/xsl-include/page-logo.xsls
-share/examples/hiawatha/pault.com/xsl-include/page-menu.xsls
-share/examples/hiawatha/pault.com/xsl-include/page.xsls
-share/examples/hiawatha/pault.com/xsl-include/plain-htmlpage.xsls
-share/examples/hiawatha/pault.com/xsl-include/render-product.xsl
-share/examples/hiawatha/pault.com/xsl-include/table.xsls
-share/examples/hiawatha/pault.com/xsl-include/widget.xsls
-share/examples/hiawatha/pault_com.cfg
-share/examples/hiawatha/simple.cfg
+@comment $NetBSD: PLIST,v 1.7 2024/04/15 14:52:33 hauke Exp $
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/acmev2.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/config.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/hiawatha_config.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/http.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/https.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/letsencrypt.conf
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/letsencrypt.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/logfile.php
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/openssl.conf
+${PLIST.letsencrypt}lib/hiawatha/letsencrypt/rsa.php
+libexec/ssi-cgi/ssi-cgi
+man/man1/cgi-wrapper.1
+man/man1/hiawatha.1
+${PLIST.letsencrypt}man/man1/lefh.1
+man/man1/ssi-cgi.1
+man/man1/wigwam.1
+sbin/cgi-wrapper
+sbin/hiawatha
+${PLIST.letsencrypt}sbin/lefh
+sbin/wigwam
+share/examples/hiawatha/cgi-wrapper.conf
+${PLIST.xslt}share/examples/hiawatha/error.xslt
+share/examples/hiawatha/hiawatha.conf
+share/examples/hiawatha/index.html.sample
+${PLIST.xslt}share/examples/hiawatha/index.xslt
+${PLIST.letsencrypt}share/examples/hiawatha/letsencrypt.conf
+share/examples/hiawatha/mimetype.conf
+${PLIST.urltoolkit}share/examples/hiawatha/toolkit.conf
+@pkgdir share/examples/hiawatha/html
+@pkgdir share/examples/hiawatha/conf
+@pkgdir man/man8
Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.6 pkgsrc/www/hiawatha/distinfo:1.7
--- pkgsrc/www/hiawatha/distinfo:1.6 Tue Oct 26 11:29:30 2021
+++ pkgsrc/www/hiawatha/distinfo Mon Apr 15 14:52:33 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:29:30 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/04/15 14:52:33 hauke Exp $
-BLAKE2s (hiawatha-0.1/hiawatha.zip) = e8aed6b6d2c2fdc73dd6d19248d25b49db2c3af53d00896802abe57865a31d6e
-SHA512 (hiawatha-0.1/hiawatha.zip) = d0aa4fdc105a8b654f4f982e9327841e7cf25d1a92e83549c30332dd5c22290c7153616a25b1755a7aca2e08efb8e268c3ac905ef3c4e98ea23e5e43c8fd4dcc
-Size (hiawatha-0.1/hiawatha.zip) = 705297 bytes
-BLAKE2s (hiawatha-0.1/sitedrivenby.gif) = 7eef9313c8279aadd94c91a4bbe0a682cff0b5647f76acf30cd414ea72b0df60
-SHA512 (hiawatha-0.1/sitedrivenby.gif) = fc80ec0f63a9a28cd8002ba4c1f922807faf8661c677f7935f8768b2739facf411e6a1e72c65038d72c68c1f7bf64d2bc583c1880dc85f77eca48f7baec38ae2
-Size (hiawatha-0.1/sitedrivenby.gif) = 8519 bytes
+BLAKE2s (hiawatha-v11.5.tar.gz) = d925682455f7c822d0aa5659716fbbf41fc6f04d53883945e0d0fe077794fb18
+SHA512 (hiawatha-v11.5.tar.gz) = c374ce680874aa9aacaa4d8b59cce3209275286e5b8baaabdf53346a0a743cb6decc97136b356c207b33b18db2977a0b1d6e9743cc6f4479860fade389bdd86a
+Size (hiawatha-v11.5.tar.gz) = 1810756 bytes
+SHA1 (patch-CMakeLists.txt) = e7eb2dab5b95bb4849e234d977baba31395cd527
+SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
+SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347
Index: pkgsrc/www/hiawatha/files/hiawatha.sh
diff -u pkgsrc/www/hiawatha/files/hiawatha.sh:1.2 pkgsrc/www/hiawatha/files/hiawatha.sh:1.3
--- pkgsrc/www/hiawatha/files/hiawatha.sh:1.2 Mon Aug 4 11:00:32 2003
+++ pkgsrc/www/hiawatha/files/hiawatha.sh Mon Apr 15 14:52:33 2024
@@ -1,58 +1,24 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: hiawatha.sh,v 1.2 2003/08/04 11:00:32 jmmv Exp $
+# $NetBSD: hiawatha.sh,v 1.3 2024/04/15 14:52:33 hauke Exp $
#
# PROVIDE: hiawatha
# REQUIRE: DAEMON
-
-PREFIX=@PREFIX@
-PKG_SYSCONFDIR=@PKG_SYSCONFDIR@
-
-pidfile=/var/run/hiawatha.pid
-
-if [ -z "${JAVA_HOME}" ]
-then
- JAVA_HOME=${PREFIX}/java
- export ${JAVA_HOME}
-fi
-
-CLASSPATH=${PREFIX}/lib/java/hiawatha/hiawatha.jar:${PREFIX}/lib/java/hiawatha/xsls.jar:${PREFIX}/lib/java/saxon.jar:${CLASSPATH}
-export CLASSPATH
+# KEYWORD: shutdown
name="hiawatha"
-command="${JAVA_HOME}/bin/java com.pault.hiawatha.Server ${PKG_SYSCONFDIR}/hiawatha.cfg"
+command="@PREFIX@/sbin/${name}"
-if [ ! -d /var/spool/hiawatha ]
-then
- echo "you must create /var/spool/hiawatha and any needed spool directories therein before starting hiawatha"
- exit 0
-fi
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+ . @SYSCONFBASE@/rc.subr
-cmd=${1:-start}
-
-case ${cmd} in
- start)
- echo "Starting ${name}."
- cd /var/spool/hiawatha
- ${command}&
- echo $! > ${pidfile}
- ;;
-
- stop)
- echo "Stopping ${name}."
- kill `cat ${pidfile}`
- rm ${pidfile}
- ;;
-
- restart)
- ( $0 stop )
- sleep 5
- $0 start
- ;;
-
- *)
- echo 1>&2 "Usage: $0 [restart|start|stop]"
- exit 1
- ;;
-esac
-exit 0
+ rcvar=${name}
+ required_files="@PKG_SYSCONFDIR@/${name}.conf"
+ pidfile="@VARBASE@/run/${name}.pid"
+
+ load_rc_config ${name}
+ run_rc_command "$1"
+else
+ @ECHO@ -n " ${name}"
+ ${command} ${hiawatha_flags}
+fi
Added files:
Index: pkgsrc/www/hiawatha/options.mk
diff -u /dev/null pkgsrc/www/hiawatha/options.mk:1.1
--- /dev/null Mon Apr 15 14:52:34 2024
+++ pkgsrc/www/hiawatha/options.mk Mon Apr 15 14:52:33 2024
@@ -0,0 +1,88 @@
+# $NetBSD: options.mk,v 1.1 2024/04/15 14:52:33 hauke Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.hiawatha
+PKG_SUPPORTED_OPTIONS= cache letsencrypt monitor rproxy tomahawk
+PKG_SUPPORTED_OPTIONS+= urltoolkit xslt
+
+PKG_OPTIONS_OPTIONAL_GROUPS= tls
+PKG_OPTIONS_GROUP.tls= mbedtls mbedtls-private
+
+PKG_SUGGESTED_OPTIONS= cache rproxy urltoolkit mbedtls-private xslt
+
+PLIST_VARS+= letsencrypt urltoolkit xslt
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcache)
+CMAKE_ARGS+= -DENABLE_CACHE=on
+.else
+CMAKE_ARGS+= -DENABLE_CACHE=off
+.endif
+
+.if !empty(PKG_OPTIONS:Mletsencrypt)
+PKG_OPTIONS_REQUIRED_GROUPS= tls
+PLIST.letsencrypt= yes
+REPLACE_PHP+= extra/letsencrypt/lefh.in
+
+DEPENDS+= php-[0-9]*:${PHPPKGSRCDIR}
+.include "../../lang/php/replace.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmonitor)
+CMAKE_ARGS+= -DENABLE_MONITOR=on
+.else
+CMAKE_ARGS+= -DENABLE_MONITOR=off
+.endif
+
+.if !empty(PKG_OPTIONS:Mrproxy)
+CMAKE_ARGS+= -DENABLE_RPROXY=on
+.else
+CMAKE_ARGS+= -DENABLE_RPROXY=off
+.endif
+
+.if !empty(PKG_OPTIONS:Mtomahawk)
+CMAKE_ARGS+= -DENABLE_TOMAHAWK=on
+.else
+CMAKE_ARGS+= -DENABLE_TOMAHAWK=off
+.endif
+
+# TLS support options
+
+.if !empty(PKG_OPTIONS:Mmbedtls)
+CMAKE_ARGS+= -DENABLE_TLS=on
+CMAKE_ARGS+= -DUSE_SYSTEM_MBEDTLS=on
+CONF_FILES+= ${EGDIR}/letsencrypt.conf ${PKG_SYSCONFDIR}/letsencrypt.conf
+.include "../../security/mbedtls3/buildlink3.mk"
+.endif
+.if !empty(PKG_OPTIONS:Mmbedtls-private)
+CMAKE_ARGS+= -DENABLE_TLS=on
+CMAKE_ARGS+= -DUSE_SYSTEM_MBEDTLS=off
+CMAKE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
+CMAKE_ARGS+= -DUSE_STATIC_MBEDTLS_LIBRARY=ON
+##LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/hiawatha
+##CONFIGURE_ENV+= LDFLAGS=${LDFLAGS:Q}
+##INSTALLATION_DIRS+= lib/hiawatha
+.endif
+.if empty(PKG_OPTIONS:Mmbedtls) && empty(PKG_OPTIONS:Mmbedtls-private)
+CMAKE_ARGS+= -DENABLE_TLS=off
+.endif
+
+.if !empty(PKG_OPTIONS:Murltoolkit)
+PLIST.urltoolkit= yes
+CONF_FILES+= ${EGDIR}/toolkit.conf ${PKG_SYSCONFDIR}/toolkit.conf
+
+CMAKE_ARGS+= -DENABLE_TOOLKIT=on
+.else
+CMAKE_ARGS+= -DENABLE_TOOLKIT=off
+.endif
+
+.if !empty(PKG_OPTIONS:Mxslt)
+PLIST.xslt= yes
+CONF_FILES+= ${EGDIR}/error.xslt ${PKG_SYSCONFDIR}/error.xslt
+CONF_FILES+= ${EGDIR}/index.xslt ${PKG_SYSCONFDIR}/index.xslt
+
+CMAKE_ARGS+= -DENABLE_XSLT=ON
+.include "../../textproc/libxslt/buildlink3.mk"
+.else
+CMAKE_ARGS+= -DENABLE_XSLT=OFF
+.endif
Index: pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.1
--- /dev/null Mon Apr 15 14:52:34 2024
+++ pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt Mon Apr 15 14:52:33 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/04/15 14:52:33 hauke Exp $
+
+setuid binaries should not be writable by anyone.
+
+--- CMakeLists.txt.orig 2024-04-05 17:22:48.812504624 +0000
++++ CMakeLists.txt
+@@ -154,7 +154,7 @@ endif()
+ # Installation
+ install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR})
+ install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR}
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
++ PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
+ install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+ foreach(configfile ${config_files})
Index: pkgsrc/www/hiawatha/patches/patch-config_hiawatha.conf.in
diff -u /dev/null pkgsrc/www/hiawatha/patches/patch-config_hiawatha.conf.in:1.1
--- /dev/null Mon Apr 15 14:52:34 2024
+++ pkgsrc/www/hiawatha/patches/patch-config_hiawatha.conf.in Mon Apr 15 14:52:33 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-config_hiawatha.conf.in,v 1.1 2024/04/15 14:52:33 hauke Exp $
+
+Configure uid & gid that we run Hiawatha under
+
+--- config/hiawatha.conf.in.orig 2024-04-15 12:58:05.753978549 +0000
++++ config/hiawatha.conf.in
+@@ -11,7 +11,10 @@
+
+ # GENERAL SETTINGS
+ #
+-#ServerId = www-data
++
++# Server's user & group ID
++ServerId = @HIAWATHA_USER@:@HIAWATHA_GROUP@
++
+ ConnectionsTotal = 1000
+ ConnectionsPerIP = 25
+ SystemLogfile = @LOG_DIR@/system.log
Index: pkgsrc/www/hiawatha/patches/patch-extra_letsencrypt_letsencrypt.conf.in
diff -u /dev/null pkgsrc/www/hiawatha/patches/patch-extra_letsencrypt_letsencrypt.conf.in:1.1
--- /dev/null Mon Apr 15 14:52:34 2024
+++ pkgsrc/www/hiawatha/patches/patch-extra_letsencrypt_letsencrypt.conf.in Mon Apr 15 14:52:33 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-extra_letsencrypt_letsencrypt.conf.in,v 1.1 2024/04/15 14:52:33 hauke Exp $
+
+Whatever the start script directory, init.d is unlikely
+
+The related pkglint error is bogus - "/etc/rc.d" is not PKG_SYSCONFDIR.
+
+--- extra/letsencrypt/letsencrypt.conf.in.orig 2024-04-15 14:11:19.018051975 +0000
++++ extra/letsencrypt/letsencrypt.conf.in
+@@ -7,7 +7,7 @@ ACCOUNT_EMAIL_ADDRESS = info%example.org@localhost
+ #
+ HIAWATHA_CONFIG_DIR = @CONFIG_DIR@
+ HIAWATHA_CERT_DIR = {HIAWATHA_CONFIG_DIR}/tls
+-HIAWATHA_RESTART_COMMAND = /etc/init.d/hiawatha restart
++HIAWATHA_RESTART_COMMAND = /etc/rc.d/hiawatha restart
+
+ # Certificate settings
+ #
Home |
Main Index |
Thread Index |
Old Index