Subject: [alpine-aports] [PATCH] main/chrony: fix pidfile, add openrc subpackage

From: Paul Bredbury <[email-masked]>
Date: Sun, 28 Oct 2018 16:16:37 +0000

Allows openrc to stop chrony successfully, using pidfile.

Adding openrc subpackage, as per abuild warning.
---
 main/chrony/APKBUILD      | 6 +++---
 main/chrony/chronyd.initd | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index f4de854658..80904f377f 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=chrony
 pkgver=3.4
-pkgrel=0
+pkgrel=1
 _ver=${pkgver/_/-}
 pkgdesc="NTP client and server programs"
 url="https://chrony.tuxfamily.org"
@@ -15,7 +15,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
 depends=""
 makedepends="asciidoctor libcap-dev texinfo"
 checkdepends="bash"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz
 	0001-hash-include-util.h-for-MIN-macro.patch
 	fix-tests.patch
@@ -88,7 +88,7 @@ sha512sums="4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7
 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e  fix-tests.patch
 b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247  max_resolve_interval.patch
 0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170  chronyd.confd
-6139e6464986b82d8c20aee1cda337eae851c318d9f3fe9aee15dc48f2165f9f68ce2e22dcd8018b8fb4e0e1934990c5351e1c3a02d79005e1a1acd8cd02dc0a  chronyd.initd
+613f6673fe493fb5b3d4eba0b9563065723724ddce7733dd5e053dc696f594e8cfb782ae43f59660f8a67b78ce0d3eb6fd1b7f74d23e9b1a8b0b671c39603535  chronyd.initd
 ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357  chrony.logrotate
 0ae453fca3461b6e56a32a9eb6be0d448c39bf0279583222ab2fecef307e1113f082d4e86f957e4baac4f223c5c57804cdea97322678009f3413ab99d54694b6  chrony.conf
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h"
diff --git a/main/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 51c1afad4a..814880477d 100644
--- a/main/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
@@ -49,7 +49,7 @@ start() {
 	checkconfig || return $?
 	setxtrarg
 
-	[ -n "${PIDFILE}" ] || PIDFILE=/var/run/chronyd.pid
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chrony/chronyd.pid
 
 	local daemon_args=
 	if yesno "$FAST_STARTUP"; then
@@ -68,7 +68,7 @@ start() {
 stop() {
 	checkconfig || return $?
 
-	[ -n "${PIDFILE}" ] || PIDFILE=/var/run/chronyd.pid
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chrony/chronyd.pid
 
 	ebegin "Stopping chronyd"
 	start-stop-daemon --stop --quiet \
-- 
2.19.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---