From nobody Thu Sep 1 21:52:30 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MJZXG6gl1z4Zkmp; Thu, 1 Sep 2022 21:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MJZXG6Gktz3xdM; Thu, 1 Sep 2022 21:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662069150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2wUY42ffNjar3iL6Ttf6pvK3r0zpdH7XjQidn3AqTc=; b=lMQtywjlM2tbumvi0Mtk/ttj0y3K1xsK/kVyemP7bp6sWH1lLaUyoIS1x0+n3Hnx59vMVc 8MErIzl6puhyx6cyvhKuQMy702YF7mCdA+VF+OzL+Kpl/q7/uAasCcI0+5VTu3w6cYwZnd GcWVyJqwFBI+T255Ks0cBMs1GBSOrnHxXSFedcB3Dcl8y1r2aoF1z6i4cVkJhttj9OfoyI 9a3+4scFHkIXS+6cUhpZ2MUdFqGMRMsz80qnPy2SxcyyAsVeW9zoNL/+NdYZJoXsTqca1/ Q+xbjRuGjTK69G9XW/Z9Sga0lvJ7HTKnjgUQnbfXRkNh8C0v5MEPeLXj5eulbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MJZXG5NpJzcMw; Thu, 1 Sep 2022 21:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 281LqU19052963; Thu, 1 Sep 2022 21:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 281LqU55052962; Thu, 1 Sep 2022 21:52:30 GMT (envelope-from git) Date: Thu, 1 Sep 2022 21:52:30 GMT Message-Id: <202209012152.281LqU55052962@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: de17add7e619 - main - www/hiawatha: Add missing patches to fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de17add7e61938a2a4dd4052f10a6209a08aedda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662069150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2wUY42ffNjar3iL6Ttf6pvK3r0zpdH7XjQidn3AqTc=; b=yVVBtrIoIyysje3i/Rc3JfQR232pHYtlCOUfDDB+4Dl0FT8bGUcQuBYUP6voOFs+dh6Soc owIRHRu88pCZDOeSxLqzUjRqp02BKYl/ENAhAGIwQYczulz8ChjWqAjsOfEK7NiI1vNBff qwh+NFVyRSs8rzGjaeBhmFbnuoxRt3Ga16gg2Lv97tcwfe+KdThKkyIyn78jEjYBJzb92U nCRhksyjJqXp9vxFP3oeH4fM0cOiOx/ovBVPU6oEV+9WTovsFdxF/bI3E1nujYyf2n8wQt HOQDMkCkLAh7NwqegM64yYIUDLkWVeM5l+R/qDg8cZp0zJVnQy4aq3WvrAbu5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662069150; a=rsa-sha256; cv=none; b=coiHQtnWZ7OXTLbeOyETREDCDHZL96RExlACLRnvHzOXSCXy+kPV4Bo1d5et3d7Qpiq1zs OebPlGUumNLkDotEX7eVMNvqoxcYtctzS1dlI1yGQ36phZuyCSO7axVuDvztnbb84RCuAl MCPf9BDERs4h4HSGy77ZX3eE79kIdvrwPehLukr91xYpHl1msx0bvBcVHONMKrhHop6KVC BUeXNUe4JTDOt2lI7UX/vD0lOv7rOthCLviS/OMBej5aUjsvr0NtUt+dD3ClbI+fyF0fqn m7fsOGGBAEjQjJ2GW4M1EOtSXi+tbjE8NqhdxDfQPcU8jGkROeFFZ4WyoM+1WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=de17add7e61938a2a4dd4052f10a6209a08aedda commit de17add7e61938a2a4dd4052f10a6209a08aedda Author: Neel Chauhan AuthorDate: 2022-09-01 21:52:28 +0000 Commit: Neel Chauhan CommitDate: 2022-09-01 21:52:28 +0000 www/hiawatha: Add missing patches to fix build --- www/hiawatha/files/patch-src_tls.c | 25 +++++++++++++++++++++++++ www/hiawatha/files/patch-src_wigwam.c | 23 +++++++++++++++++++++++ www/hiawatha/files/patch-src_xslt.c | 12 ++++++++++++ 3 files changed, 60 insertions(+) diff --git a/www/hiawatha/files/patch-src_tls.c b/www/hiawatha/files/patch-src_tls.c new file mode 100644 index 000000000000..e7723e37d069 --- /dev/null +++ b/www/hiawatha/files/patch-src_tls.c @@ -0,0 +1,25 @@ +--- src/tls.c.orig 2022-01-22 12:16:26 UTC ++++ src/tls.c +@@ -322,7 +322,7 @@ int tls_load_key_cert(char *file, mbedtls_pk_context * + } + mbedtls_pk_init(*private_key); + +- if ((result = mbedtls_pk_parse_keyfile(*private_key, file, NULL, mbedtls_psa_get_random, MBEDTLS_PSA_RANDOM_STATE)) != 0) { ++ if ((result = mbedtls_pk_parse_keyfile(*private_key, file, NULL)) != 0) { + print_tls_error(result, "Error loading private key from %s", file); + return -1; + } +@@ -436,11 +436,13 @@ int tls_accept(int *sock, mbedtls_ssl_context *context + + result = TLS_HANDSHAKE_OKE; + while ((handshake = mbedtls_ssl_handshake(context)) != 0) { ++#ifndef __FreeBSD__ + if (handshake == MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE) { + mbedtls_ssl_free(context); + result = TLS_HANDSHAKE_NO_MATCH; + break; + } ++#endif + + if ((handshake != MBEDTLS_ERR_SSL_WANT_READ) && (handshake != MBEDTLS_ERR_SSL_WANT_WRITE)) { + mbedtls_ssl_free(context); diff --git a/www/hiawatha/files/patch-src_wigwam.c b/www/hiawatha/files/patch-src_wigwam.c new file mode 100644 index 000000000000..47266fdadfa9 --- /dev/null +++ b/www/hiawatha/files/patch-src_wigwam.c @@ -0,0 +1,23 @@ +--- src/wigwam.c.orig 2022-08-31 17:25:16 UTC ++++ src/wigwam.c +@@ -582,7 +582,7 @@ int check_main_config(char *config_dir) { + /* Private key check + */ + mbedtls_pk_init(&private_key); +- if (mbedtls_pk_parse_keyfile(&private_key, needle->value, NULL, mbedtls_psa_get_random, MBEDTLS_PSA_RANDOM_STATE) != 0) { ++ if (mbedtls_pk_parse_keyfile(&private_key, needle->value, NULL) != 0) { + printf("Error loading private key from %s.\n", needle->value); + errors++; + goto next_crt; +@@ -601,9 +601,11 @@ int check_main_config(char *config_dir) { + goto next_crt; + } + ++#ifndef __FreeBSD__ + if (certificate.MBEDTLS_PRIVATE(sig_md) < MBEDTLS_MD_SHA256) { + printf("Warning: the certificate signature algoritm in %s should at least be SHA256.\n", needle->value); + } ++#endif + + next_crt: + last_file = needle->value; diff --git a/www/hiawatha/files/patch-src_xslt.c b/www/hiawatha/files/patch-src_xslt.c new file mode 100644 index 000000000000..349b8aa8e3e1 --- /dev/null +++ b/www/hiawatha/files/patch-src_xslt.c @@ -0,0 +1,12 @@ +--- src/xslt.c.orig 2019-02-18 18:34:36 UTC ++++ src/xslt.c +@@ -277,7 +277,9 @@ void init_xslt_module() { + /* XSLT transform functions + */ + void init_xslt_module() { ++#ifndef __FreeBSD__ + xmlInitMemory(); ++#endif + xmlInitParser(); + } +