From c195a6e19f4a9210ca65142f47ba54f16b546987 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Wed, 9 Dec 2020 13:21:18 +0100 Subject: [PATCH] openntpd: update to 6.8p1 --- srcpkgs/openntpd/patches/musl.patch | 26 -------------------------- srcpkgs/openntpd/template | 12 ++++-------- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/openntpd/patches/musl.patch diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch deleted file mode 100644 index 99f8f63f93d..00000000000 --- a/srcpkgs/openntpd/patches/musl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/ntpd.h.orig -+++ 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 ---- src/log.c.orig -+++ src/log.c -@@ -24,6 +24,10 @@ - #include - #include - -+#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 8a579147959..825f2c3efcb 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,18 +1,17 @@ # Template file for 'openntpd' pkgname=openntpd -version=6.2p3 -revision=6 +version=6.8p1 +revision=1 build_style=gnu-configure configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem" -hostmakedepends="automake libtool" makedepends="libressl-devel" depends="ca-certificates" short_desc="FREE, easy to use implementation of the Network Time Protocol" maintainer="Orphaned " -license="BSD" +license="ISC, BSD-3-Clause" homepage="http://openntpd.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz" -checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a +checksum=8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46 conf_files="/etc/ntpd.conf" provides="ntp-daemon-0_1" @@ -24,9 +23,6 @@ alternatives=" CFLAGS="-fcommon" -pre_configure() { - autoreconf -fi -} post_install() { # Rename files for alternatives. mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}