cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/ntp: Fix build on older FreeBSD

Browse Source 
Fix stackgap build on older FreeBSD.

PR:		261491
Reported by:	tomasz.sowinski@nucleus.malbork.pl
MFH:		2022Q1
This commit is contained in:
Cy Schubert 2022-01-26 10:18:22 -08:00
parent 0c38674b38
commit 646499bcb3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ntp/files/patch-ntpd_ntpd.c
View File

@ -1,5 +1,5 @@
--- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700 --- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700
+++ ntpd/ntpd.c 2022-01-19 20:36:53.477753000 -0800 +++ ntpd/ntpd.c 2022-01-26 10:14:00.828563000 -0800
@@ -145,7 +145,9 @@ @@ -145,7 +145,9 @@
# include <seccomp.h> # include <seccomp.h>
#endif /* LIBSECCOMP and KERN_SECCOMP */ #endif /* LIBSECCOMP and KERN_SECCOMP */
@ -11,12 +11,14 @@
#include <sys/procctl.h> #include <sys/procctl.h>
#ifndef PROC_STACKGAP_CTL #ifndef PROC_STACKGAP_CTL
/* /*
@@ -438,7 +440,7 @@ @@ -438,7 +440,9 @@
char *argv[] char *argv[]
) )
{ {
-# ifdef __FreeBSD__ -# ifdef __FreeBSD__
+# if defined(__FreeBSD_version) && __FreeBSD_version < 1400037 +# if defined(__FreeBSD_version) && \
+ ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \
+ __FreeBSD_version < 1300524)
{ {
/* /*
* We Must disable ASLR stack gap on FreeBSD to avoid a * We Must disable ASLR stack gap on FreeBSD to avoid a