diff --git a/srcpkgs/ntp/files/ntpd.logrotate b/srcpkgs/ntp/files/ntpd.logrotate deleted file mode 100644 index 7e3fd884a3..0000000000 --- a/srcpkgs/ntp/files/ntpd.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/ntpd.log { - missingok - sharedscripts - postrotate - systemctl try-restart ntpd.service >/dev/null 2>&1 || true - endscript -} diff --git a/srcpkgs/ntp/files/ntpd.service b/srcpkgs/ntp/files/ntpd.service index 090321b0a0..126a66d5f0 100644 --- a/srcpkgs/ntp/files/ntpd.service +++ b/srcpkgs/ntp/files/ntpd.service @@ -1,9 +1,8 @@ [Unit] Description=Network Time Service -After=syslog.target [Service] -ExecStart=/usr/bin/ntpd -n +ExecStart=/usr/bin/ntpd -ng [Install] WantedBy=multi-user.target diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 08653ff570..3cbe91f807 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.6p5 -revision=6 +revision=7 build_style=gnu-configure configure_args="--enable-linuxcap" makedepends="readline-devel openssl-devel libcap-devel" @@ -16,11 +16,12 @@ checksum=d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c subpackages="$pkgname-perl" conf_files="/etc/ntp.conf" systemd_services="ntpd.service on" +provides="ntp-daemon-0" +replaces="ntp-daemon>=0" post_install() { vinstall ${FILESDIR}/ntpd.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/ntp.conf 644 etc - vinstall ${FILESDIR}/ntpd.logrotate 644 etc/logrotate.d ntpd vmkdir usr/share/ntp vmkdir usr/share/doc/ntp