aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/chrony/APKBUILD18
-rw-r--r--main/chrony/chrony.conf2
-rw-r--r--main/chrony/chrony.pre-install5
3 files changed, 18 insertions, 7 deletions
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 1b555d2564..79d9171c81 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
pkgver=2.1.1
-pkgrel=2
+pkgrel=3
_ver=${pkgver/_/-}
pkgdesc="NTP client and server programs"
url="http://chrony.tuxfamily.org/"
@@ -9,6 +9,7 @@ pkgusers="$pkgname"
pkggroups="$pkgname"
arch="all"
license="GPL2"
+install="$pkgname.pre-install"
depends=""
makedepends="libcap-dev texinfo"
subpackages="$pkgname-doc"
@@ -69,9 +70,14 @@ package() {
mkdir -p "$pkgdir"/var/lib/chrony \
"$pkgdir"/var/log/chrony \
"$pkgdir"/etc/chrony
- touch "$pkgdir"/etc/chrony/chrony.drift
-
+
+ # chrony.drift must be writable by chrony user
+ chown $pkgusers:$pkggroups "$pkgdir"/etc/chrony
install -m644 "$srcdir"/chrony.conf "$pkgdir"/etc/chrony/chrony.conf
+ chown root:root "$pkgdir"/etc/chrony/*
+
+ chown $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony
+ touch "$pkgdir"/var/lib/chrony/chrony.drift
}
md5sums="15e470a51ab6e09e65bc0a2fbc5299af chrony-2.1.1.tar.gz
@@ -80,7 +86,7 @@ a756428186bb27884d157a9f2c9732c6 max_resolve_interval.patch
d62521b4c8837e15262c47ac88359307 chronyd.confd
2d5cd89a21dc3c2fbb0c30cd89e41ad3 chronyd.initd
468eaf2b5465d60b3ee021ce3f948ab1 chrony.logrotate
-46f42c52953d398ca44d6baa449618d7 chrony.conf
+15fd3724c7e171c3e75a29d217e707b2 chrony.conf
28f6835098a216f4a620f9218d15b5b8 timepps.h"
sha256sums="b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 chrony-2.1.1.tar.gz
4aec957ff59adbba1058e5376c73fe74e1e6fb511d9ca6cb5b6e74fca8c75a9f 0001-uclibc-res-do-not-call-res_init.patch
@@ -88,7 +94,7 @@ sha256sums="b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 ch
29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 chronyd.confd
ac58a3e5ffb26202e501223418f12a110f50e1008c059337536c363e3ecfcdc6 chronyd.initd
d25ce3f5ce4a28184931c68a97340a5b332cbaf071434d172f262122240ad652 chrony.logrotate
-43e1bf9c3b0eb95c6330afdc9063f24353086f057d258c00ea711975a86c1194 chrony.conf
+d50a474d654ff4a1b742e712bbfc2d9e6c75e04b28ec9b86ee2054bdaf830fc0 chrony.conf
ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22 timepps.h"
sha512sums="bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 chrony-2.1.1.tar.gz
5b1d0766eceee000d97dfb20c34f95319ac295729c16e571d7fe382e7d737c7335a1a98b67d89792056f969d4bb9eb7296c343ee4bb16c6a0805606f505d16c5 0001-uclibc-res-do-not-call-res_init.patch
@@ -96,5 +102,5 @@ sha512sums="bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b
6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 chronyd.confd
d182fc81df9c9751f487434990127bbd40eb9e4a567d1810d987fbd48746d28890a9174d1ee65ceb203452234d17db0cf1f2c4073459ee2aa2b8c62e6fa221de chronyd.initd
8c2f9b396bde7f0124fdc4bb25fb31d154ae4ec73717401e5dd36a3730cd55ff91e60c70bcafb917883e437993ee245ad56e7a12c3711b482c6df592896a42dc chrony.logrotate
-23157310e9352736efb000fef9f37cb57bfdc3b0ee95bfd5022b8e00dbfb16bfede1692fd91a128a9bedebfcf938b1668fa0695a112bd0c24525487ee2a53c65 chrony.conf
+2719b71251a110d3a9f697fad17f74a898bb0cf33cfbf60f4ec3e598ad8f09cadc6afbb069be06aff8da8f58e00ba622f4384b9dd88f25b279e6f3b6cb43ad3c chrony.conf
eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h"
diff --git a/main/chrony/chrony.conf b/main/chrony/chrony.conf
index d99b1e01d4..5f89f1bae9 100644
--- a/main/chrony/chrony.conf
+++ b/main/chrony/chrony.conf
@@ -4,4 +4,4 @@ server pool.ntp.org
initstepslew 10 pool.ntp.org
commandkey 10
keyfile /etc/chrony/chrony.keys
-driftfile /etc/chrony/chrony.drift
+driftfile /var/lib/chrony/chrony.drift
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
new file mode 100644
index 0000000000..2c54eccdbd
--- /dev/null
+++ b/main/chrony/chrony.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup chrony 2>/dev/null
+adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
+exit 0