The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a248abb55a51830d811b45d78eaacf5df108148b
commit a248abb55a51830d811b45d78eaacf5df108148b Author: John Baldwin <[email protected]> AuthorDate: 2023-07-14 17:25:54 +0000 Commit: John Baldwin <[email protected]> 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 <[email protected]> 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
