From 8e6d3ec8ae5b441ae5c3fbbaf99d25b40694fba7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 9 Dec 2020 10:00:19 -0800
Subject: [PATCH] openntpd: update to 6.8p1

---
 srcpkgs/openntpd/files/openntpd/run |  2 +-
 srcpkgs/openntpd/patches/musl.patch | 26 --------------------------
 srcpkgs/openntpd/template           | 15 +++++++--------
 3 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/openntpd/patches/musl.patch

diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index 575ed8d8a031..864c0eb418fa 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-exec openntpd -d ${OPTS:=-s} 2>&1
+exec openntpd -d ${OPTS} 2>&1
diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch
deleted file mode 100644
index 2afd78836bf5..000000000000
--- a/srcpkgs/openntpd/patches/musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/ntpd.h
-+++ b/src/ntpd.h
-@@ -33,6 +33,10 @@
- 
- #include "ntp.h"
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- #define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
- 
- #ifndef NTPD_USER
---- a/src/log.c
-+++ b/src/log.c
-@@ -24,6 +24,10 @@
- #include <errno.h>
- #include <time.h>
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- static int	 debug;
- static int	 verbose;
- const char	*log_procname;
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 34bb4ed3a5eb..55428ba368a6 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,9 +1,9 @@
 # Template file for 'openntpd'
 pkgname=openntpd
-version=6.2p3
-revision=9
+version=6.8p1
+revision=1
 build_style=gnu-configure
-configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
+configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
 makedepends="libtls-devel"
 depends="ca-certificates"
@@ -11,22 +11,21 @@ short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://openntpd.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
-checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
+distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
+checksum=8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46
 
 conf_files="/etc/ntpd.conf"
 provides="ntp-daemon-0_1"
-system_accounts="$pkgname"
+system_accounts="openntpd"
 alternatives="
  ntpd:ntpd:/usr/bin/openntpd
  ntpd:ntpd.8:/usr/share/man/man8/openntpd.8
  ntpd:ntpd:/etc/sv/openntpd"
 
-CFLAGS="-fcommon"
-
 pre_configure() {
 	autoreconf -fi
 }
+
 post_install() {
 	# Rename files for alternatives.
 	mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}