Re: git: 8dc43f07dc66 - main - net/ntp: Reverse "Disable ntpd stack gap"

Hi Cy,

sob., 16 paź 2021 o 16:46 Cy Schubert <Cy.Schubert@cschubert.com> napisał(a):
>
> In message <CACNAnaEP=YWLpws9M2-H+YZBH5m=D+1N_YShhVY7HWQ23jOjEw@mail.gmail.c
> om>
> , Kyle Evans writes:
> > On Fri, Oct 15, 2021 at 10:59 PM Cy Schubert <cy@freebsd.org> wrote:
> > >
> > > The branch main has been updated by cy:
> > >
> > > URL: https://cgit.FreeBSD.org/ports/commit/?id=8dc43f07dc662e4e7404b5521ba0
> > 3c2e7f25470a
> > >
> > > commit 8dc43f07dc662e4e7404b5521ba03c2e7f25470a
> > > Author:     Cy Schubert <cy@FreeBSD.org>
> > > AuthorDate: 2021-10-16 03:50:11 +0000
> > > Commit:     Cy Schubert <cy@FreeBSD.org>
> > > CommitDate: 2021-10-16 03:59:14 +0000
> > >
> > >     net/ntp: Reverse "Disable ntpd stack gap"
> > >
> > >     120137c822c9697c19cf94461f436f8ccc372d24 (svn r517694) disabled ntpd
> > >     ASLR stack gap, which caused ntpd to segfault. (The patch in
> > >     120137c822c9697c19cf94461f436f8ccc372d24 was subsequently submitted
> > >     to nwtime.org for inclusion into upstream ntp.) src commit
> > >     889b56c8cd84c9a9f2d9e3b019c154d6f14d9021 addressed the underlying cause
> > >     for the setrlimit segfault negating the need for this workaround. This
> > >     commit removes the workaround.
> > >
> > >     MFH:            2021Q4 (after a month)
> >
> > Er, stack gap landed in 13.0, didn't it? I think you still need this
> > for the time being, at least gated behind a check for 13.0.
>
> I suppose a __FreeBSD_version bump on -CURRENT and subsequently on
> stable/13 when it's MFCed would be of benefit. Thoughts?
>
>

I agree, that the changes are worth to be reflected in the version
bump on both branches.
WRT HEAD it was modified on Oct 17:
https://cgit.freebsd.org/src/commit/?id=0d6516b453469ce1d92ec903c4c4df9ee08be0f9
so I think that's enough.

Best regards,
Marcin