From d5ce108009cab87220cff70279f4409fcc538a28 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Sat, 12 Dec 2020 02:07:48 +0100 Subject: [PATCH 1/3] busybox: exec `busybox ntpd` in runit script --- srcpkgs/busybox/files/busybox-ntpd/run | 2 +- srcpkgs/busybox/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/busybox/files/busybox-ntpd/run b/srcpkgs/busybox/files/busybox-ntpd/run index e2c8b32431f201..617b67f574bc3f 100755 --- a/srcpkgs/busybox/files/busybox-ntpd/run +++ b/srcpkgs/busybox/files/busybox-ntpd/run @@ -1,2 +1,2 @@ #!/bin/sh -exec ntpd -nN -p pool.ntp.org +exec busybox ntpd -nN -p pool.ntp.org diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 9dc90e4daf16e8..35e589aced4fce 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,7 +1,7 @@ # Template file for 'busybox' pkgname=busybox version=1.31.1 -revision=2 +revision=3 hostmakedepends="perl" checkdepends="zip" short_desc="Swiss Army Knife of Embedded Linux" From 54d6d5d2e2cbf36052ab2880b5ae3ee56f9b242e Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Sat, 12 Dec 2020 02:11:44 +0100 Subject: [PATCH 2/3] ntp: exec `isc-ntpd` in runit script --- srcpkgs/ntp/files/isc-ntpd/run | 2 +- srcpkgs/ntp/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ntp/files/isc-ntpd/run b/srcpkgs/ntp/files/isc-ntpd/run index 7206f7602e0a1f..84db62b851d747 100755 --- a/srcpkgs/ntp/files/isc-ntpd/run +++ b/srcpkgs/ntp/files/isc-ntpd/run @@ -1,2 +1,2 @@ #!/bin/sh -exec ntpd -g -u ntpd:ntpd -n >/dev/null 2>&1 +exec isc-ntpd -g -u ntpd:ntpd -n >/dev/null 2>&1 diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index a2cc0f62441b86..efdbe31c339415 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.8p15 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd --enable-all-clocks ol_cv_pthread_select_yields=yes" From 3fa749f7f1497eabd1739888e7f1555ab99e70cb Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Sat, 12 Dec 2020 02:12:16 +0100 Subject: [PATCH 3/3] openntpd: exec `openntpd` in runit script; fix xlint --- srcpkgs/openntpd/files/openntpd/run | 2 +- srcpkgs/openntpd/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run index d49bf2b8964316..575ed8d8a03152 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:=-s} 2>&1 diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index 8a57914795938c..e7b1e2877ac6c7 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd version=6.2p3 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ makedepends="libressl-devel" depends="ca-certificates" short_desc="FREE, easy to use implementation of the Network Time Protocol" maintainer="Orphaned " -license="BSD" +license="ISC" homepage="http://openntpd.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz" checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a