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