[arch-commits] Commit in ntp/trunk (PKGBUILD ntpd.service)

[Dave Reisner]

    Date: Monday, August 20, 2012 @ 13:36:13
  Author: dreisner
Revision: 165485

upgpkg: ntp 4.2.6.p5-8

- install ntp-units.d file to placate systemd-timedated
- fixup service file:
  - remove non-existant After= target, replace with nss-lookup
    since we dep on user/group by name
  - Add -g option to match sysvinit defaults

Modified:
  ntp/trunk/PKGBUILD
  ntp/trunk/ntpd.service

--------------+
 PKGBUILD     |    7 +++++--
 ntpd.service |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-20 17:34:11 UTC (rev 165484)
+++ PKGBUILD	2012-08-20 17:36:13 UTC (rev 165485)
@@ -5,7 +5,7 @@
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=7
+pkgrel=8
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -26,7 +26,7 @@
           'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
           '4537d1f58b299d463db5048129cb264511474b0b'
           '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
-          '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
+          '25a27cecdb937f48fa7b7c71dcc8b31cdad89306')
 
 install=install
 
@@ -61,4 +61,7 @@
 	install -d "${pkgdir}"/usr/share/man
 	mv man/man* "${pkgdir}"/usr/share/man
 	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
+
+	install -dm755 "$pkgdir/usr/lib/ntp-units.d"
+	echo "$pkgname" > "$pkgdir/usr/lib/ntp-units.d/$pkgname"
 }

Modified: ntpd.service
===================================================================
--- ntpd.service	2012-08-20 17:34:11 UTC (rev 165484)
+++ ntpd.service	2012-08-20 17:36:13 UTC (rev 165485)
@@ -1,11 +1,11 @@
 [Unit]
 Description=Network Time Service
-BindTo=systemd-timedated-ntp.target
+After=network.target nss-lookup.target
 
 [Service]
 Type=forking
 PrivateTmp=true
-ExecStart=/usr/bin/ntpd -u ntp:ntp
+ExecStart=/usr/bin/ntpd -g -u ntp:ntp
 ControlGroup=cpu:/
 
 [Install]