From nobody Wed Feb 09 17:40:41 2022 X-Original-To: dev-commits-src-branches@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 1DB2619BF7D3; Wed, 9 Feb 2022 17:40:43 +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 4Jv6bt0drCz3kY9; Wed, 9 Feb 2022 17:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644428442; 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=kveB91Yp5U/UtI4lcPbwLQxbh7x3KCtqvA23jx5i3fw=; b=wpFWJby6EgAHqhWWMHsJ56a6cwNo05Z9mYGJviSX9P/gyLwlNsSlIN+nO9OYvB+afI8fgh ohZXwWT91WdMjNIhJUONe90kIYWsX6fFprS8DUaZICHg+ChZhxIGZ5rnpK2OCuUmcdoyoj 6N3pJmzD2M+E58gpNUCHy3qXMeQ/rxlOvIDG0XJ3daOfO962WaPJ5rSE8VwsMvmmzWCIxu 1U/6xPXal97xZjntjkyKjazzfktCLYUsLS90S/DuZ2CKJ+EADqbeJG1nrtd0dhPWkfkOjj Ork3kQdLuA+KrE+UVAf8UuaemmHD7z69xUYPol1/Haxbyv1rFsMuAom1luCJxA== 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 BF106116EF; Wed, 9 Feb 2022 17:40:41 +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 219Hefbl041376; Wed, 9 Feb 2022 17:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219HefDN041375; Wed, 9 Feb 2022 17:40:41 GMT (envelope-from git) Date: Wed, 9 Feb 2022 17:40:41 GMT Message-Id: <202202091740.219HefDN041375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: bbe50accc9ee - stable/13 - Belatedly track private lib renaming for OptionalObsoleteFiles.inc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: bbe50accc9ee80dd6b2636d8648c9748a3bfb30c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644428442; 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=kveB91Yp5U/UtI4lcPbwLQxbh7x3KCtqvA23jx5i3fw=; b=n7A7DKQwJSAo85Z7pbBjHzsQ5d8BaIf5HooGukLiBhV0rLWgcd5znnL2XHbhajHc8sFhQ2 hQbFL+RPjUDeet1+NENXAQKHPTHtif//y9jie2H7+XXZEAxKfWoWEEtZZQbDqWxguM/KfR 1dsrqV/zBI9SkW+yQQdhHeZoKS/rvSU6Gug1A/3HPt4nJI4ttt5e5zRju+jtc1zEl6WN19 dlj45u1EUNPzg6zMBio0vkBD6IKaWgl9uNhN4QfljolXIkjU1A3Zn2F2sTRIXqbwjxgG9w jvQwgPZq9mjqLqJNvIaeqDCiam3eLX9cwIttf2IifdV3krrukiXqwbiSxaygPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644428442; a=rsa-sha256; cv=none; b=kxLmTtB6uoLJvbs6PjA8QLITFhWNbLxRdFGDNmNq2ckOMXaM3RQBVpYVhN6XGBbnxlrEPe FJhgdsGLX6XaGo/niSIXhGSd3zvb63kraVo6q6kCYR0RdVMu1Z01j42JkMev2Ju5L21jfc MM7WD28SUFntT2dIvQ/KEugfH8KoBoN6XqGVka9wjFg0qy6aWaUx7elwcO32v/0bSvRei1 UwXSUh+hKAXf6L/wxyhUOsM9q+Ajg0JGRXO14OmETXRevoD1nqqoIKjji2PpBIkhuj+OJK /m2b4nNt6MJqvUqQ9P1JY/w5OED5SBrXr6aAquStUFzJ4OP9YPuBSef2gYf2Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe50accc9ee80dd6b2636d8648c9748a3bfb30c commit bbe50accc9ee80dd6b2636d8648c9748a3bfb30c Author: Ed Maste AuthorDate: 2021-10-09 00:15:43 +0000 Commit: Ed Maste CommitDate: 2022-02-09 17:39:51 +0000 Belatedly track private lib renaming for OptionalObsoleteFiles.inc Reviewed by: kevans Fixes: 5551c573554e ("Rework PRIVATELIB") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32384 (cherry picked from commit 032448cd2c52161aa03fd4ee5bf243d78d61b53e) --- tools/build/mk/OptionalObsoleteFiles.inc | 96 ++++++++++++++++---------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ecf155adb396..bda8a435c5e1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2907,14 +2907,14 @@ OLD_FILES+=usr/lib/pam_krb5.so OLD_LIBS+=usr/lib/pam_krb5.so.6 OLD_FILES+=usr/lib/pam_ksu.so OLD_LIBS+=usr/lib/pam_ksu.so.6 -OLD_FILES+=usr/lib/private/libheimipcc.a -OLD_FILES+=usr/lib/private/libheimipcc.so -OLD_LIBS+=usr/lib/private/libheimipcc.so.11 -OLD_FILES+=usr/lib/private/libheimipcc_p.a -OLD_FILES+=usr/lib/private/libheimipcs.a -OLD_FILES+=usr/lib/private/libheimipcs.so -OLD_LIBS+=usr/lib/private/libheimipcs.so.11 -OLD_FILES+=usr/lib/private/libheimipcs_p.a +OLD_FILES+=usr/lib/libprivateheimipcc.a +OLD_FILES+=usr/lib/libprivateheimipcc.so +OLD_LIBS+=usr/lib/libprivateheimipcc.so.11 +OLD_FILES+=usr/lib/libprivateheimipcc_p.a +OLD_FILES+=usr/lib/libprivateheimipcs.a +OLD_FILES+=usr/lib/libprivateheimipcs.so +OLD_LIBS+=usr/lib/libprivateheimipcs.so.11 +OLD_FILES+=usr/lib/libprivateheimipcs_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libasn1.a OLD_FILES+=usr/lib32/libasn1.so @@ -2984,14 +2984,14 @@ OLD_FILES+=usr/lib32/pam_krb5.so OLD_LIBS+=usr/lib32/pam_krb5.so.6 OLD_FILES+=usr/lib32/pam_ksu.so OLD_LIBS+=usr/lib32/pam_ksu.so.6 -OLD_FILES+=usr/lib32/private/libheimipcc.a -OLD_FILES+=usr/lib32/private/libheimipcc.so -OLD_LIBS+=usr/lib32/private/libheimipcc.so.11 -OLD_FILES+=usr/lib32/private/libheimipcc_p.a -OLD_FILES+=usr/lib32/private/libheimipcs.a -OLD_FILES+=usr/lib32/private/libheimipcs.so -OLD_LIBS+=usr/lib32/private/libheimipcs.so.11 -OLD_FILES+=usr/lib32/private/libheimipcs_p.a +OLD_FILES+=usr/lib32/libprivateheimipcc.a +OLD_FILES+=usr/lib32/libprivateheimipcc.so +OLD_LIBS+=usr/lib32/libprivateheimipcc.so.11 +OLD_FILES+=usr/lib32/libprivateheimipcc_p.a +OLD_FILES+=usr/lib32/libprivateheimipcs.a +OLD_FILES+=usr/lib32/libprivateheimipcs.so +OLD_LIBS+=usr/lib32/libprivateheimipcs.so.11 +OLD_FILES+=usr/lib32/libprivateheimipcs_p.a .endif OLD_FILES+=usr/libexec/digest-service OLD_FILES+=usr/libexec/hprop @@ -3743,15 +3743,15 @@ OLD_FILES+=usr/share/man/man3/com_err.3.gz .endif .if ${MK_LDNS} == no -OLD_FILES+=usr/lib/private/libldns.a -OLD_FILES+=usr/lib/private/libldns.so -OLD_LIBS+=usr/lib/private/libldns.so.5 -OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/libprivateldns.a +OLD_FILES+=usr/lib/libprivateldns.so +OLD_LIBS+=usr/lib/libprivateldns.so.5 +OLD_FILES+=usr/lib/libprivateldns_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/private/libldns.a -OLD_FILES+=usr/lib32/private/libldns.so -OLD_LIBS+=usr/lib32/private/libldns.so.5 -OLD_FILES+=usr/lib32/private/libldns_p.a +OLD_FILES+=usr/lib32/libprivateldns.a +OLD_FILES+=usr/lib32/libprivateldns.so +OLD_LIBS+=usr/lib32/libprivateldns.so.5 +OLD_FILES+=usr/lib32/libprivateldns_p.a .endif .endif @@ -7199,17 +7199,17 @@ OLD_FILES+=usr/bin/ssh-keygen OLD_FILES+=usr/bin/ssh-keyscan OLD_FILES+=usr/lib/pam_ssh.so OLD_LIBS+=usr/lib/pam_ssh.so.6 -OLD_FILES+=usr/lib/private/libssh.a -OLD_FILES+=usr/lib/private/libssh.so -OLD_LIBS+=usr/lib/private/libssh.so.5 -OLD_FILES+=usr/lib/private/libssh_p.a +OLD_FILES+=usr/lib/libprivatessh.a +OLD_FILES+=usr/lib/libprivatessh.so +OLD_LIBS+=usr/lib/libprivatessh.so.5 +OLD_FILES+=usr/lib/libprivatessh_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/pam_ssh.so OLD_LIBS+=usr/lib32/pam_ssh.so.6 -OLD_FILES+=usr/lib32/private/libssh.a -OLD_FILES+=usr/lib32/private/libssh.so -OLD_LIBS+=usr/lib32/private/libssh.so.5 -OLD_FILES+=usr/lib32/private/libssh_p.a +OLD_FILES+=usr/lib32/libprivatessh.a +OLD_FILES+=usr/lib32/libprivatessh.so +OLD_LIBS+=usr/lib32/libprivatessh.so.5 +OLD_FILES+=usr/lib32/libprivatessh_p.a .endif OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign @@ -7619,8 +7619,8 @@ OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/lib/libz_p.a OLD_FILES+=usr/lib/libzfs_core_p.a OLD_FILES+=usr/lib/libzfs_p.a -OLD_FILES+=usr/lib/private/libldns_p.a -OLD_FILES+=usr/lib/private/libssh_p.a +OLD_FILES+=usr/lib/libprivateldns_p.a +OLD_FILES+=usr/lib/libprivatessh_p.a .endif .if ${MK_QUOTAS} == no @@ -8253,8 +8253,8 @@ OLD_LIBS+=usr/lib/libatf-c.a OLD_LIBS+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 OLD_LIBS+=usr/lib/libatf-c_p.a -OLD_LIBS+=usr/lib/private/libatf-c.so.0 -OLD_LIBS+=usr/lib/private/libatf-c++.so.1 +OLD_LIBS+=usr/lib/libprivateatf-c.so.0 +OLD_LIBS+=usr/lib/libprivateatf-c++.so.1 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libatf-c++.a OLD_LIBS+=usr/lib32/libatf-c++.so @@ -8265,8 +8265,8 @@ OLD_LIBS+=usr/lib32/libatf-c.a OLD_LIBS+=usr/lib32/libatf-c.so OLD_LIBS+=usr/lib32/libatf-c.so.1 OLD_LIBS+=usr/lib32/libatf-c_p.a -OLD_LIBS+=usr/lib32/private/libatf-c.so.0 -OLD_LIBS+=usr/lib32/private/libatf-c++.so.1 +OLD_LIBS+=usr/lib32/libprivateatf-c.so.0 +OLD_LIBS+=usr/lib32/libprivateatf-c++.so.1 .endif OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc @@ -8795,8 +8795,8 @@ OLD_FILES+=usr/include/atf-c/tc.h OLD_FILES+=usr/include/atf-c/tp.h OLD_FILES+=usr/include/atf-c/utils.h OLD_FILES+=usr/lib/debug/usr/bin/kyua.debug -OLD_LIBS+=usr/lib/private/libatf-c++.so.2 -OLD_LIBS+=usr/lib/private/libatf-c.so.1 +OLD_LIBS+=usr/lib/libprivateatf-c++.so.2 +OLD_LIBS+=usr/lib/libprivateatf-c.so.1 OLD_FILES+=usr/share/examples/kyua/kyua.conf OLD_FILES+=usr/share/examples/kyua/Kyuafile.top OLD_FILES+=usr/share/kyua/misc/context.html @@ -9289,15 +9289,15 @@ OLD_DIRS+=usr/tests/usr.bin/yacc .if ${MK_UNBOUND} == no OLD_FILES+=etc/rc.d/local_unbound OLD_FILES+=etc/unbound -OLD_FILES+=usr/lib/private/libunbound.a -OLD_FILES+=usr/lib/private/libunbound.so -OLD_LIBS+=usr/lib/private/libunbound.so.5 -OLD_FILES+=usr/lib/private/libunbound_p.a +OLD_FILES+=usr/lib/libprivateunbound.a +OLD_FILES+=usr/lib/libprivateunbound.so +OLD_LIBS+=usr/lib/libprivateunbound.so.5 +OLD_FILES+=usr/lib/libprivateunbound_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/private/libunbound.a -OLD_FILES+=usr/lib32/private/libunbound.so -OLD_LIBS+=usr/lib32/private/libunbound.so.5 -OLD_FILES+=usr/lib32/private/libunbound_p.a +OLD_FILES+=usr/lib32/libprivateunbound.a +OLD_FILES+=usr/lib32/libprivateunbound.so +OLD_LIBS+=usr/lib32/libprivateunbound.so.5 +OLD_FILES+=usr/lib32/libprivateunbound_p.a OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz