diff options
author | root <root@rshg054.dnsready.net> | 2013-07-18 03:31:52 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-07-18 03:31:52 -0700 |
commit | e445a313723389ba9ee1fded025c567dae5b21ea (patch) | |
tree | e1b6d772c33aa3fcfdec738b8fe9c3987d7c8bd6 /extra/ntp | |
parent | 990adc96a030cc674c24d37042cc61bb3abc01cb (diff) |
Thu Jul 18 03:31:52 PDT 2013
Diffstat (limited to 'extra/ntp')
-rw-r--r-- | extra/ntp/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/ntp/ntp.conf | 3 | ||||
-rwxr-xr-x | extra/ntp/ntpd | 47 | ||||
-rw-r--r-- | extra/ntp/ntpd.conf | 5 |
4 files changed, 4 insertions, 68 deletions
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 5267803d3..2c93a076c 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,30 +1,24 @@ -# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $ +# $Id: PKGBUILD 190827 2013-07-18 07:23:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=14 +pkgrel=15 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') arch=('i686' 'x86_64') makedepends=('perl-html-parser') depends=('openssl' 'libcap' 'libedit') -backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +backup=('etc/ntp.conf') source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" - 'ntpd' - 'ntpdate' 'ntp.conf' - 'ntpd.conf' 'ntpd.service' 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' - '4e324e625c1f080b5c028be5092aa71adbf9bd99' - '01394b8a952f5edc85d19df8335eeac3980320f4' - 'f6a2292c26a201d9305669e99463fb54e5603b3f' - '4537d1f58b299d463db5048129cb264511474b0b' + 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' 'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95' '0cb9dbd285e2e8ac51ff47dee08af69e12a09855' ) @@ -50,10 +44,7 @@ package() { rmdir "${pkgdir}"/usr/{lib,sbin} install -d -o 87 "${pkgdir}"/var/lib/ntp - install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd - install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf - install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 2c0a34571..25135fb3b 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -17,6 +17,3 @@ restrict ::1 # Location of drift file driftfile /var/lib/ntp/ntp.drift - -# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing -# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd deleted file mode 100755 index 480fa1088..000000000 --- a/extra/ntp/ntpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -unset PID -PIDFILE='/run/ntpd.pid' - -if [[ -r ${PIDFILE} ]]; then - read -r PID <"${PIDFILE}" - if [[ -n ${PID} && ! -d /proc/${PID} ]]; then - rm -f "${PIDFILE}" - unset PID - fi -fi - -case "$1" in - start) - stat_busy "Starting NTP Daemon" - if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then - add_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then - rm ${PIDFILE} - rm_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf deleted file mode 100644 index 047961fde..000000000 --- a/extra/ntp/ntpd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g -u ntp" - -# arguments passed to ntpd when started -NTPD_ARGS="-g -u ntp" |