From 9b481af713d6d2486a4fe6cc33113f8bc871f9b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 30 Jun 2015 08:04:16 +0200 Subject: [PATCH] ntp: update to 4.2.8p3. --- srcpkgs/ntp/files/ntpd.service | 11 ----------- srcpkgs/ntp/files/ntpd.tmpfiles | 1 - srcpkgs/ntp/files/ntpdate.service | 12 ------------ srcpkgs/ntp/template | 17 +++-------------- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/ntp/files/ntpd.service delete mode 100644 srcpkgs/ntp/files/ntpd.tmpfiles delete mode 100644 srcpkgs/ntp/files/ntpdate.service diff --git a/srcpkgs/ntp/files/ntpd.service b/srcpkgs/ntp/files/ntpd.service deleted file mode 100644 index 4d2d9ee2a80..00000000000 --- a/srcpkgs/ntp/files/ntpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service -After=network.target nss-lookup.target - -[Service] -PrivateTmp=true -ExecStart=/usr/bin/ntpd -n -g -u ntpd:ntpd -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/ntp/files/ntpd.tmpfiles b/srcpkgs/ntp/files/ntpd.tmpfiles deleted file mode 100644 index 7f2ff37896c..00000000000 --- a/srcpkgs/ntp/files/ntpd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/db/ntpd 0755 ntpd ntpd diff --git a/srcpkgs/ntp/files/ntpdate.service b/srcpkgs/ntp/files/ntpdate.service deleted file mode 100644 index ae3b8d43901..00000000000 --- a/srcpkgs/ntp/files/ntpdate.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=One-Shot Network Time Service -After=network.target nss-lookup.target -Before=ntpd.service - -[Service] -Type=oneshot -PrivateTmp=true -ExecStart=/usr/bin/ntpd -q -g -u ntpd:ntpd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 02dce848a3f..ec9acc1f3c1 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp -version=4.2.8p2 -revision=2 +version=4.2.8p3 +revision=1 build_pie=yes build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd @@ -13,7 +13,7 @@ license="BSD" maintainer="Juan RP " homepage="http://www.ntp.org/" distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${version}.tar.gz" -checksum=0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 +checksum=818ca4f2ed6ca845b1c5ec43f5e6ad905eaa0fc0aab2d509ed6b962a37fbf38f make_dirs="/var/db/ntpd 0755 ntpd ntpd" conf_files="/etc/ntp.conf" @@ -21,19 +21,8 @@ system_accounts="ntpd" ntpd_homedir="/var/db/ntpd" provides="ntp-daemon-0_1" replaces="ntp-daemon>=0" -build_options="systemd" post_install() { - if [ "$build_option_systemd" ]; then - # ntpd service - vinstall ${FILESDIR}/ntpd.tmpfiles 644 usr/lib/tmpfiles.d ntpd.conf - vinstall ${FILESDIR}/ntpd.service 644 usr/lib/systemd/system - # ntpdate service - vinstall ${FILESDIR}/ntpdate.service 644 usr/lib/systemd/system - # For systemd-timedated. - vmkdir usr/lib/systemd/ntp-units.d - echo "ntpd.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/60-ntp.list - fi vconf ${FILESDIR}/ntp.conf vsv ntpd rm -r ${DESTDIR}/usr/share/doc