Re: git: 801c452795ac - main - man9: Really complete the removal of MD5.9

On 7/29/24 15:18, Warner Losh wrote:
> Hey John,
> 
> On Mon, Jul 29, 2024 at 11:55 AM John Baldwin <jhb@freebsd.org> wrote:
> 
>> On 7/29/24 13:40, Warner Losh wrote:
>>> On Mon, Jul 29, 2024 at 10:39 AM Mark Johnston <markj@freebsd.org>
>> wrote:
>>>
>>>> On Mon, Jul 29, 2024 at 11:31:19PM +0700, Yuri Pankov wrote:
>>>>> Mark Johnston wrote:
>>>>>> The branch main has been updated by markj:
>>>>>>
>>>>>> URL:
>>>>
>> https://cgit.FreeBSD.org/src/commit/?id=801c452795ac441523655eb3277051b7b034becf
>>>>>>
>>>>>> 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
>>>>>>
>>>>>>       man9: Really complete the removal of MD5.9
>>>>>>
>>>>>>       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(-)
>>>>>>
>>>>>> diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
>>>>>> index b21778466800..01b4824e8692 100644
>>>>>> --- a/ObsoleteFiles.inc
>>>>>> +++ b/ObsoleteFiles.inc
>>>>>> @@ -56,6 +56,8 @@ OLD_FILES+=usr/share/man/man9/ifaddr_byindex.9.gz
>>>>>>
>>>>>>    # 20240729: remove MD5(9)
>>>>>>    OLD_FILES+=usr/share/man/man9/MD5.9.gz
>>>>>> +OLD_FILES+=usr/share/man/man9/MD5Init.9
>>>>>> +OLD_FILES+=usr/share/man/man9/MD5Transform.9
>>>>>
>>>>> This really needs to be smarter, but you have to specify .gz suffix for
>>>>> man entries as we have compression enabled by default.
>>>>
>>>> Sigh, who knew it was so difficult to remove a man page.
>>>>
>>>
>>> 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.
>>
>> 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?
>>
> 
> 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?

This is solving a different problem.  This is dealing with removing duplicate
copies e.g. when switching from WITH_MANCOMPRESS=yes to WITHOUT_MANCOMPRESS=yes.

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.

-- 
John Baldwin