From nobody Sat May 04 12:37:32 2024 X-Original-To: dev-commits-src-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 4VWnHx1XBWz5KVPQ; Sat, 4 May 2024 12:37:33 +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 4VWnHw6hPTz44V8; Sat, 4 May 2024 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714826252; 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=+c8t5ivZU8s7ySSfUiR9xHijyNwc3lqv2VtEKyfxTjQ=; b=GCn9jevVAamQP9Brc+NS/6VMDXSINDC/mEeA2X1elF97+Y79/na1iBhf8sF1CH80vIjXzT 06HqTtkF8lKJ2zqaLGGJCogklWuhtnfaN9Cx12BETaUyxphhs/IgEl+lxgJiLKqPMH0ixi XZZnWMqo5I+mv6aKqnUFAIpn0yhYneohJJ00q7TzU0hQoCTO8dtKVO5BvjjFjq5QsP5ec8 sEOsVjANwIImTzqUqhxcVx0QdA1SqsLzJeS6hA5z9dF4T0ixQ6Uo2gwzBATmvTwi/b+pHb ZSjpZ9qfQzrh2EgRwWYP/wME5ynSD2T9QAUKt6YGwMBkADymO2TaiB35TUTxMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714826252; a=rsa-sha256; cv=none; b=oxC5JoIGxHd1kSJHos8B78P3FPl5nILDYuNgwpCB14rzZcSFfp2A68h8dYSmKtCne/y97W RbffmFYKwb/AZTtKkps8AbTUA0xKdrvfsMv7L33hJRxGADJ3+d1IBDWaQW1Xa3XvHF9Msc KA48VWb/POGIQZZBorgBOtxuFebKGYy3pgQZdrBG+tOEeg7bxLu4doUbD4L5QY8obiXBe4 Z53wsJi/OVSLU2KYWr/QshWXK/FUDQLol25aVwKMShfBF8p4QAqHedVtT+7DrWR6wQLzDL SZcls6wFQrrWVLm6AqsObr2PFj847kMOhJG9QSZ7sIPolY5WttwisFBopp543w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714826252; 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=+c8t5ivZU8s7ySSfUiR9xHijyNwc3lqv2VtEKyfxTjQ=; b=GOC3uDblcTHDdZSovJRWjVwkuU0OFG7dpzhD+y2ORNxw1sdLHFlPh8RJWAqXsVl0tTo7IU 735YwAa6FKTcEXSAn4nsvK/3qOUeXrksPcc5Fe940wMQbW1oq2/00E+0+/YaeVgr2s/2ui SR1Zwigr0Y7L5bvZ2r4YbVWCQKJ4AkHZ/jWiVIXMoNFvtHizYjSyv2Xma31z+OcmUxrBCz PcR1QVp2G+YdLSIrmgLplgYiy0Luea9ckgGE059v3LrmtBWUz18ag96gSZxK6HEKHaIOnO jPCEUeVEIS5AJiEzWQkVxYWQdQ1WEmVLVad1vnijtle0hRgfoKmYA384RhUbjg== 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 4VWnHw6HXbzT2S; Sat, 4 May 2024 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 444CbW8B072231; Sat, 4 May 2024 12:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 444CbWbu072228; Sat, 4 May 2024 12:37:32 GMT (envelope-from git) Date: Sat, 4 May 2024 12:37:32 GMT Message-Id: <202405041237.444CbWbu072228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: d2291dbb3ccb - stable/13 - libarchive: Avoid a build failure with OpenSSL 3.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d2291dbb3ccbb772fdeb9fdae88602771564e607 Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d2291dbb3ccbb772fdeb9fdae88602771564e607 commit d2291dbb3ccbb772fdeb9fdae88602771564e607 Author: Pierre Pronchery AuthorDate: 2023-06-01 18:17:10 +0000 Commit: Martin Matuska CommitDate: 2024-05-04 11:53:07 +0000 libarchive: Avoid a build failure with OpenSSL 3.0 This is a minimal workaround; a proper fix will come via a future update from upstream. Sponsored by: The FreeBSD Foundation (cherry picked from commit e23d45187b287ee7a5c49c8b993daa9e6bb3ad97) --- contrib/libarchive/libarchive/archive_hmac.c | 2 +- lib/libarchive/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/libarchive/libarchive/archive_hmac.c b/contrib/libarchive/libarchive/archive_hmac.c index 012fe1596211..0914f38e3670 100644 --- a/contrib/libarchive/libarchive/archive_hmac.c +++ b/contrib/libarchive/libarchive/archive_hmac.c @@ -238,7 +238,7 @@ __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len) if (*ctx == NULL) return -1; EVP_MAC_free(mac); - params[0] = OSSL_PARAM_construct_utf8_string("digest", "SHA1", 0); + params[0] = OSSL_PARAM_construct_utf8_string("digest", (char *)"SHA1", 0); params[1] = OSSL_PARAM_construct_end(); EVP_MAC_init(*ctx, key, key_len, params); #else diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index c98249519fa4..95d96df24eef 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -11,6 +11,7 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -DWITH_OPENSSL CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD+= crypto +CFLAGS.archive_hmac.c+=-Wno-error=cast-qual .else LIBADD+= md .endif