From nobody Fri Jul 14 17:27:00 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 4R2dh43NcJz2tnx4; Fri, 14 Jul 2023 17:27:00 +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 4R2dh41kjXz430L; Fri, 14 Jul 2023 17:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355620; 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=MW5yr9gRYNLKofgJUw2E/+Mn0nvRpCGg0e3FQk7QQE4=; b=eeSpsYP7AXLYtujafFwmRsuuMzNEyHdtWMIqCO9bNvfBbAyosmoJnn6ju/eUTKpIXTi6JP l2Kv+ECx7dyvgvyHVKPmGn69htdIox3iRW1uKidkfWb5D4xuOKAyHp4Lm0alwDrpBKhdLl WRi8pmIhEtlSoHciXem2bxK7aNPrmwNzDsxuOIS/t5+FVNYn3SsFzrNpUte9AwVE1HRnj9 OJKoWC9sBvwanqZH6CS3544A3EBoZMiNF4oD6qYUY/un5b/wc/7Bt6EnD7uojmShbJ3LoU j1XmRtXXedWzhoXvz1i6C3UT904xYZ9a0apcQrOOErwZHzo0cMiPUZWO4SBw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355620; 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=MW5yr9gRYNLKofgJUw2E/+Mn0nvRpCGg0e3FQk7QQE4=; b=aJ3wBGotFXzX0P073ONScfr8ejeMSv2dz8yH8DN1SxdkkNRXXkm95BKSgjvC+weQ2e2j3Q j93L+f7PwLOghi24dMfc1bDCwkGoRWcwW/kGVJ49h+EYVAuyTjupfzcLJ1tgxuPNgH16HI 6ltBqHOsRb/Nqd/Z1FSsVgrz4hSCy6e/wUqUoBPFBoemyU4PsdQUUa3fw0BvvFGxmnHLaP 3n18b6qvu1pW2IadQbEKkPGqHoNuBpCCD9DSvaH998/MnLyp+dhGkowS8+qcEKz/mHtpaw J9ncXyj7o11klSlFX7NeayNZbNMT/V9gJCn7EzEPHQ8q2GvQxi4VKFyCQESlow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689355620; a=rsa-sha256; cv=none; b=G5fDfktUdKT93Vhw+whYUS3abqNPQcAMZFY6ouq1aFU2syia0OI9nkVEJnEwaJHcJT2xMQ 9gSHQTNbTP44OzareoF2euKXormqyj1z1sRNWDJdyToXmCvHrfVPuV1fMpUYhhBhRmKiOx Bun6eJ1pwj8lSoAtH+suOTkg+aEASKG12trjBlYOf+5AHUcUtIcP75pjL+McjuqXDaLHPe CDXotIkCX9FEp4aYtCsc5exdXNYnP1LQ5gYK2YHDqm+8XrkmBAFhugA/qxPHH96zA1rtp7 mwzIEXvDIzi/U7Lm5GerC5NhU3qTYe4D5L6FMTqriixfXnCWa3II3MyiqBdyiQ== 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 4R2dh40qQZzQxZ; Fri, 14 Jul 2023 17:27:00 +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 36EHR0lr094001; Fri, 14 Jul 2023 17:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EHR05f093999; Fri, 14 Jul 2023 17:27:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 17:27:00 GMT Message-Id: <202307141727.36EHR05f093999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a248abb55a51 - main - Obsoletefiles.inc: A few OpenSSL 3 cleanups. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a248abb55a51830d811b45d78eaacf5df108148b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a248abb55a51830d811b45d78eaacf5df108148b commit a248abb55a51830d811b45d78eaacf5df108148b Author: John Baldwin AuthorDate: 2023-07-14 17:25:54 +0000 Commit: John Baldwin CommitDate: 2023-07-14 17:25:54 +0000 Obsoletefiles.inc: A few OpenSSL 3 cleanups. - Treat old engine DSOs from OpenSSL 1.1.1 as OLD_LIBS, not OLD_FILES. These should only be deleted by make delete-old-libs similar to how PAM modules are treated. - Add /usr/lib32/engines to OLD_DIRS. lib32 automation does not apply to OLD_DIRS. Reviewed by: Pierre Pronchery Differential Revision: https://reviews.freebsd.org/D41034 --- ObsoleteFiles.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c2f629133fd5..ccc57c3406c3 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -61,10 +61,11 @@ OLD_FILES+=usr/include/dev/nvme/nvme_private.h # 20230623: OpenSSL 3.0.9 OLD_LIBS+=lib/libcrypto.so.111 OLD_FILES+=usr/include/openssl/rand_drbg.h -OLD_FILES+=usr/lib/engines/capi.so -OLD_FILES+=usr/lib/engines/padlock.so +OLD_LIBS+=usr/lib/engines/capi.so +OLD_LIBS+=usr/lib/engines/padlock.so OLD_LIBS+=usr/lib/libssl.so.111 OLD_DIRS+=usr/lib/engines +OLD_DIRS+=usr/lib32/engines OLD_FILES+=usr/share/man/man1/list.1 OLD_FILES+=usr/share/man/man1/openssl-tsget.1 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_data.3