Date: Thursday, May 5, 2016 @ 17:54:16 Author: anthraxx Revision: 173837
upgpkg: openntpd 5.9p1-3 - some package cleanup and fixes - remove unneeded files - switch to localstatedir /var as the other one introduced problems Modified: openntpd/trunk/PKGBUILD openntpd/trunk/openntpd.install openntpd/trunk/openntpd.service Deleted: openntpd/trunk/openntpd.tmpfiles -------------------+ PKGBUILD | 18 +++++++----------- openntpd.install | 2 -- openntpd.service | 1 + openntpd.tmpfiles | 1 - 4 files changed, 8 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-05 15:52:33 UTC (rev 173836) +++ PKGBUILD 2016-05-05 15:54:16 UTC (rev 173837) @@ -6,7 +6,7 @@ pkgname=openntpd pkgver=5.9p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free, easy to use implementation of the Network Time Protocol' url='http://www.openntpd.org/' arch=('i686' 'x86_64') @@ -15,13 +15,11 @@ conflicts=('ntp') backup=('etc/ntpd.conf') install=${pkgname}.install -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${pkgver}.tar.gz{,.asc} - openntpd.tmpfiles +source=(http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${pkgver}.tar.gz{,.asc} openntpd.service) sha512sums=('227a4d42f43f4abfaa97fb85cf121d3b9a6646259faeda785dbeb3e4a27285a7f95daf96e72135871a31f772895f3b66c10bd628c87e453507ce69102f5e1213' 'SKIP' - '15ecb1a8673944d73b9675e812b134531cd99ae7e5a62c1415bfd0cc58ab9d86bd4a6342a5f13e3d7d05af6ae7d9fe2cc81c88df1c20dc94e3f5e37b51e05c04' - '21a66f72be71a6dc294ed4d841fb76769d3cd6ae8049fb95117591534bb87afd3bc80a425d5e9ee41b1f107ba440a8c9cf70c5c7d771f4c5c8a0c722813e3dd9') + 'c58d48de67cd1ce0df7ea60def26db38b9d7409b64d097639a4cde3f4774a4bcc1159f993f37c5c61781cab1e2d1b8a35005030b28b0c9f0f6e0f81053586dfa') validpgpkeys=('A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5') # Brent Cook <[email protected]> build() { @@ -32,8 +30,7 @@ --sysconfdir=/etc \ --sbindir=/usr/bin \ --with-privsep-user=ntp \ - --with-privsep-path=/run/openntpd \ - --localstatedir=/var/lib/ntp \ + --localstatedir=/var \ --with-adjtimex make } @@ -40,15 +37,14 @@ package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - sed -i 's/\*/0.0.0.0/' "${pkgdir}/etc/ntpd.conf" + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}/var/lib/ntp" install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - install -Dm 644 "${srcdir}/openntpd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/openntpd.conf" install -Dm 644 "${srcdir}/openntpd.service" "${pkgdir}/usr/lib/systemd/system/openntpd.service" - install -dm 755 "${pkgdir}/usr/lib/systemd/ntp-units.d" + install -d "${pkgdir}/usr/lib/systemd/ntp-units.d" echo ${pkgname}.service > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list" } Modified: openntpd.install =================================================================== --- openntpd.install 2016-05-05 15:52:33 UTC (rev 173836) +++ openntpd.install 2016-05-05 15:54:16 UTC (rev 173837) @@ -2,8 +2,6 @@ getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp \ -c 'Network Time Protocol' -s /usr/bin/nologin ntp >/dev/null - - systemd-tmpfiles --create openntpd.conf } # vim: ts=2 sw=2 et ft=sh Modified: openntpd.service =================================================================== --- openntpd.service 2016-05-05 15:52:33 UTC (rev 173836) +++ openntpd.service 2016-05-05 15:54:16 UTC (rev 173837) @@ -1,6 +1,7 @@ [Unit] Description=OpenNTP Daemon After=network.target +Conflicts=systemd-timesyncd.service [Service] Type=forking Deleted: openntpd.tmpfiles =================================================================== --- openntpd.tmpfiles 2016-05-05 15:52:33 UTC (rev 173836) +++ openntpd.tmpfiles 2016-05-05 15:54:16 UTC (rev 173837) @@ -1 +0,0 @@ -d /run/openntpd 0755 root root -
