diff options
Diffstat (limited to 'pkg/openntpd/patch')
| -rw-r--r-- | pkg/openntpd/patch/0001-Set-CTLSOCKET-to-run-ntpd.sock.patch | 12 | ||||
| -rw-r--r-- | pkg/openntpd/patch/0002-Fix-build-with-old-bison-versions.patch (renamed from pkg/openntpd/patch/0004-Fix-build-with-old-bison-versions.patch) | 8 | ||||
| -rw-r--r-- | pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch | 38 | ||||
| -rw-r--r-- | pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch | 43 |
4 files changed, 10 insertions, 91 deletions
diff --git a/pkg/openntpd/patch/0001-Set-CTLSOCKET-to-run-ntpd.sock.patch b/pkg/openntpd/patch/0001-Set-CTLSOCKET-to-run-ntpd.sock.patch index 49a2c389..f355804c 100644 --- a/pkg/openntpd/patch/0001-Set-CTLSOCKET-to-run-ntpd.sock.patch +++ b/pkg/openntpd/patch/0001-Set-CTLSOCKET-to-run-ntpd.sock.patch @@ -1,4 +1,4 @@ -From 299d37f57b16a4613fabd179288039e883c161cb Mon Sep 17 00:00:00 2001 +From 2760ceff5d4817963fb7882bfaf8852c8dc4460c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 11 Aug 2017 23:08:10 -0700 Subject: [PATCH] Set CTLSOCKET to /run/ntpd.sock @@ -8,18 +8,18 @@ Subject: [PATCH] Set CTLSOCKET to /run/ntpd.sock 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ntpd.h b/src/ntpd.h -index 39b8e7b..41a0b22 100644 +index ced81b9ff..7364c5aa8 100644 --- a/src/ntpd.h +++ b/src/ntpd.h -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #define LOCALSTATEDIR "/var" #endif #define DRIFTFILE LOCALSTATEDIR "/db/ntpd.drift" -#define CTLSOCKET LOCALSTATEDIR "/run/ntpd.sock" +#define CTLSOCKET "/run/ntpd.sock" - #if defined(SO_SETFIB) - #define SO_RTABLE SO_SETFIB + #define INTERVAL_QUERY_NORMAL 30 /* sync to peers every n secs */ + #define INTERVAL_QUERY_PATHETIC 60 -- -2.14.1 +2.29.2 diff --git a/pkg/openntpd/patch/0004-Fix-build-with-old-bison-versions.patch b/pkg/openntpd/patch/0002-Fix-build-with-old-bison-versions.patch index 446df021..e4ec6574 100644 --- a/pkg/openntpd/patch/0004-Fix-build-with-old-bison-versions.patch +++ b/pkg/openntpd/patch/0002-Fix-build-with-old-bison-versions.patch @@ -1,4 +1,4 @@ -From b204244b9e678064b7b519e049030bb0aeb029ed Mon Sep 17 00:00:00 2001 +From 10b2b1ed0b275a0594033872104a53645c8b245c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Wed, 15 Apr 2020 20:10:16 -0700 Subject: [PATCH] Fix build with old bison versions @@ -8,10 +8,10 @@ Subject: [PATCH] Fix build with old bison versions 1 file changed, 1 insertion(+) diff --git a/src/parse.y b/src/parse.y -index eb7e9b9..7ae236b 100644 +index 4a101bcd6..742108c51 100644 --- a/src/parse.y +++ b/src/parse.y -@@ -79,6 +79,7 @@ typedef struct { +@@ -80,6 +80,7 @@ typedef struct { } v; int lineno; } YYSTYPE; @@ -20,5 +20,5 @@ index eb7e9b9..7ae236b 100644 %} -- -2.26.1 +2.29.2 diff --git a/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch b/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch deleted file mode 100644 index 5d88aebb..00000000 --- a/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2cb7923eeee6b66e083f52fb2979318a026ff8b5 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sat, 15 Jun 2019 19:42:17 -0700 -Subject: [PATCH] Remove duplicate definitions - ---- - src/ntp.c | 1 - - src/ntp_dns.c | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/ntp.c b/src/ntp.c -index f7a6ede..a3d0036 100644 ---- a/src/ntp.c -+++ b/src/ntp.c -@@ -43,7 +43,6 @@ - volatile sig_atomic_t ntp_quit = 0; - struct imsgbuf *ibuf_main; - struct imsgbuf *ibuf_dns; --struct ntpd_conf *conf; - struct ctl_conns ctl_conns; - u_int peer_cnt; - u_int sensors_cnt; -diff --git a/src/ntp_dns.c b/src/ntp_dns.c -index c194324..694257c 100644 ---- a/src/ntp_dns.c -+++ b/src/ntp_dns.c -@@ -33,7 +33,7 @@ - #include "ntpd.h" - - volatile sig_atomic_t quit_dns = 0; --struct imsgbuf *ibuf_dns; -+extern struct imsgbuf *ibuf_dns; - - void sighdlr_dns(int); - int dns_dispatch_imsg(void); --- -2.20.1 - diff --git a/pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch b/pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch deleted file mode 100644 index a938fa72..00000000 --- a/pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1a01dd331508160aeda3563dbbb6f62aa60c2156 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 20 Jun 2019 13:52:22 -0700 -Subject: [PATCH] Provide fallback definition for __packed -Upstream: https://github.com/openntpd-portable/openntpd-portable/pull/56 - -Otherwise, systems that don't support it will treat it as a name for a -global `struct ntp_msg` variable. ---- - include/sys/types.h | 4 ++++ - m4/check-os-options.m4 | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/include/sys/types.h b/include/sys/types.h -index 86821c7..5492e20 100644 ---- a/include/sys/types.h -+++ b/include/sys/types.h -@@ -22,6 +22,10 @@ - # define __bounded__(x, y, z) - #endif - -+#if !defined(HAVE_ATTRIBUTE__PACKED) && !defined(__packed) -+# define __packed __attribute__((__packed__)) -+#endif -+ - /* - * Define BSD-style unsigned bits types for systems that do not have them. - */ -diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 -index d4d02d9..4883d1f 100644 ---- a/m4/check-os-options.m4 -+++ b/m4/check-os-options.m4 -@@ -69,6 +69,7 @@ case $host_os in - HOST_ABI=elf - AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded]) - AC_DEFINE([HAVE_ATTRIBUTE__DEAD], [1], [OpenBSD gcc has __dead]) -+ AC_DEFINE([HAVE_ATTRIBUTE__PACKED], [1], [OpenBSD gcc has __packed]) - ;; - *solaris*) - HOST_OS=solaris --- -2.20.1 - |