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

[Gaetan Bisson]

    Date: Monday, May 13, 2013 @ 12:05:57
  Author: bisson
Revision: 185321

remove deprecated rc script

Modified:
  ntp/trunk/PKGBUILD
Deleted:
  ntp/trunk/ntpd
  ntp/trunk/ntpd.conf

-----------+
 PKGBUILD  |   10 ++--------
 ntpd      |   47 -----------------------------------------------
 ntpd.conf |    5 -----
 3 files changed, 2 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 10:04:28 UTC (rev 185320)
+++ PKGBUILD	2013-05-13 10:05:57 UTC (rev 185321)
@@ -12,19 +12,15 @@
 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'
           'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95'
           '0cb9dbd285e2e8ac51ff47dee08af69e12a09855'
 )
@@ -50,10 +46,8 @@
 
 	rmdir "${pkgdir}"/usr/{lib,sbin}
 	install -d -o 87 "${pkgdir}"/var/lib/ntp
-	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
+	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
 	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"

Deleted: ntpd
===================================================================
--- ntpd	2013-05-13 10:04:28 UTC (rev 185320)
+++ ntpd	2013-05-13 10:05:57 UTC (rev 185321)
@@ -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

Deleted: ntpd.conf
===================================================================
--- ntpd.conf	2013-05-13 10:04:28 UTC (rev 185320)
+++ ntpd.conf	2013-05-13 10:05:57 UTC (rev 185321)
@@ -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"