Date: Thu, 20 Jan 2022 00:49:01 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 46e89c3461ac - 2022Q1 - net/ntp: Reverse "Disable ntpd stack gap" for stable/13 Message-ID: <202201200049.20K0n1jN039517@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=46e89c3461ac097b224f754904bf1bf2e869a1eb commit 46e89c3461ac097b224f754904bf1bf2e869a1eb Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-01-18 17:54:34 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-01-20 00:48:49 +0000 net/ntp: Reverse "Disable ntpd stack gap" for stable/13 As stack gap mitigations have been MFCed to stable/13, reverse "Disable ntpd stack gap" for __FreeBSD_version < 1300524 too. (cherry picked from commit a6e356e8f50f92acbdec6156c068e768d1835591) --- net/ntp/Makefile | 2 +- net/ntp/files/patch-ntpd_ntpd.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index a1c62f232060..de084df97545 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c index 39c7af05780b..da804c897d4d 100644 --- a/net/ntp/files/patch-ntpd_ntpd.c +++ b/net/ntp/files/patch-ntpd_ntpd.c @@ -1,15 +1,17 @@ --- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700 -+++ ntpd/ntpd.c 2021-10-16 07:59:32.497688000 -0700 -@@ -145,7 +145,7 @@ ++++ ntpd/ntpd.c 2022-01-18 09:48:42.075461000 -0800 +@@ -145,7 +145,9 @@ # include <seccomp.h> #endif /* LIBSECCOMP and KERN_SECCOMP */ -#ifdef __FreeBSD__ -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400038 ++#if defined(__FreeBSD_version) && \ ++ ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \ ++ (__FreeBSD_version > 1300000 && __FreeBSD_version < 1300524)) #include <sys/procctl.h> #ifndef PROC_STACKGAP_CTL /* -@@ -438,7 +438,7 @@ +@@ -438,7 +440,7 @@ char *argv[] ) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201200049.20K0n1jN039517>