From nobody Sat Jun 24 23:48:59 2023 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 4QpW6349Z1z4hGT0; Sat, 24 Jun 2023 23:48:59 +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 4QpW633mR2z4JpX; Sat, 24 Jun 2023 23:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687650539; 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=N1HN/SZnbG1s3pxTLbf3GbccZZ8GeWFVcTrySJtmF0U=; b=vlOWZHBIxAlpXm3+SvR9VvggP5SgU86VL+NZWT0uS8pQXcfxLX1pi9/QqfmGEaeEhWI3cL ZV1OGTj+mp4bownSndOnN/N9CSJjU27fJWoPbX8RLQ/WO4xsxuxQzJtUWB7tPVCBV4iun4 aIxm5L/Mg/84A42svDYOTbHxe51Z5iEcR4bIoHt5BEd7wgZ0f7XepajAnpEks94fTFqDbN A/LmLd2vLOhp8lcupOs1fujdAqRSoOiXUPgOof8h/B8dDzVlfTBC3cJYKE/Vu/U1laTGxH p79L4PiVkxpov6gX96FD9zBNB3HhFXCzTyOipPpCd0xsuyuOoLaRtkS46ufpJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687650539; 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=N1HN/SZnbG1s3pxTLbf3GbccZZ8GeWFVcTrySJtmF0U=; b=XgjqbSe52+JQZsS22Nr1H/x8CCBlv6Sf32qhnD2ba+g+mGpoY+OacKRboYrUYdQgKkVGl6 8U35+KFbnV+NdMHIU8vBr1QX+obiWSYEJLWNRLW5C7vibP5kKz2TMWqZKMIMmKSWtvdVuq twuPr6e7GBfCHygCnFFGuAf6TwUvJOoLl6NuH9kOVeSVE3gzDWHuABqkVCKWBLi2uDVyrV ZkdZVf6eVKD7JWfvyp5yG/bZcKIwgXZVzETUgssLe2x+02Hfwj/sW2S+K9cq49pVsqdIRy CkwOuFDlhPxcdTzhtC3c12IZaHuZUKOim5w6V0GbO8cHb0imSlf1IwrmMMR7uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687650539; a=rsa-sha256; cv=none; b=ylA+embVQ/zZMqnGiWtnWuiq5VjbfLzWM46sVJUAlhtx0DOMFuGiF1zRBpr/Oz3bn5J8Wm bnnzYGZPzzsmJSWDtzqoeyiVio7N7+wEKU17a12uGHSV68yZFTLDAo6o1Vs9XlBw4ltC9K Bo+//JM1+G4Wg8oQLdBRFxpI8MBna24XnaCarCqAjFhcG6ksmf7Zywy4evaFgBcYlWY6Mq x30jeDcpYt/OVMq6EE6H460a/ZyDspb2iVdeTV9gTRn07CA/dtTRxND2TcE624/dYxAthP vqTzGKYMFiscl/o0K5gn8rKTcUgVVXhacZoHVX6ktjmz2HrgsbO9Lz9Cah1pGQ== 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 4QpW632Z30z15Wp; Sat, 24 Jun 2023 23:48:59 +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 35ONmx5U070124; Sat, 24 Jun 2023 23:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ONmxgh070123; Sat, 24 Jun 2023 23:48:59 GMT (envelope-from git) Date: Sat, 24 Jun 2023 23:48:59 GMT Message-Id: <202306242348.35ONmxgh070123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 229d643c4dd5 - main - depend-cleanup: apply big hammer for OpenSSL 3.0 update 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 229d643c4dd5c1a1695e5de48fab0524132f5deb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=229d643c4dd5c1a1695e5de48fab0524132f5deb commit 229d643c4dd5c1a1695e5de48fab0524132f5deb Author: Ed Maste AuthorDate: 2023-06-24 18:12:06 +0000 Commit: Ed Maste CommitDate: 2023-06-24 23:46:09 +0000 depend-cleanup: apply big hammer for OpenSSL 3.0 update If we find an object corresponding to a source file that existed in OpenSSL 1.1.1 but not in 3.0 just remove all of the OpenSSL objdirs. Reviewed by: dhw Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40750 --- tools/build/depend-cleanup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index f047553c377f..7b851873f288 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -115,3 +115,12 @@ clean_dep usr.sbin/config mkoptions c # 20230401 54579376c05e kqueue1 from syscall to C wrapper clean_dep lib/libc kqueue1 S + +# 20230623 b077aed33b7b OpenSSL 3.0 update +if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then + echo "Removing old OpenSSL 1.1.1 tree" + rm -rf "$OBJTOP"/secure/lib/libcrypto \ + "$OBJTOP"/secure/lib/libssl \ + "$OBJTOP"/obj-lib32/secure/lib/libcrypto \ + "$OBJTOP"/obj-lib32/secure/lib/libssl +fi