Date: Tuesday, January 9, 2018 @ 22:52:51 Author: eschwartz Revision: 280785
upgpkg: pdnsd 1.2.9.a-13 migrate to systemd-sysusers/systemd-tmpfiles Drop unnecessarily hardcoded uid. Added: pdnsd/trunk/pdnsd.sysusers pdnsd/trunk/pdnsd.tmpfiles Modified: pdnsd/trunk/PKGBUILD Deleted: pdnsd/trunk/pdnsd.install ----------------+ PKGBUILD | 16 ++++++++++------ pdnsd.install | 25 ------------------------- pdnsd.sysusers | 1 + pdnsd.tmpfiles | 2 ++ 4 files changed, 13 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-09 22:35:17 UTC (rev 280784) +++ PKGBUILD 2018-01-09 22:52:51 UTC (rev 280785) @@ -6,18 +6,20 @@ pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=12 +pkgrel=13 pkgdesc="Proxy DNS server with permanent caching" arch=(x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') -install=${pkgname}.install -source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz - http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz.asc - service) +source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz{,.asc} + pdnsd.sysusers + pdnsd.tmpfiles + service) sha512sums=('4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81' 'SKIP' + '6ebedaa481a8b9f8a0263d42fba06a74933f23593dc9fc0745e4036e0cfe40e208a414fb92a32a15382aff572950e07e93dfa4b896600cebe10f70a15f4fc6f6' + 'dbd30b02c8cc21531133573e10704e02ceea5d5cee18c96542398a815ea8b1292aa025664f0cd2c10d248578058e0afb9b0215f6c421a501c2555940d56d4373' 'ae278f8899f90ded9eaf814af620207b8a255149a12a1debe00cf9b60339153c6f81cb5c51b84af944f4d89f2f332481cf281a47dd4651e31e77302b21cb5e77') validpgpkeys=(21EC7442EE80FB0594E317612C4C1357A484EE22) @@ -31,10 +33,12 @@ cd "$srcdir/$pkgname-$_pkgver" make DESTDIR="$pkgdir" install install -Dm0644 ../service "$pkgdir/usr/lib/systemd/system/pdnsd.service" + install -Dm0644 ../pdnsd.sysusers "$pkgdir/usr/lib/sysusers.d/pdnsd.conf" + install -Dm0644 ../pdnsd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/pdnsd.conf" install -dm0755 "$pkgdir/usr/share/doc/pdnsd" sed -i 's/"nobody"/"pdnsd"/' "$pkgdir/etc/pdnsd.conf.sample" mv "$pkgdir/etc/pdnsd.conf.sample" "$pkgdir/usr/share/doc/pdnsd/pdnsd.conf" - chown -R 184:184 "$pkgdir/var/cache/pdnsd" + rm -r "$pkgdir"/{etc,var} } Deleted: pdnsd.install =================================================================== --- pdnsd.install 2018-01-09 22:35:17 UTC (rev 280784) +++ pdnsd.install 2018-01-09 22:52:51 UTC (rev 280785) @@ -1,25 +0,0 @@ -post_install() { - getent group pdnsd &>/dev/null || groupadd -r -g 184 pdnsd >/dev/null - getent passwd pdnsd &>/dev/null || useradd -r -u 184 -g pdnsd -d /var/cache/pdnsd -c 'Proxy DNS server' -s /bin/nologin pdnsd >/dev/null - true -} - -post_upgrade() { - if [[ $(vercmp $2 1.2.9.a-6) -le 0 ]]; then - echo Stopping pdnsd service in order to modify the user/group. - systemctl stop pdnsd - - # in case the user/group were already created as recommended by the wiki - userdel pdnsd &>/dev/null - groupdel pdnsd &>/dev/null - - post_install - chown -R 184:184 /var/cache/pdnsd - - echo You may now restart the pdnsd service. - fi - - if [[ $(vercmp $2 1.2.9.a-10) -le 0 ]]; then - echo "Default config is in usr/share/doc/pdnsd/, restore your .pacsave or copy default one" - fi -} Added: pdnsd.sysusers =================================================================== --- pdnsd.sysusers (rev 0) +++ pdnsd.sysusers 2018-01-09 22:52:51 UTC (rev 280785) @@ -0,0 +1 @@ +u pdnsd - "Proxy DNS server" /var/cache/pdnsd Added: pdnsd.tmpfiles =================================================================== --- pdnsd.tmpfiles (rev 0) +++ pdnsd.tmpfiles 2018-01-09 22:52:51 UTC (rev 280785) @@ -0,0 +1,2 @@ +d /var/cache/pdnsd 0750 pdnsd pdnsd - - +f /var/cache/pdnsd/pdnsd.cache 0640 pdnsd pdnsd - -