X-Original-To: alpine-aports@lists.alpinelinux.org Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lists.alpinelinux.org (Postfix) with ESMTP id 2BFA05C5911 for ; Sun, 28 Oct 2018 16:22:29 +0000 (GMT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CB12A21AE0; Sun, 28 Oct 2018 12:22:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 28 Oct 2018 12:22:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=from :to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=SJYSqiSAR5IdfpjbDPddUJvs3M EQKmWeJHZUMi2Z8qs=; b=NqPvu7VFlnPZetCMut45+qE+LcAUZoK4OeRnAma3vU iOjqpC0HCZiza9goEnXd6zDdAKw9UXyTeJrYFoR84nIDkDgvPQp3ZaQaEqq6vWNX Zuu+VeS12Bcyxhj6c8SZ76O5ru/CUfcwr2+dEhFyoPCxqKfZYtBUTKqPZzWbkNDE f74irLU3/rSj6ZPWKxu11feGzt9XW4oSCVhhA9ZY08Q6t/KArDgxiNkKSKTZP2Ge 3Kn8c6LYUWkook3pZeWCjUIanpCzpfymqfgC1StFsdZ5uIzsZzZGoAa6FqnFBt7N ysapnxEaTnEs258OXRkOpZkbq+JOvQ37OL3BguMgtDLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=SJYSqiSAR5IdfpjbD PddUJvs3MEQKmWeJHZUMi2Z8qs=; b=VqKORg3Bqutll1yII0k/nTfnK9rdWKd7/ E56AXz7YS1LQsanvK72hBbSOSw/Dh44DSAZDPXg/0oIv6I1QfzDvbLiXDH6w8F5R 8pjDRLjclHW//CeYuCZKdN8r6sp7GN006vy114C+8O0O0zmJ7eRVwGgEvrPFXWZl yc/lb6GX63bpqrfHjlKdDz8LLWMCycL3a5rVpJo3PkJFDV9Vd+hXYyZGEBmxUZSO 7p7e5M5UgdDLK1k5k0UompQ0V7FkqbeLrsQzkQl29vKo7ijA5sv2laLw8RDaG2IV U9HYGNaJTpcqTMegdzZeibNQvpghukZxcb2/i3ohJRDyQl8zo5tUQ== X-ME-Sender: X-ME-Proxy: Received: from brebsc.lan (79-73-136-17.dynamic.dsl.as9105.com [79.73.136.17]) by mail.messagingengine.com (Postfix) with ESMTPA id A2584E40E6 for ; Sun, 28 Oct 2018 12:22:26 -0400 (EDT) Received: from localhost ([127.0.0.1] helo=brebsc.lan) by brebsc.lan with esmtp (Exim 4.91) (envelope-from ) id 1gGnkh-0003FL-DU; Sun, 28 Oct 2018 16:17:23 +0000 From: Paul Bredbury To: alpine-aports@lists.alpinelinux.org Cc: Paul Bredbury Subject: [alpine-aports] [PATCH] main/chrony: fix pidfile, add openrc subpackage Date: Sun, 28 Oct 2018 16:16:37 +0000 Message-Id: <20181028161637.12437-1-brebs@sent.com> X-Mailer: git-send-email 2.19.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---