commit: ce79db6bc2504e866c89dd479224e29cf46f2df6
parent cc7c043292575605419e8e148120c1faf47d7b95
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 7 Dec 2020 23:22:26 -0800
openntpd: Update to 6.8p1
Diffstat:
10 files changed, 85 insertions(+), 150 deletions(-)
diff --git a/pkg/openntpd/.gitignore b/pkg/openntpd/.gitignore
@@ -1,2 +1,2 @@
-/openntpd-6.2p3.tar.gz
+/openntpd-6.8p1.tar.gz
/src
diff --git a/pkg/openntpd/config.h b/pkg/openntpd/config.h
@@ -1,56 +1,72 @@
-#define __dead _Noreturn
-#define PACKAGE_NAME "OpenNTPD"
-#define PACKAGE_TARNAME "openntpd"
-#define PACKAGE_VERSION "6.2p3"
-#define PACKAGE_STRING "OpenNTPD 6.2p3"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_URL ""
-#define PACKAGE "openntpd"
-#define VERSION "6.2p3"
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_DLFCN_H 1
-#define LT_OBJDIR ".libs/"
-#define SPT_TYPE SPT_REUSEARGV
+/* #undef BROKEN_SETREGID */
+/* #undef BROKEN_SETREUID */
+#define CONSTRAINT_CA "/etc/ssl/cert.pem"
+/* #undef HAVE_ADJFREQ */
+#define HAVE_ADJTIMEX 1
#define HAVE_ARC4RANDOM 1
#define HAVE_ARC4RANDOM_BUF 1
#define HAVE_ARC4RANDOM_UNIFORM 1
-#define HAVE_EXPLICIT_BZERO 1
-#define HAVE_GETAUXVAL 1
-#define HAVE_TIMINGSAFE_MEMCMP 1
#define HAVE_ASPRINTF 1
+/* #undef HAVE_ATTRIBUTE__BOUNDED__ */
+/* #undef HAVE_ATTRIBUTE__DEAD */
+/* #undef HAVE_ATTRIBUTE__PACKED */
+#define HAVE_CLOCK_GETRES 1
+#define HAVE_CLOCK_GETTIME 1
+/* #undef HAVE_CLOSEFROM */
#define HAVE_DAEMON 1
+#define HAVE_DLFCN_H 1
+#define HAVE_ERR_H 1
+#define HAVE_EXPLICIT_BZERO 1
#define HAVE_FREEZERO 1
+#define HAVE_GETAUXVAL 1
+/* #undef HAVE_IBUF_OPEN */
+#define HAVE_IFADDRS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LIBTLS yes
#define HAVE_MEMMEM 1
+#define HAVE_MEMORY_H 1
+/* #undef HAVE_NTP_ADJTIME */
+#define HAVE_PATHS_H 1
#define HAVE_POLL 1
#define HAVE_REALLOCARRAY 1
#define HAVE_RECALLOCARRAY 1
#define HAVE_SETGROUPS 1
+/* #undef HAVE_SETPROCTITLE */
#define HAVE_SETREGID 1
#define HAVE_SETRESGID 1
-#define HAVE_SETREUID 1
#define HAVE_SETRESUID 1
+#define HAVE_SETREUID 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
#define HAVE_STRLCAT 1
#define HAVE_STRLCPY 1
#define HAVE_STRTONUM 1
+/* #undef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
#define HAVE_SYSCONF 1
-#define HAVE_ADJTIMEX 1
-#define HAVE_CLOCK_GETTIME 1
-#define HAVE_CLOCK_GETRES 1
+/* #undef HAVE_SYS_SENSORS_H */
+#define HAVE_SYS_STAT_H 1
+/* #undef HAVE_SYS_SYSCTL_H */
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_TIMINGSAFE_BCMP 1
+#define HAVE_TIMINGSAFE_MEMCMP 1
#define HAVE_TLS_CONFIG_SET_CA_MEM 1
-#define HAVE_LIBTLS yes
-#define HAVE___PROGNAME 1
+#define HAVE_UNISTD_H 1
#define HAVE_VA_COPY 1
-#define HAVE_ERR_H 1
-#define HAVE_IFADDRS_H 1
-#define HAVE_PATHS_H 1
+#define HAVE___PROGNAME 1
+/* #undef HAVE___VA_COPY */
+#define LT_OBJDIR ".libs/"
#define NTPD_USER "ntpd"
-#define CONSTRAINT_CA "/etc/ssl/cert.pem"
+#define PACKAGE "openntpd"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "OpenNTPD"
+#define PACKAGE_STRING "OpenNTPD 6.8p1"
+#define PACKAGE_TARNAME "openntpd"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "6.8p1"
+/* #undef SETEUID_BREAKS_SETUID */
+#define SPT_TYPE SPT_REUSEARGV
+#define STDC_HEADERS 1
+#define VERSION "6.8p1"
+/* #undef YYSTYPE_IS_DECLARED */
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
@@ -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/0002-Fix-build-with-old-bison-versions.patch b/pkg/openntpd/patch/0002-Fix-build-with-old-bison-versions.patch
@@ -0,0 +1,24 @@
+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
+
+---
+ src/parse.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parse.y b/src/parse.y
+index 4a101bcd6..742108c51 100644
+--- a/src/parse.y
++++ b/src/parse.y
+@@ -80,6 +80,7 @@ typedef struct {
+ } v;
+ int lineno;
+ } YYSTYPE;
++#define YYSTYPE_IS_DECLARED 1
+
+ %}
+
+--
+2.29.2
+
diff --git a/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch b/pkg/openntpd/patch/0002-Remove-duplicate-definitions.patch
@@ -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
@@ -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
-
diff --git a/pkg/openntpd/patch/0004-Fix-build-with-old-bison-versions.patch b/pkg/openntpd/patch/0004-Fix-build-with-old-bison-versions.patch
@@ -1,24 +0,0 @@
-From b204244b9e678064b7b519e049030bb0aeb029ed 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
-
----
- src/parse.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parse.y b/src/parse.y
-index eb7e9b9..7ae236b 100644
---- a/src/parse.y
-+++ b/src/parse.y
-@@ -79,6 +79,7 @@ typedef struct {
- } v;
- int lineno;
- } YYSTYPE;
-+#define YYSTYPE_IS_DECLARED 1
-
- %}
-
---
-2.26.1
-
diff --git a/pkg/openntpd/sha256 b/pkg/openntpd/sha256
@@ -1 +1 @@
-7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a openntpd-6.2p3.tar.gz
+8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46 openntpd-6.8p1.tar.gz
diff --git a/pkg/openntpd/url b/pkg/openntpd/url
@@ -1 +1 @@
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-6.2p3.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-6.8p1.tar.gz"
diff --git a/pkg/openntpd/ver b/pkg/openntpd/ver
@@ -1 +1 @@
-6.2p3 r4
+6.8p1 r0
