git: d4607d318074 - main - net/ntp: Fix stable/12 build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Jan 2022 04:46:00 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d4607d318074fa58c0b3d0172494be40998ae69f
commit d4607d318074fa58c0b3d0172494be40998ae69f
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-01-20 04:43:52 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-01-20 04:43:52 +0000
net/ntp: Fix stable/12 build
There should be no minimum to 1300524.
Reported by: Scott Allendorf <scott-allendorf@uiowa.edu>
Fixes: a6e356e8f50f92acbdec6156c068e768d1835591
MFH: 2022Q1
---
net/ntp/files/patch-ntpd_ntpd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c
index da804c897d4d..b70026785fcd 100644
--- a/net/ntp/files/patch-ntpd_ntpd.c
+++ b/net/ntp/files/patch-ntpd_ntpd.c
@@ -1,5 +1,5 @@
--- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700
-+++ ntpd/ntpd.c 2022-01-18 09:48:42.075461000 -0800
++++ ntpd/ntpd.c 2022-01-19 20:36:53.477753000 -0800
@@ -145,7 +145,9 @@
# include <seccomp.h>
#endif /* LIBSECCOMP and KERN_SECCOMP */
@@ -7,7 +7,7 @@
-#ifdef __FreeBSD__
+#if defined(__FreeBSD_version) && \
+ ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \
-+ (__FreeBSD_version > 1300000 && __FreeBSD_version < 1300524))
++ __FreeBSD_version < 1300524)
#include <sys/procctl.h>
#ifndef PROC_STACKGAP_CTL
/*