Date: Tue, 30 Jul 2024 15:00:04 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: John Baldwin <jhb@FreeBSD.org> Cc: Warner Losh <imp@bsdimp.com>, Mark Johnston <markj@freebsd.org>, Yuri Pankov <yuri@aetern.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 801c452795ac - main - man9: Really complete the removal of MD5.9 Message-ID: <C7712F53-97BB-4AC1-A895-8E9C282D4878@freebsd.org> In-Reply-To: <c5d1ca16-bffb-4ad4-a6d3-25eaf81f49da@FreeBSD.org> References: <202407291431.46TEVQow094080@gitrepo.freebsd.org> <63334eb1-7af6-439a-89a0-ba379428c5a6@aetern.org> <ZqfFpMXKXIZUjBdX@nuc> <CANCZdfreRtEpAn8s-Zj-VsNvArmVz7hMaLwTFbZsvrtRj40PjA@mail.gmail.com> <a177fef6-63dc-46ba-a7c4-5be5afb1c321@FreeBSD.org> <CANCZdfrXg-m%2BerGy%2BKbxypaogvMUuhaqWiY7YNaimC13jxngzw@mail.gmail.com> <c5d1ca16-bffb-4ad4-a6d3-25eaf81f49da@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 30 Jul 2024, at 14:52, John Baldwin <jhb@FreeBSD.org> wrote: >=20 > On 7/29/24 15:18, Warner Losh wrote: >> Hey John, >> On Mon, Jul 29, 2024 at 11:55=E2=80=AFAM John Baldwin = <jhb@freebsd.org> wrote: >>> On 7/29/24 13:40, Warner Losh wrote: >>>> On Mon, Jul 29, 2024 at 10:39=E2=80=AFAM Mark Johnston = <markj@freebsd.org> >>> wrote: >>>>=20 >>>>> On Mon, Jul 29, 2024 at 11:31:19PM +0700, Yuri Pankov wrote: >>>>>> Mark Johnston wrote: >>>>>>> The branch main has been updated by markj: >>>>>>>=20 >>>>>>> URL: >>>>>=20 >>> = https://cgit.FreeBSD.org/src/commit/?id=3D801c452795ac441523655eb3277051b7= b034becf >>>>>>>=20 >>>>>>> commit 801c452795ac441523655eb3277051b7b034becf >>>>>>> Author: Mark Johnston <markj@FreeBSD.org> >>>>>>> AuthorDate: 2024-07-29 14:12:40 +0000 >>>>>>> Commit: Mark Johnston <markj@FreeBSD.org> >>>>>>> CommitDate: 2024-07-29 14:17:04 +0000 >>>>>>>=20 >>>>>>> man9: Really complete the removal of MD5.9 >>>>>>>=20 >>>>>>> Fixes: 46b0db2dbe9f ("Remove unnecessary and now = inaccurate >>>>> kernel side manual page.") >>>>>>> Fixes: 36d68cb2ddd2 ("Complete the removal of the MD5 = manual >>> page >>>>> from section 9.") >>>>>>> --- >>>>>>> ObsoleteFiles.inc | 2 ++ >>>>>>> share/man/man9/Makefile | 2 -- >>>>>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>>>>>=20 >>>>>>> diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc >>>>>>> index b21778466800..01b4824e8692 100644 >>>>>>> --- a/ObsoleteFiles.inc >>>>>>> +++ b/ObsoleteFiles.inc >>>>>>> @@ -56,6 +56,8 @@ = OLD_FILES+=3Dusr/share/man/man9/ifaddr_byindex.9.gz >>>>>>>=20 >>>>>>> # 20240729: remove MD5(9) >>>>>>> OLD_FILES+=3Dusr/share/man/man9/MD5.9.gz >>>>>>> +OLD_FILES+=3Dusr/share/man/man9/MD5Init.9 >>>>>>> +OLD_FILES+=3Dusr/share/man/man9/MD5Transform.9 >>>>>>=20 >>>>>> This really needs to be smarter, but you have to specify .gz = suffix for >>>>>> man entries as we have compression enabled by default. >>>>>=20 >>>>> Sigh, who knew it was so difficult to remove a man page. >>>>>=20 >>>>=20 >>>> There is a pull request being worked on that will be smarter about = what's >>>> removed since we have compress (UFS) and uncompress (ZFS) setups >>>> now. >>>=20 >>> Does it just add an OLD_MAN helper variable to use instead of = OLD_FILES >>> and then try the various extension combinations for each OLD_MAN? >>>=20 >> https://github.com/freebsd/freebsd-src/pull/1295 >> was submitted a bit ago. the repetition is why I've not committed it. = Is an >> approach >> like that good, or should we move all the old man pages to OLD_MAN? >=20 > This is solving a different problem. This is dealing with removing = duplicate > copies e.g. when switching from WITH_MANCOMPRESS=3Dyes to = WITHOUT_MANCOMPRESS=3Dyes. >=20 > OLD_MAN would be orthogonal. It would be similar to how we use extra = logic > for OLD_LIBS where we look for debug symbols in /usr/lib/debug to = remove along > with the library. For OLD_MAN we would try to remove both $f and = $f.gz. list-old-files already has: -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n=E2=80=9D So as long as you list the manpages with a .gz suffix it=E2=80=99ll = already handle the uncompressed version. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C7712F53-97BB-4AC1-A895-8E9C282D4878>