From nobody Thu Jan 20 20:50:22 2022 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 B15D6196724B; Thu, 20 Jan 2022 20:50:23 +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 4Jfvlz2QFsz4d2f; Thu, 20 Jan 2022 20:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642711823; 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=gu8XdGCNa2jpFDGbyEUIMogSxetmWw5PmmNM+dcfUio=; b=xzQgUAHUluUusfw0pdMAEjNmx2wPeCnypGuWXQlsjTY2dgdq55nc4ZwGjtSxZ5mgLFz6Z4 4AGIypnk8H6tOzke/eNFRDcK2zjADYEdLlgyo1unKRGZJZgLBdrIp09qlDweN9MBNA2V+Q 8VQFBnL03eeKJXood8DJvp7q7onqPCS5/zNdTy0xHdxBGGobhmwVy+/D8NehFn0WD1+NN6 xBh14Fv1xXPo8mTbslt2A+8sE9MgQ2Ba6rblHqnFHePb5xkkgj6xpraM6W+WFrVXQNDsin p1+c5UbvtTxvceG/AXXKWaEBqspWYyIIdphUU3TkAvx0xoy4moA/uqqEHLC/yA== 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 1171472AA; Thu, 20 Jan 2022 20:50:23 +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 20KKoM62055649; Thu, 20 Jan 2022 20:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KKoMlZ055648; Thu, 20 Jan 2022 20:50:22 GMT (envelope-from git) Date: Thu, 20 Jan 2022 20:50:22 GMT Message-Id: <202201202050.20KKoMlZ055648@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: f033840b253e - main - Use MOVED_LIBS for the libalias modules being moved to /lib. 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: f033840b253ebb28eee25beafde4d6863f5f6e57 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642711823; 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=gu8XdGCNa2jpFDGbyEUIMogSxetmWw5PmmNM+dcfUio=; b=DmTKdxzz5+Ccs4Kou7mXkWoLkrvcwzLERGpx848bI2/bLQlo+0B2ZZ5r7zvhuJ2YsA3Z6l E26KDk8MEx4sQa1m0ceJqmSE3x951IXHKa5rr/cHwBFbAA9+8RXjyxezfb9DXH1YINBksq SHXPdW6u848KdcM0nOoP6rI4hz2Rjz2gCqKELBiiEa0qXU8iuGdOVN1WgB6oIDrkjtzbpH EXqyhu5SI/B6k/NaGCR2RWhgUcOkIKxrSTV/4fOjsHtoaQIyZUane/LjIT77Nmqete3egE HpzHC8aY+xZ2G8iv7eNKdcFjF7874FhgPacfJOI3md8+nl0TcF2xSb/+kprmfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642711823; a=rsa-sha256; cv=none; b=cXf+n9o6UR4LnBW30QuL8JPeBMzPQEmrhrxoVrrjOsF36D0kQWDCoXVQKLsWWMJ/QaArEM IzGYtpogZ20SAezUAvwyKWyE/j6tQGKMoE75x3uNxZFUk7a1JTWQTidybXPT/yNoD0t9VR WAYCPWNSr8ht9T2mPukrrtAzevNPDiyJQ6HPY5Vs1dNkMt2wTRLAd1/uyjABLKGTcEhQcg 22YrZCxePEyusWEYLmbvSFpf3eGVtdLMWVjUabCAaxOm2EyU50mZdPhKecRrzSJ8EI/RTk T4aHprRfAUbwju8qNo2srZML54txdHRKQ2xWdck84toID+Zw+X9jd373gC7CyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f033840b253ebb28eee25beafde4d6863f5f6e57 commit f033840b253ebb28eee25beafde4d6863f5f6e57 Author: John Baldwin AuthorDate: 2022-01-20 20:48:24 +0000 Commit: John Baldwin CommitDate: 2022-01-20 20:48:24 +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 --- ObsoleteFiles.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6c3f0f563461..74d7bbf2e442 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14261,16 +14261,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