From: CameronNemo <CameronNemo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
Date: Thu, 10 Dec 2020 17:33:46 +0100 [thread overview]
Message-ID: <20201210163346.1dbEtFue3Qgmi-yaaa6dFQGRU0vusB_U0Nf3w9MFHh0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27053@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
There is an updated pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages openntpd
https://github.com/void-linux/void-packages/pull/27053
openntpd: update to 6.8p1
This is the first release in 3 years so definitely needs more testing.
They changed the config since the last release:
```diff
--- /etc/ntpd.conf 2020-12-09 09:51:41.839208968 -0800
+++ /etc/ntpd.conf.new-6.8p1_1 2020-12-09 08:03:15.000000000 -0800
@@ -1,7 +1,11 @@
-# $OpenBSD: ntpd.conf,v 1.14 2015/07/15 20:28:37 ajacoutot Exp $
+# $OpenBSD: ntpd.conf,v 1.16 2019/11/06 19:04:12 deraadt Exp $
#
# See ntpd.conf(5) and /etc/examples/ntpd.conf
servers pool.ntp.org
+server time.cloudflare.com
sensor *
-constraints from "https://www.google.com"
+
+constraint from "9.9.9.9" # quad9 v4 without DNS
+constraint from "2620:fe::fe" # quad9 v6 without DNS
+constraints from "www.google.com" # intentionally not 8.8.8.8
```
A patch file from https://github.com/void-linux/void-packages/pull/27053.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd-27053.patch --]
[-- Type: text/x-diff, Size: 3066 bytes --]
From 2325da44dd27b91802530e5986d6533849069ec8 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 | 18 +++++++-----------
3 files changed, 8 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/openntpd/patches/musl.patch
diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index d49bf2b8964..864c0eb418f 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,3 @@
#!/bin/sh
[ -r conf ] && . ./conf
-exec ntpd -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 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 <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 8a579147959..3e64e53c7fb 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,22 +1,21 @@
# 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"
+configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
makedepends="libressl-devel"
depends="ca-certificates"
short_desc="FREE, easy to use implementation of the Network Time Protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+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
@@ -24,9 +23,6 @@ alternatives="
CFLAGS="-fcommon"
-pre_configure() {
- autoreconf -fi
-}
post_install() {
# Rename files for alternatives.
mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}
next prev parent reply other threads:[~2020-12-10 16:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 18:02 [PR PATCH] " CameronNemo
2020-12-09 20:14 ` Duncaen
2020-12-09 20:15 ` Duncaen
2020-12-10 10:05 ` 4ricci
2020-12-10 10:10 ` 4ricci
2020-12-10 10:10 ` 4ricci
2020-12-10 15:49 ` 4ricci
2020-12-10 16:33 ` CameronNemo [this message]
2020-12-10 17:06 ` CameronNemo
2020-12-18 2:46 ` CameronNemo
2020-12-22 1:54 ` CameronNemo
2020-12-31 20:46 ` [PR PATCH] [Updated] " CameronNemo
2020-12-31 21:05 ` CameronNemo
2021-01-29 4:02 ` ericonr
2021-08-27 11:28 ` 4ricci
2021-09-29 21:42 ` [PR PATCH] [Updated] " CameronNemo
2021-09-29 22:28 ` CameronNemo
2021-09-29 22:57 ` ericonr
2021-09-29 23:18 ` [PR PATCH] [Updated] " CameronNemo
2021-09-30 3:11 ` CameronNemo
2021-10-05 21:00 ` [PR PATCH] [Merged]: " Piraty
-- strict thread matches above, loose matches on Subject: below --
2020-12-09 12:22 [PR PATCH] " 4ricci
2020-12-09 13:00 ` [PR PATCH] [Updated] " 4ricci
2020-12-09 13:47 ` 4ricci
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210163346.1dbEtFue3Qgmi-yaaa6dFQGRU0vusB_U0Nf3w9MFHh0@z \
--to=cameronnemo@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).