Date: Monday, January 8, 2018 @ 20:11:25 Author: eschwartz Revision: 280573
upgpkg: chrony 3.2-2 Migrate to sysusers/tmpfiles. Add PGP signatures. Added: chrony/trunk/chrony.sysusers chrony/trunk/chrony.tmpfiles Modified: chrony/trunk/PKGBUILD Deleted: chrony/trunk/chrony.install -----------------+ PKGBUILD | 19 +++++++++++++------ chrony.install | 13 ------------- chrony.sysusers | 1 + chrony.tmpfiles | 1 + 4 files changed, 15 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-08 19:04:39 UTC (rev 280572) +++ PKGBUILD 2018-01-08 20:11:25 UTC (rev 280573) @@ -9,7 +9,7 @@ pkgname=chrony pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight NTP client and server' arch=('x86_64') url="http://chrony.tuxfamily.org/" @@ -18,10 +18,16 @@ depends=('nss' 'readline' 'libcap' 'libedit') backup=('etc/chrony.conf') source=(https://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz - service) -install=${pkgname}.install + "${pkgname}-${pkgver}.tar.gz.asc::https://download.tuxfamily.org/chrony/${pkgname}-${pkgver}-tar-gz-asc.txt" + service + chrony.sysusers + chrony.tmpfiles) sha256sums=('329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116' - 'dbd30435d5f51a92ecef779efa0eabaf56d09a35a18ddd30644d5418beada212') + '4434f5f6eca4781ac906e260db2444f9ce08df4406621e0c0b58818b5a78cb9c' + 'dbd30435d5f51a92ecef779efa0eabaf56d09a35a18ddd30644d5418beada212' + '56aa817638c8f959169d514f1e7fc727ef31e7d3beda4fca5165292c7602ee42' + 'c0b52787f68f3ef365eef64f53f22b4fb0046a91f0e38923f9d16f1ca19c3f3a') +validpgpkeys=('8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B') # Miroslav Lichvar <mlich...@redhat.com> has a dsa1024 key *in the wild* prepare() { cd $pkgname-$pkgver @@ -42,6 +48,8 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install-docs + install -Dm0644 "$srcdir/chrony.sysusers" "$pkgdir/usr/lib/sysusers.d/chrony.conf" + install -Dm0644 "$srcdir/chrony.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/chrony.conf" install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example3" "$pkgdir/etc/chrony.conf" @@ -50,11 +58,10 @@ sed -i '/^! rtconutc$/ s/^! //' "$pkgdir/etc/chrony.conf" mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin" - rmdir "$pkgdir/usr/sbin" + rmdir "$pkgdir"{/usr/sbin,/var/lib/chrony,/var/lib} install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/chronyd.service" cp -a examples "$pkgdir"/usr/share/doc/chrony/examples - chown 183:183 "$pkgdir/var/lib/chrony" } Deleted: chrony.install =================================================================== --- chrony.install 2018-01-08 19:04:39 UTC (rev 280572) +++ chrony.install 2018-01-08 20:11:25 UTC (rev 280573) @@ -1,13 +0,0 @@ -post_install() { - getent group chrony &>/dev/null || groupadd -g 183 chrony >/dev/null - getent passwd chrony &>/dev/null || useradd -u 183 -g chrony -d /var/lib/chrony -c 'Network Time Protocol' -s /bin/false chrony >/dev/null -} - -post_upgrade() { - echo "-- chrony.service was renamed to chronyd.service!" - if [[ $(vercmp $2 1.29.1-2) -le 0 ]]; then - getent group chrony &>/dev/null || groupadd -r -g 183 chrony >/dev/null - getent passwd chrony &>/dev/null || useradd -r -u 183 -g chrony -d /var/lib/chrony -c 'Network Time Protocol' -s /bin/false chrony >/dev/null - chown -R 183:183 /var/lib/chrony - fi -} Added: chrony.sysusers =================================================================== --- chrony.sysusers (rev 0) +++ chrony.sysusers 2018-01-08 20:11:25 UTC (rev 280573) @@ -0,0 +1 @@ +u chrony - "Network Time Protocol" /var/lib/chrony Added: chrony.tmpfiles =================================================================== --- chrony.tmpfiles (rev 0) +++ chrony.tmpfiles 2018-01-08 20:11:25 UTC (rev 280573) @@ -0,0 +1 @@ +d /var/lib/chrony 0755 chrony chrony - -