Diff below brings www/hiawatha to version 10.10, which fixes a bug (AlterMode not working correctly) and brings some small improvements. Changelog can be found at https://www.hiawatha-webserver.org/changelog.
Installation of a Let's Encrypt script has been patched out as it relies on PHP. This shouldn't be an issue as there are numerous alternatives. Run tested on amd64. Comments/OK? diff --git Makefile Makefile index a5e458ebc14..6ac98aa404a 100644 --- Makefile +++ Makefile @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.61 2019/07/12 20:50:46 sthen Exp $ COMMENT = secure webserver -DISTNAME = hiawatha-10.8.4 -REVISION = 0 +DISTNAME = hiawatha-10.10 CATEGORIES = www net HOMEPAGE = https://www.hiawatha-webserver.org/ diff --git distinfo distinfo index 854e6912524..18aa79211ce 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (hiawatha-10.8.4.tar.gz) = fLMi6Qca0+6QkWfGJMb4Cw0qZjCp0jLVJAYonYNlixQ= -SIZE (hiawatha-10.8.4.tar.gz) = 1095071 +SHA256 (hiawatha-10.10.tar.gz) = teRvV1f6ZH530h0k9+6pEtWfJqdVWMungLRcHDozpNk= +SIZE (hiawatha-10.10.tar.gz) = 1168325 diff --git patches/patch-CMakeLists_txt patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..1049dc657bf --- /dev/null +++ patches/patch-CMakeLists_txt @@ -0,0 +1,33 @@ +$OpenBSD$ + +Don't install Let's Encrypt script, which relies on PHP. We have acme-client(1) +in base, and several alternatives in ports. + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -192,15 +192,15 @@ endforeach() + + install(FILES extra/index.html DESTINATION ${WEBROOT_DIR}) + +-if(ENABLE_TLS AND NOT CYGWIN) +- configure_file(extra/letsencrypt/lefh.in lefh) +- install(FILES ${PROJECT_BINARY_DIR}/lefh DESTINATION ${CMAKE_INSTALL_SBINDIR} +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +- install(DIRECTORY extra/letsencrypt/letsencrypt DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) +- configure_file(extra/letsencrypt/letsencrypt.conf.in letsencrypt.conf) +- install(FILES ${PROJECT_BINARY_DIR}/letsencrypt.conf DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha/letsencrypt) +- install(FILES man/lefh.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1) +-endif() ++#if(ENABLE_TLS AND NOT CYGWIN) ++# configure_file(extra/letsencrypt/lefh.in lefh) ++# install(FILES ${PROJECT_BINARY_DIR}/lefh DESTINATION ${CMAKE_INSTALL_SBINDIR} ++# PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++# install(DIRECTORY extra/letsencrypt/letsencrypt DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) ++# configure_file(extra/letsencrypt/letsencrypt.conf.in letsencrypt.conf) ++# install(FILES ${PROJECT_BINARY_DIR}/letsencrypt.conf DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha/letsencrypt) ++# install(FILES man/lefh.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1) ++#endif() + + # Create directories + install(DIRECTORY DESTINATION ${LOG_DIR}) diff --git patches/patch-src_serverconfig_c patches/patch-src_serverconfig_c index 27811e951f5..c869d786bbf 100644 --- patches/patch-src_serverconfig_c +++ patches/patch-src_serverconfig_c @@ -11,7 +11,7 @@ Index: src/serverconfig.c #define MAX_LENGTH_CONFIGLINE 1024 #define MAX_CACHE_SIZE 1024 #define MAX_UPLOAD_SIZE 2047 -@@ -300,8 +300,8 @@ t_config *default_config(void) { +@@ -298,8 +298,8 @@ t_config *default_config(void) { config->tomahawk_port = NULL; #endif
