Attachment 227660 Details for Bug 258125 – patch

[patch] patch

patch-newnew-www-hiawatha.patch (text/plain), 4.71 KB, created by Chris Petrik on 2021-09-04 20:21:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2021-09-04 20:21:30 UTC

Size: 4.71 KB

patch

obsolete

>diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
>index c106abd988da..9fc815cdd288 100644
>--- a/www/hiawatha/Makefile
>+++ b/www/hiawatha/Makefile
>@@ -1,17 +1,17 @@
> # Created by: Hugo Leisink
> 
> PORTNAME=	hiawatha
>-PORTVERSION=	10.12
>+PORTVERSION=	11.0
> CATEGORIES=	www
> MASTER_SITES=	https://www.hiawatha-webserver.org/files/
> 
> MAINTAINER=	christopher.petrik@usm.edu
>-COMMENT=	Advanced and secure webserver for Unix
>+COMMENT=	Advanced and secure webserver for Unix-Like
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-LIB_DEPENDS=	libmbedtls.so:security/mbedtls
>+#LIB_DEPENDS=	libmbedtls.so:security/mbedtls
> 
> USES=		cmake:insource compiler:c11 localbase:ldflags shebangfix
> USE_RC_SUBR=	hiawatha
>@@ -20,7 +20,7 @@ SHEBANG_FILES=	extra/letsencrypt/lefh.in
> CMAKE_ARGS=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
> 		-DWEBROOT_DIR=${WWWDIR} \
> 		-DWORK_DIR=/var/db/${PORTNAME}
>-CMAKE_ON=	USE_SYSTEM_MBEDTLS
>+#CMAKE_ON=	USE_SYSTEM_MBEDTLS
> 
> OPTIONS_DEFINE=		CACHE CGIWRAPPER LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \
> 			TOOLKIT XSLT
>diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
>index 15a940c01607..fb51d0cee27d 100644
>--- a/www/hiawatha/distinfo
>+++ b/www/hiawatha/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1617048335
>-SHA256 (hiawatha-10.12.tar.gz) = 61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
>-SIZE (hiawatha-10.12.tar.gz) = 1454134
>+TIMESTAMP = 1630181575
>+SHA256 (hiawatha-11.0.tar.gz) = d6fffbe6938951b62f9e02b5382a810fdb83b1e1328f5333c1c733342a890b4b
>+SIZE (hiawatha-11.0.tar.gz) = 1460191
>diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist
>index 53def26ebf79..f56fbce99cc4 100644
>--- a/www/hiawatha/pkg-plist
>+++ b/www/hiawatha/pkg-plist
>@@ -5,6 +5,98 @@ bin/ssi-cgi
> @sample %%ETCDIR%%/index.xslt.sample
> @sample %%ETCDIR%%/mimetype.conf.sample
> @sample %%ETCDIR%%/toolkit.conf.sample
>+@sample %%WWWDIR%%/index.html.sample
>+cmake/MbedTLSConfig.cmake
>+cmake/MbedTLSConfigVersion.cmake
>+cmake/MbedTLSTargets-relwithdebinfo.cmake
>+cmake/MbedTLSTargets.cmake
>+include/mbedtls/aes.h
>+include/mbedtls/aria.h
>+include/mbedtls/asn1.h
>+include/mbedtls/asn1write.h
>+include/mbedtls/base64.h
>+include/mbedtls/bignum.h
>+include/mbedtls/build_info.h
>+include/mbedtls/camellia.h
>+include/mbedtls/ccm.h
>+include/mbedtls/chacha20.h
>+include/mbedtls/chachapoly.h
>+include/mbedtls/check_config.h
>+include/mbedtls/cipher.h
>+include/mbedtls/cmac.h
>+include/mbedtls/compat-2.x.h
>+include/mbedtls/config_psa.h
>+include/mbedtls/ctr_drbg.h
>+include/mbedtls/debug.h
>+include/mbedtls/des.h
>+include/mbedtls/dhm.h
>+include/mbedtls/ecdh.h
>+include/mbedtls/ecdsa.h
>+include/mbedtls/ecjpake.h
>+include/mbedtls/ecp.h
>+include/mbedtls/entropy.h
>+include/mbedtls/error.h
>+include/mbedtls/gcm.h
>+include/mbedtls/hkdf.h
>+include/mbedtls/hmac_drbg.h
>+include/mbedtls/mbedtls_config.h
>+include/mbedtls/md.h
>+include/mbedtls/md5.h
>+include/mbedtls/memory_buffer_alloc.h
>+include/mbedtls/net_sockets.h
>+include/mbedtls/nist_kw.h
>+include/mbedtls/oid.h
>+include/mbedtls/pem.h
>+include/mbedtls/pk.h
>+include/mbedtls/pkcs12.h
>+include/mbedtls/pkcs5.h
>+include/mbedtls/platform.h
>+include/mbedtls/platform_time.h
>+include/mbedtls/platform_util.h
>+include/mbedtls/poly1305.h
>+include/mbedtls/private_access.h
>+include/mbedtls/psa_util.h
>+include/mbedtls/ripemd160.h
>+include/mbedtls/rsa.h
>+include/mbedtls/sha1.h
>+include/mbedtls/sha256.h
>+include/mbedtls/sha512.h
>+include/mbedtls/ssl.h
>+include/mbedtls/ssl_cache.h
>+include/mbedtls/ssl_ciphersuites.h
>+include/mbedtls/ssl_cookie.h
>+include/mbedtls/ssl_ticket.h
>+include/mbedtls/threading.h
>+include/mbedtls/timing.h
>+include/mbedtls/version.h
>+include/mbedtls/x509.h
>+include/mbedtls/x509_crl.h
>+include/mbedtls/x509_crt.h
>+include/mbedtls/x509_csr.h
>+include/psa/crypto.h
>+include/psa/crypto_builtin_composites.h
>+include/psa/crypto_builtin_primitives.h
>+include/psa/crypto_compat.h
>+include/psa/crypto_config.h
>+include/psa/crypto_driver_common.h
>+include/psa/crypto_driver_contexts_composites.h
>+include/psa/crypto_driver_contexts_primitives.h
>+include/psa/crypto_extra.h
>+include/psa/crypto_platform.h
>+include/psa/crypto_se_driver.h
>+include/psa/crypto_sizes.h
>+include/psa/crypto_struct.h
>+include/psa/crypto_types.h
>+include/psa/crypto_values.h
>+lib/hiawatha/libmbedcrypto.so
>+lib/hiawatha/libmbedcrypto.so.10
>+lib/hiawatha/libmbedcrypto.so.3.0.0
>+lib/hiawatha/libmbedtls.so
>+lib/hiawatha/libmbedtls.so.16
>+lib/hiawatha/libmbedtls.so.3.0.0
>+lib/hiawatha/libmbedx509.so
>+lib/hiawatha/libmbedx509.so.4
>+lib/hiawatha/libmbedx509.so.3.0.0
> %%LEFH%%lib/hiawatha/letsencrypt/acmev2.php
> %%LEFH%%lib/hiawatha/letsencrypt/config.php
> %%LEFH%%lib/hiawatha/letsencrypt/hiawatha_config.php
>@@ -24,6 +116,5 @@ man/man1/wigwam.1.gz
> sbin/hiawatha
> %%LEFH%%sbin/lefh
> sbin/wigwam
>-@sample %%WWWDIR%%/index.html.sample
> @dir /var/log/hiawatha
> @dir /var/db/hiawatha

Actions: View | Diff

Attachments on bug 258125: 227517 | 227658 | 227660 | 227671