The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93
commit a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 Author: Ed Maste <[email protected]> AuthorDate: 2025-10-20 16:16:21 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2025-10-20 17:10:44 +0000 libc: Avoid installing timezone.3 multiple times Commit a34940a9756a ("timezone: Move to the XSI/POSIX definition for timezone") was not merged to stable/14. The MFC of 29810aa6ae70 ("libc: Move tzset.3 to stdtime") didn't take this into account and ended up installing two different versions of timezone.3 over top of each other. This is a direcct commit to stable/14 as the issue is not present in main. If a34940a9756a gets merged in the future the reverted part of 29810aa6ae70 will need to be reapplied. Fixes: 29810aa6ae70 ("libc: Move tzset.3 to stdtime") Sponsored by: The FreeBSD Foundation --- lib/libc/stdtime/Makefile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc index 842166201fd1..1c5880797f43 100644 --- a/lib/libc/stdtime/Makefile.inc +++ b/lib/libc/stdtime/Makefile.inc @@ -31,5 +31,4 @@ MLINKS+=strftime.3 strftime_l.3 MLINKS+=strptime.3 strptime_l.3 MLINKS+=time2posix.3 posix2time.3 MLINKS+=tzset.3 daylight.3 \ - tzset.3 timezone.3 \ tzset.3 tzname.3
