From nobody Mon Oct 18 10:17:35 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1E2E41813BDB for ; Mon, 18 Oct 2021 10:17:47 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HXt9Q33D6z4rXx for ; Mon, 18 Oct 2021 10:17:46 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-yb1-xb2b.google.com with SMTP id d131so965157ybd.5 for ; Mon, 18 Oct 2021 03:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=lYAT3jbsxp3+d7QoYKlg8L31Uj8fOLslBtIPCHNEXNM=; b=UXT+KFI984y6Nzmi0vCowO22Jo3URA9UazMoG6RZ93v/BtdC9OPye3Jp2tXUuP5+sA 6Jl0TOETHD04be3ZOpAVwPXY+zJjLtl2gHP7UH3tTfdqKVL+KCfHegGWkgkIMvBcOS8F prtTTH9oMUHE+dIdwWXtNYMQ7L1iS/dcVfsC38KQsRO3U9vlTTaYJ9g1Q0BEDZuLkEpR CBi7Ml/lj9tXaW01G7xLI7W8w64076slI23pLg7EalpI8fhTDnhGqIwlR+m7IxCUH+DM mygEySyIvzrEJgK6ne7M9/x1H5Bbqjbd9EIjF+twFOnXfT4VEiX6ne5fCaNh7YZPbKcb FsHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=lYAT3jbsxp3+d7QoYKlg8L31Uj8fOLslBtIPCHNEXNM=; b=Rnxdcq8deaGwe4d8nwU7j2Qa4JmMAVH7d+NwcAL2wh6vN+8Ow99ntUVzyw140lFy/y ADgIUksn40jI3R4go4PFVFIc1UGMS6I1u5ZWDX+J7nW78EbZk3HV9rtRPUHf1iqlwv1K NGppDVCNtwK+6x8PU849Ibw4dn0as/ydQx1KEpQIgUuuG80J65OrReFyn0sB/EmU20Lr f75jpQfMu44xEzqH09sclKkNl7cMy4oiW0fyRcNkEoEJXCU4ss3sZhhoR/b1BlN4oPh1 T4n7HQvE9eUPHjMj5/6a9zNyXFzJP6/rYRUqLg0UfsI0QQx2cP2B2kP3xWaKmYdHH2WS k7hQ== X-Gm-Message-State: AOAM531BWY5EEYyxX6awG6LLKHRGXRDNql73vrlSZp2UQJhrjr455jor i7imy6eDZjJppZPQzloXcovDileLIkir/QgpW1Bjkw== X-Google-Smtp-Source: ABdhPJxpWc9abNqigltGk59ghzapWvMOdAJPNGsW77bRphEJVkfERsj47rirszukvJcejvz1gB/YDRLt25VUjjUtzOY= X-Received: by 2002:a25:d09:: with SMTP id 9mr26566654ybn.94.1634552265755; Mon, 18 Oct 2021 03:17:45 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202110160359.19G3xJZ0004440@gitrepo.freebsd.org> <202110161445.19GEjx4Y006148@slippy.cwsent.com> In-Reply-To: <202110161445.19GEjx4Y006148@slippy.cwsent.com> From: Marcin Wojtas Date: Mon, 18 Oct 2021 12:17:35 +0200 Message-ID: Subject: Re: git: 8dc43f07dc66 - main - net/ntp: Reverse "Disable ntpd stack gap" To: Cy Schubert Cc: Kyle Evans , Marcin Wojtas , Cy Schubert , ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4HXt9Q33D6z4rXx X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=semihalf-com.20210112.gappssmtp.com header.s=20210112 header.b=UXT+KFI9; dmarc=none; spf=none (mx1.freebsd.org: domain of mw@semihalf.com has no SPF policy when checking 2607:f8b0:4864:20::b2b) smtp.mailfrom=mw@semihalf.com X-Spamd-Result: default: False [0.70 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[semihalf-com.20210112.gappssmtp.com:s=20210112]; FREEFALL_USER(0.00)[mw]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-ports-main@freebsd.org]; DMARC_NA(0.00)[semihalf.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[semihalf-com.20210112.gappssmtp.com:+]; NEURAL_SPAM_LONG(1.00)[1.000]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b2b:from]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi Cy, sob., 16 pa=C5=BA 2021 o 16:46 Cy Schubert napi= sa=C5=82(a): > > In message om> > , Kyle Evans writes: > > On Fri, Oct 15, 2021 at 10:59 PM Cy Schubert 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 > > > AuthorDate: 2021-10-16 03:50:11 +0000 > > > Commit: Cy Schubert > > > 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