git: 8d5e8dfdc22c - stable/15 - ObsoleteFiles.inc: revert accidental merge failure

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 04 Mar 2026 17:57:29 UTC

The branch stable/15 has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=8d5e8dfdc22c52bc944d80d5a8811373de001517

commit 8d5e8dfdc22c52bc944d80d5a8811373de001517
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-03-04 17:56:30 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-03-04 17:56:30 +0000

    ObsoleteFiles.inc: revert accidental merge failure
    
    Reported by:    des
---
 ObsoleteFiles.inc | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3b7907085f9c..4a92f2778d8c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -75,22 +75,6 @@ OLD_FILES+=usr/lib/libkrb5profile.so
 # 20251218: Remove old MLINK to apmconf(8)
 OLD_FILES+=usr/share/man/man8/apmconf.8.gz
 
-# 20251215: Remove intrinsic utilities
-OLD_FILES+=usr/bin/alias
-OLD_FILES+=usr/bin/bg
-OLD_FILES+=usr/bin/cd
-OLD_FILES+=usr/bin/fc
-OLD_FILES+=usr/bin/fg
-OLD_FILES+=usr/bin/getopts
-OLD_FILES+=usr/bin/hash
-OLD_FILES+=usr/bin/jobs
-OLD_FILES+=usr/bin/read
-OLD_FILES+=usr/bin/type
-OLD_FILES+=usr/bin/ulimit
-OLD_FILES+=usr/bin/umask
-OLD_FILES+=usr/bin/unalias
-OLD_FILES+=usr/bin/wait
-
 # 20251208: Rename iwm8000C to correct name.
 OLD_FILES+=boot/firmware/iwm8000C