* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 12:22 [PR PATCH] openntpd: update to 6.8p1 4ricci
@ 2020-12-09 13:00 ` 4ricci
2020-12-09 13:47 ` 4ricci
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: 4ricci @ 2020-12-09 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages openntpd-6.8p1
https://github.com/void-linux/void-packages/pull/27046
openntpd: update to 6.8p1
A patch file from https://github.com/void-linux/void-packages/pull/27046.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd-6.8p1-27046.patch --]
[-- Type: text/x-diff, Size: 2392 bytes --]
From 29e82fb07a5a18e995139ea19bbf1b005c059262 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
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 <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..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 <orphan@voidlinux.org>"
-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}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 12:22 [PR PATCH] openntpd: update to 6.8p1 4ricci
2020-12-09 13:00 ` [PR PATCH] [Updated] " 4ricci
@ 2020-12-09 13:47 ` 4ricci
2020-12-10 0:37 ` sgn
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: 4ricci @ 2020-12-09 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages openntpd-6.8p1
https://github.com/void-linux/void-packages/pull/27046
openntpd: update to 6.8p1
A patch file from https://github.com/void-linux/void-packages/pull/27046.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd-6.8p1-27046.patch --]
[-- Type: text/x-diff, Size: 2756 bytes --]
From 1752ebe0976f49946543469f2ae2c971523bdd8b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 9 Dec 2020 13:21:18 +0100
Subject: [PATCH] openntpd: update to 6.8p1
---
srcpkgs/openntpd/files/openntpd/run | 2 +-
srcpkgs/openntpd/patches/musl.patch | 26 --------------------------
srcpkgs/openntpd/template | 12 ++++--------
3 files changed, 5 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 d49bf2b8964..8c12021bed8 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 ntpd -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..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 <orphan@voidlinux.org>"
-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}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: openntpd: update to 6.8p1
2020-12-09 12:22 [PR PATCH] openntpd: update to 6.8p1 4ricci
2020-12-09 13:00 ` [PR PATCH] [Updated] " 4ricci
2020-12-09 13:47 ` 4ricci
@ 2020-12-10 0:37 ` sgn
2020-12-10 10:07 ` [PR PATCH] [Closed]: " 4ricci
2020-12-10 16:01 ` 4ricci
4 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2020-12-10 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27046#issuecomment-742154529
Comment:
This needs more testing, #27053 has more discussion.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: openntpd: update to 6.8p1
2020-12-09 12:22 [PR PATCH] openntpd: update to 6.8p1 4ricci
` (2 preceding siblings ...)
2020-12-10 0:37 ` sgn
@ 2020-12-10 10:07 ` 4ricci
2020-12-10 16:01 ` 4ricci
4 siblings, 0 replies; 11+ messages in thread
From: 4ricci @ 2020-12-10 10:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a closed pull request on the void-packages repository
openntpd: update to 6.8p1
https://github.com/void-linux/void-packages/pull/27046
Description:
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: openntpd: update to 6.8p1
2020-12-09 12:22 [PR PATCH] openntpd: update to 6.8p1 4ricci
` (3 preceding siblings ...)
2020-12-10 10:07 ` [PR PATCH] [Closed]: " 4ricci
@ 2020-12-10 16:01 ` 4ricci
4 siblings, 0 replies; 11+ messages in thread
From: 4ricci @ 2020-12-10 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a closed pull request on the void-packages repository
openntpd: update to 6.8p1
https://github.com/void-linux/void-packages/pull/27046
Description:
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 18:02 [PR PATCH] " CameronNemo
@ 2020-12-10 16:33 ` CameronNemo
2020-12-31 20:46 ` CameronNemo
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: CameronNemo @ 2020-12-10 16:33 UTC (permalink / raw)
To: ml
[-- 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}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 18:02 [PR PATCH] " CameronNemo
2020-12-10 16:33 ` [PR PATCH] [Updated] " CameronNemo
@ 2020-12-31 20:46 ` CameronNemo
2021-09-29 21:42 ` CameronNemo
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: CameronNemo @ 2020-12-31 20:46 UTC (permalink / raw)
To: ml
[-- 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: 3053 bytes --]
From cc218b3d487b04cd9e2b586b05ebaf7d19deb2d4 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 | 16 ++++++----------
3 files changed, 7 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/openntpd/patches/musl.patch
diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index 575ed8d8a03..864c0eb418f 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 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 e7b1e2877ac..3e64e53c7fb 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,22 +1,21 @@
# Template file for 'openntpd'
pkgname=openntpd
-version=6.2p3
-revision=7
+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="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}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 18:02 [PR PATCH] " CameronNemo
2020-12-10 16:33 ` [PR PATCH] [Updated] " CameronNemo
2020-12-31 20:46 ` CameronNemo
@ 2021-09-29 21:42 ` CameronNemo
2021-09-29 22:28 ` CameronNemo
2021-09-29 23:18 ` CameronNemo
4 siblings, 0 replies; 11+ messages in thread
From: CameronNemo @ 2021-09-29 21:42 UTC (permalink / raw)
To: ml
[-- 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: 2140 bytes --]
From 285428d6a3061f16c012001a8441df065d79244e 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/template | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
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/template b/srcpkgs/openntpd/template
index 34bb4ed3a5eb..36e634f4e5ca 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,22 +1,21 @@
# 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"
-hostmakedepends="automake libtool"
+configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
makedepends="libtls-devel"
depends="ca-certificates"
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
@@ -24,9 +23,6 @@ alternatives="
CFLAGS="-fcommon"
-pre_configure() {
- autoreconf -fi
-}
post_install() {
# Rename files for alternatives.
mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 18:02 [PR PATCH] " CameronNemo
` (2 preceding siblings ...)
2021-09-29 21:42 ` CameronNemo
@ 2021-09-29 22:28 ` CameronNemo
2021-09-29 23:18 ` CameronNemo
4 siblings, 0 replies; 11+ messages in thread
From: CameronNemo @ 2021-09-29 22:28 UTC (permalink / raw)
To: ml
[-- 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: 2154 bytes --]
From 3fe3ae141840ae9190a135f584111bd1c2a44670 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/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
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/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}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openntpd: update to 6.8p1
2020-12-09 18:02 [PR PATCH] " CameronNemo
` (3 preceding siblings ...)
2021-09-29 22:28 ` CameronNemo
@ 2021-09-29 23:18 ` CameronNemo
4 siblings, 0 replies; 11+ messages in thread
From: CameronNemo @ 2021-09-29 23:18 UTC (permalink / raw)
To: ml
[-- 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: 3070 bytes --]
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}
^ permalink raw reply [flat|nested] 11+ messages in thread