From nobody Wed Jul 13 16:06:40 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 1AC921D0CCB5; Wed, 13 Jul 2022 16:06:41 +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 4LjjDJ4c9xz3PtK; Wed, 13 Jul 2022 16:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657728400; 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=g9ZSpLEeLX6Ar83Q+Rum5OsuWKqfHyff/r/YIrVbP9U=; b=XxfQrkg5W0JQxstkAnv/YCbS4emixBLgO9VTQhpVsQYGl3I+j/modKJfcIk5EuzjX8+Kg+ YcW5xy8rJL9WCtJMwfm7Mi1tT/v/u+bwt3t7KY9RukKPkSxdb1pDEuiWE1r/P444pf4KQ4 pXaRI6FE2nZEhGPQl9EhG5rWbQkfBs/W6i5FfZsjwQdYD3MYq5rRn/k2wrg2viF4FZQvA+ JB+UxK6KFIaU3H42W00X5hJutDnu750BGzAMS/0IroYSy64QzDKVoHCdeeuUO+mM5Q6eVf xXsLwKc0354Ly6hyeJcsxKT+k6jgp3H12xd8BdfdPi/KeCdjSRehQSvHIKKRDg== 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 4LjjDJ3hB3zTjC; Wed, 13 Jul 2022 16:06:40 +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 26DG6erO097810; Wed, 13 Jul 2022 16:06:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DG6eoV097809; Wed, 13 Jul 2022 16:06:40 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:06:40 GMT Message-Id: <202207131606.26DG6eoV097809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 29434f6ee720 - stable/13 - Use MOVED_LIBS for the libalias modules being moved to /lib. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29434f6ee7203bc9774cfde36d0917fd2f1b7218 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657728400; 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=g9ZSpLEeLX6Ar83Q+Rum5OsuWKqfHyff/r/YIrVbP9U=; b=kbRxn9gMf/unpqXVF8gHbLJa5lhzVXoo7wHRA9+tcSFQUBvj4jfuVI8r16tzCqOodZSZeP GEQFbZ50C90HsWwr0MrsVUhjiYgKeRpuDTBJmJjRUCTcTJQheUd1U0AQQeExhcVjf1OLIL WdYm7LWD7saNWRsuhNhA2Gge4UCcCB+uSEAjNTLnAexx/HHR6XR1XuQ6egHqYCmX/qF0Zr KSiuJpdlL88f9aPqqs+pNpaRHpqxLHrbiH4zuW1DWymTkceFoRzrBUv6x8S7QRK3JRTuH+ xFRIFkNRmfniDCr/jGNIutDubl2lt4SDnwl3J336Egm7gPtnQ1tZtMthd1sCdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657728400; a=rsa-sha256; cv=none; b=l1VguwQHIBi0UVrREhDhIZXDA39H/0r4YuiO/LDZwaQERtf9QGV79JPQLiHGdiYzArWEQ/ /35NIufYjQW9aJz0OB1BZ2T2lsdEM+5jVhTK1hfdlMbT1l6lSOOMsrzGBgdX3tCmUhL6YF 2SFTlOHgZXMMg8vMUChYbCgdEvUVtDkr0YARIQJrNlBsffJpo1nKVTlvWRrYM+e2WrkSNz v69PP7udRaQfVLth9e0NXoArUkoiswGe3O2DL1TB8tI/tJgDUbfib5jOWPI+Shq6h6IY2h LC5sOIfeTOTsNjubmXGqYTdoPvBZcxl9roG1EMm03vktUNNMuXdDrB7kzH21hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=29434f6ee7203bc9774cfde36d0917fd2f1b7218 commit 29434f6ee7203bc9774cfde36d0917fd2f1b7218 Author: John Baldwin AuthorDate: 2022-01-20 20:48:24 +0000 Commit: John Baldwin CommitDate: 2022-07-13 15:44:21 +0000 Use MOVED_LIBS for the libalias modules being moved to /lib. This is a bit more unusual in that the modules dropped their major version suffix at the same time, so the old files being removed by MOVED_LIBS in this case are the symlinks to the old libraries. Reviewed by: emaste Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33849 (cherry picked from commit f033840b253ebb28eee25beafde4d6863f5f6e57) --- ObsoleteFiles.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e7958fb23a25..d1943a6ed555 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -12097,16 +12097,17 @@ OLD_FILES+=usr/bin/objformat OLD_FILES+=usr/share/man/man1/objformat.1.gz OLD_FILES+=usr/include/objformat.h OLD_FILES+=usr/share/man/man3/getobjformat.3.gz -# 20061201: remove symlink to *.so.4 libalias modules -OLD_FILES+=usr/lib/libalias_cuseeme.so -OLD_FILES+=usr/lib/libalias_dummy.so -OLD_FILES+=usr/lib/libalias_ftp.so -OLD_FILES+=usr/lib/libalias_irc.so -OLD_FILES+=usr/lib/libalias_nbt.so -OLD_FILES+=usr/lib/libalias_pptp.so -OLD_FILES+=usr/lib/libalias_skinny.so -OLD_FILES+=usr/lib/libalias_smedia.so -# 20061201: remove old *.so.4 libalias modules +# 20061008: rename *.so.4 libalias modules to *.so and move to /lib +# This uses MOVED_LIBS because the new files are libraries even though +# the old files to remove are symlinks +MOVED_LIBS+=usr/lib/libalias_cuseeme.so +MOVED_LIBS+=usr/lib/libalias_dummy.so +MOVED_LIBS+=usr/lib/libalias_ftp.so +MOVED_LIBS+=usr/lib/libalias_irc.so +MOVED_LIBS+=usr/lib/libalias_nbt.so +MOVED_LIBS+=usr/lib/libalias_pptp.so +MOVED_LIBS+=usr/lib/libalias_skinny.so +MOVED_LIBS+=usr/lib/libalias_smedia.so OLD_LIBS+=lib/libalias_cuseeme.so.4 OLD_LIBS+=lib/libalias_dummy.so.4 OLD_LIBS+=lib/libalias_ftp.so.4