Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openntpd: update to 6.8p1 #27053

Merged
merged 1 commit into from
Oct 5, 2021
Merged

openntpd: update to 6.8p1 #27053

merged 1 commit into from
Oct 5, 2021

Conversation

CameronNemo
Copy link
Contributor

This is the first release in 3 years so definitely needs more testing.

They changed the config since the last release:

--- /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

@Duncaen
Copy link
Member

Duncaen commented Dec 9, 2020

The announcement mentioned:

To build OpenNTPD with time constraint support, libtls from LibreSSL 3.2.2 or later is recommended.

I think constrains need some extra testing.

@sgn sgn mentioned this pull request Dec 10, 2020
@r-ricci
Copy link
Contributor

r-ricci commented Dec 10, 2020

I'm the author of #27046. I enabled constraints in the config and checked that ntpctl -s status reported the offset, but nothing more. So I agree this needs more testing.

Just a couple of things to fix here:

@r-ricci
Copy link
Contributor

r-ricci commented Dec 10, 2020

I also think that the runit script should exec openntpd directly, otherwise it would not work if it was not set as the default ntpd through xbps-alternatives.
This probably should be done for all packages providing daemons with alternatives.

@CameronNemo
Copy link
Contributor Author

@4ricci thanks for the tips. I agree on all points and made the changes you suggested.

@CameronNemo
Copy link
Contributor Author

Tested for x86_64 and aarch64-musl. Did not notice any issues when the RTC is working properly.

@CameronNemo
Copy link
Contributor Author

I do not believe there are any API incompatibilities with LibreSSL 3.1.5 either, if you would like to remain with that version

from the issue I filed with portable repo.

I think this PR is good to go.

@CameronNemo
Copy link
Contributor Author

rebased

@ericonr
Copy link
Member

ericonr commented Jan 29, 2021

@Duncaen ok to merge?

@r-ricci
Copy link
Contributor

r-ricci commented Aug 27, 2021

@CameronNemo this should be rebased (and -fcommon is no more needed).

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 3e64e53c7f..55428ba368 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -4,7 +4,8 @@ version=6.8p1
 revision=1
 build_style=gnu-configure
 configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
-makedepends="libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,7 +22,9 @@ alternatives="
  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.

@ericonr ericonr mentioned this pull request Sep 29, 2021
3 tasks
@ericonr
Copy link
Member

ericonr commented Sep 29, 2021

Per #33072, please remove the musl patch.

@CameronNemo
Copy link
Contributor Author

@ericonr done, thanks for the note!

@Piraty Piraty merged commit 885a87f into void-linux:master Oct 5, 2021
@CameronNemo CameronNemo deleted the openntpd branch October 16, 2021 01:35
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants