Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Jul 2022 16:06:40 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 29434f6ee720 - stable/13 - Use MOVED_LIBS for the libalias modules being moved to /lib.
Message-ID:  <202207131606.26DG6eoV097809@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=29434f6ee7203bc9774cfde36d0917fd2f1b7218

commit 29434f6ee7203bc9774cfde36d0917fd2f1b7218
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-20 20:48:24 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207131606.26DG6eoV097809>