From: 4ricci <4ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] exec package-specific ntpd in runit scripts, not the default alternative
Date: Sat, 12 Dec 2020 00:47:38 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27096@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is a new pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages runit-alternatives
https://github.com/void-linux/void-packages/pull/27096
exec package-specific ntpd in runit scripts, not the default alternative
If the default alternative is executed, then it will only work if the package is the default for that group, which is not guaranteed.
I wonder why all the packages having this issue are NTP daemons.
A patch file from https://github.com/void-linux/void-packages/pull/27096.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-runit-alternatives-27096.patch --]
[-- Type: text/x-diff, Size: 2727 bytes --]
From d7d7129724364cdbe87d01ff5b92e3eb7f55f63a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 12 Dec 2020 00:08:55 +0100
Subject: [PATCH] exec package-specific ntpd in runit scripts, not the default
alternative
---
srcpkgs/busybox/files/busybox-ntpd/run | 2 +-
srcpkgs/busybox/template | 2 +-
srcpkgs/ntp/files/isc-ntpd/run | 2 +-
srcpkgs/ntp/template | 2 +-
srcpkgs/openntpd/files/openntpd/run | 2 +-
srcpkgs/openntpd/template | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/busybox/files/busybox-ntpd/run b/srcpkgs/busybox/files/busybox-ntpd/run
index e2c8b32431f..617b67f574b 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 9dc90e4daf1..35e589aced4 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"
diff --git a/srcpkgs/ntp/files/isc-ntpd/run b/srcpkgs/ntp/files/isc-ntpd/run
index 7206f7602e0..84db62b851d 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 a2cc0f62441..efdbe31c339 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"
diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index d49bf2b8964..575ed8d8a03 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 8a579147959..b76d61cfa44 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"
next reply other threads:[~2020-12-11 23:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 23:47 4ricci [this message]
2020-12-11 23:55 ` [PR PATCH] [Updated] " 4ricci
2020-12-12 0:44 ` sgn
2020-12-12 1:14 ` [PR PATCH] [Updated] " 4ricci
2020-12-12 6:07 ` [PR PATCH] [Merged]: " ericonr
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27096@inbox.vuxu.org \
--to=4ricci@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).