Date: Mon, 18 Oct 2021 12:17:35 +0200 From: Marcin Wojtas <mw@semihalf.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Kyle Evans <kevans@freebsd.org>, Marcin Wojtas <mw@freebsd.org>, Cy Schubert <cy@freebsd.org>, ports-committers <ports-committers@freebsd.org>, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 8dc43f07dc66 - main - net/ntp: Reverse "Disable ntpd stack gap" Message-ID: <CAPv3WKdCCv6HP9KwS43f4R7g%2BRhDF8GUFDLYE4wCAjGnvZ2JtQ@mail.gmail.com> In-Reply-To: <202110161445.19GEjx4Y006148@slippy.cwsent.com> References: <202110160359.19G3xJZ0004440@gitrepo.freebsd.org> <CACNAnaEP=YWLpws9M2-H%2BYZBH5m=D%2B1N_YShhVY7HWQ23jOjEw@mail.gmail.com> <202110161445.19GEjx4Y006148@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Cy, sob., 16 pa=C5=BA 2021 o 16:46 Cy Schubert <Cy.Schubert@cschubert.com> napi= sa=C5=82(a): > > In message <CACNAnaEP=3DYWLpws9M2-H+YZBH5m=3DD+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=3D8dc43f07dc662e4e7404= b5521ba0 > > 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 n= tpd > > > ASLR stack gap, which caused ntpd to segfault. (The patch in > > > 120137c822c9697c19cf94461f436f8ccc372d24 was subsequently submitt= ed > > > 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=3D0d6516b453469ce1d92ec903c4c4df9ee= 08be0f9 so I think that's enough. Best regards, Marcin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPv3WKdCCv6HP9KwS43f4R7g%2BRhDF8GUFDLYE4wCAjGnvZ2JtQ>