[arch-commits] Commit in ntp/repos (32 files)

Gaetan Bisson bisson at nymeria.archlinux.org
Mon May 6 06:28:53 EDT 2013


    Date: Monday, May 6, 2013 @ 12:28:53
  Author: bisson
Revision: 184344

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ntp/repos/extra-i686/PKGBUILD
    (from rev 184341, ntp/trunk/PKGBUILD)
  ntp/repos/extra-i686/install
    (from rev 184341, ntp/trunk/install)
  ntp/repos/extra-i686/ntp.conf
    (from rev 184341, ntp/trunk/ntp.conf)
  ntp/repos/extra-i686/ntpd
    (from rev 184341, ntp/trunk/ntpd)
  ntp/repos/extra-i686/ntpd.conf
    (from rev 184341, ntp/trunk/ntpd.conf)
  ntp/repos/extra-i686/ntpd.service
    (from rev 184341, ntp/trunk/ntpd.service)
  ntp/repos/extra-i686/ntpdate
    (from rev 184341, ntp/trunk/ntpdate)
  ntp/repos/extra-i686/ntpdate.service
    (from rev 184341, ntp/trunk/ntpdate.service)
  ntp/repos/extra-x86_64/PKGBUILD
    (from rev 184343, ntp/trunk/PKGBUILD)
  ntp/repos/extra-x86_64/install
    (from rev 184343, ntp/trunk/install)
  ntp/repos/extra-x86_64/ntp.conf
    (from rev 184343, ntp/trunk/ntp.conf)
  ntp/repos/extra-x86_64/ntpd
    (from rev 184343, ntp/trunk/ntpd)
  ntp/repos/extra-x86_64/ntpd.conf
    (from rev 184343, ntp/trunk/ntpd.conf)
  ntp/repos/extra-x86_64/ntpd.service
    (from rev 184343, ntp/trunk/ntpd.service)
  ntp/repos/extra-x86_64/ntpdate
    (from rev 184343, ntp/trunk/ntpdate)
  ntp/repos/extra-x86_64/ntpdate.service
    (from rev 184343, ntp/trunk/ntpdate.service)
Deleted:
  ntp/repos/extra-i686/PKGBUILD
  ntp/repos/extra-i686/install
  ntp/repos/extra-i686/ntp.conf
  ntp/repos/extra-i686/ntpd
  ntp/repos/extra-i686/ntpd.conf
  ntp/repos/extra-i686/ntpd.service
  ntp/repos/extra-i686/ntpdate
  ntp/repos/extra-i686/ntpdate.service
  ntp/repos/extra-x86_64/PKGBUILD
  ntp/repos/extra-x86_64/install
  ntp/repos/extra-x86_64/ntp.conf
  ntp/repos/extra-x86_64/ntpd
  ntp/repos/extra-x86_64/ntpd.conf
  ntp/repos/extra-x86_64/ntpd.service
  ntp/repos/extra-x86_64/ntpdate
  ntp/repos/extra-x86_64/ntpdate.service

------------------------------+
 /PKGBUILD                    |  138 +++++++++++++++++++++++++++++++++++++++++
 /install                     |   74 +++++++++++++++++++++
 /ntp.conf                    |   44 +++++++++++++
 /ntpd                        |   94 +++++++++++++++++++++++++++
 /ntpd.conf                   |   10 ++
 /ntpd.service                |   26 +++++++
 /ntpdate                     |   58 +++++++++++++++++
 /ntpdate.service             |   24 +++++++
 extra-i686/PKGBUILD          |   69 --------------------
 extra-i686/install           |   37 ----------
 extra-i686/ntp.conf          |   22 ------
 extra-i686/ntpd              |   47 -------------
 extra-i686/ntpd.conf         |    5 -
 extra-i686/ntpd.service      |   13 ---
 extra-i686/ntpdate           |   29 --------
 extra-i686/ntpdate.service   |   12 ---
 extra-x86_64/PKGBUILD        |   69 --------------------
 extra-x86_64/install         |   37 ----------
 extra-x86_64/ntp.conf        |   22 ------
 extra-x86_64/ntpd            |   47 -------------
 extra-x86_64/ntpd.conf       |    5 -
 extra-x86_64/ntpd.service    |   13 ---
 extra-x86_64/ntpdate         |   29 --------
 extra-x86_64/ntpdate.service |   12 ---
 24 files changed, 468 insertions(+), 468 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/PKGBUILD	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=13
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'libcap')
-optdepends=('libedit: ntpdc, ntpq')
-makedepends=('perl-html-parser' 'libedit')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.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'
-)
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linuxcaps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	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"
-	
-	cd html
-	../scripts/html2man
-	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/systemd/ntp-units.d"
-	echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list"
-}

Copied: ntp/repos/extra-i686/PKGBUILD (from rev 184341, ntp/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+
+pkgname=ntp
+pkgver=4.2.6.p5
+_realver=4.2.6p5
+pkgrel=14
+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')
+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'
+)
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${_realver}"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-linuxcaps \
+		--enable-ntp-signd \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${_realver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	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"
+	
+	cd html
+	../scripts/html2man
+	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/systemd/ntp-units.d"
+	echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list"
+}

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/install	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,37 +0,0 @@
-post_install() {
-	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
-	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
-	true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
-		cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
-		cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
-		post_install
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
-		chown -R ntp /var/lib/ntp
-	fi
-}
-
-post_remove() {
-	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
-	getent group ntp &>/dev/null && groupdel ntp >/dev/null
-	true
-}

Copied: ntp/repos/extra-i686/install (from rev 184341, ntp/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,37 @@
+post_install() {
+	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
+	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
+	true
+}
+
+post_upgrade() {
+	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
+		cat <<EOF
+
+==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
+==> If you made changes to the former, please update the latter.
+
+EOF
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
+		cat <<EOF
+
+==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
+==> and the new rc.d script only takes the latter into account.
+==> To stop your old ntpd process, please kill it manually.
+
+EOF
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
+		post_install
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
+		chown -R ntp /var/lib/ntp
+	fi
+}
+
+post_remove() {
+	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
+	getent group ntp &>/dev/null && groupdel ntp >/dev/null
+	true
+}

Deleted: extra-i686/ntp.conf
===================================================================
--- extra-i686/ntp.conf	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntp.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,22 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default noquery nopeer
-restrict 127.0.0.1
-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

Copied: ntp/repos/extra-i686/ntp.conf (from rev 184341, ntp/trunk/ntp.conf)
===================================================================
--- extra-i686/ntp.conf	                        (rev 0)
+++ extra-i686/ntp.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,22 @@
+# With the default settings below, ntpd will only synchronize your clock.
+#
+# For details, see:
+# - the ntp.conf man page
+# - http://support.ntp.org/bin/view/Support/GettingStarted
+# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
+
+# Associate to public NTP pool servers; see http://www.pool.ntp.org/
+server 0.pool.ntp.org
+server 1.pool.ntp.org
+server 2.pool.ntp.org
+
+# Only allow read-only access from localhost
+restrict default noquery nopeer
+restrict 127.0.0.1
+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

Deleted: extra-i686/ntpd
===================================================================
--- extra-i686/ntpd	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntpd	2013-05-06 10:28:53 UTC (rev 184344)
@@ -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

Copied: ntp/repos/extra-i686/ntpd (from rev 184341, ntp/trunk/ntpd)
===================================================================
--- extra-i686/ntpd	                        (rev 0)
+++ extra-i686/ntpd	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,47 @@
+#!/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: extra-i686/ntpd.conf
===================================================================
--- extra-i686/ntpd.conf	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntpd.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -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"

Copied: ntp/repos/extra-i686/ntpd.conf (from rev 184341, ntp/trunk/ntpd.conf)
===================================================================
--- extra-i686/ntpd.conf	                        (rev 0)
+++ extra-i686/ntpd.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,5 @@
+# client options for "ntpd -q" - ntpdate equivalent
+NTP_CLIENT_OPTION="-g -u ntp"
+
+# arguments passed to ntpd when started
+NTPD_ARGS="-g -u ntp"

Deleted: extra-i686/ntpd.service
===================================================================
--- extra-i686/ntpd.service	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntpd.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target nss-lookup.target
-
-[Service]
-Type=forking
-PrivateTmp=true
-ExecStart=/usr/bin/ntpd -g -u ntp:ntp
-ControlGroup=cpu:/
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: ntp/repos/extra-i686/ntpd.service (from rev 184341, ntp/trunk/ntpd.service)
===================================================================
--- extra-i686/ntpd.service	                        (rev 0)
+++ extra-i686/ntpd.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Network Time Service
+After=network.target nss-lookup.target
+
+[Service]
+Type=forking
+PrivateTmp=true
+ExecStart=/usr/bin/ntpd -g -u ntp:ntp
+ControlGroup=cpu:/
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-i686/ntpdate
===================================================================
--- extra-i686/ntpdate	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntpdate	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac

Copied: ntp/repos/extra-i686/ntpdate (from rev 184341, ntp/trunk/ntpdate)
===================================================================
--- extra-i686/ntpdate	                        (rev 0)
+++ extra-i686/ntpdate	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ntpd.conf
+
+case "$1" in
+	start)
+		stat_busy "Starting NTP Client"
+		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
+			add_daemon ntpdate
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NTP Client"
+		rm_daemon ntpdate
+		stat_done
+		;;
+	restart)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac

Deleted: extra-i686/ntpdate.service
===================================================================
--- extra-i686/ntpdate.service	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-i686/ntpdate.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,12 +0,0 @@
-[Unit]
-Description=One-Shot Network Time Service
-After=network.target nss-lookup.target
-
-[Service]
-Type=oneshot
-PrivateTmp=true
-ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
-ControlGroup=cpu:/
-
-[Install]
-WantedBy=multi-user.target

Copied: ntp/repos/extra-i686/ntpdate.service (from rev 184341, ntp/trunk/ntpdate.service)
===================================================================
--- extra-i686/ntpdate.service	                        (rev 0)
+++ extra-i686/ntpdate.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,12 @@
+[Unit]
+Description=One-Shot Network Time Service
+After=network.target nss-lookup.target
+
+[Service]
+Type=oneshot
+PrivateTmp=true
+ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/PKGBUILD	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=13
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'libcap')
-optdepends=('libedit: ntpdc, ntpq')
-makedepends=('perl-html-parser' 'libedit')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.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'
-)
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linuxcaps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	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"
-	
-	cd html
-	../scripts/html2man
-	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/systemd/ntp-units.d"
-	echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list"
-}

Copied: ntp/repos/extra-x86_64/PKGBUILD (from rev 184343, ntp/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+
+pkgname=ntp
+pkgver=4.2.6.p5
+_realver=4.2.6p5
+pkgrel=14
+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')
+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'
+)
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${_realver}"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-linuxcaps \
+		--enable-ntp-signd \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${_realver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	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"
+	
+	cd html
+	../scripts/html2man
+	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/systemd/ntp-units.d"
+	echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list"
+}

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/install	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,37 +0,0 @@
-post_install() {
-	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
-	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
-	true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
-		cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
-		cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
-		post_install
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
-		chown -R ntp /var/lib/ntp
-	fi
-}
-
-post_remove() {
-	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
-	getent group ntp &>/dev/null && groupdel ntp >/dev/null
-	true
-}

Copied: ntp/repos/extra-x86_64/install (from rev 184343, ntp/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,37 @@
+post_install() {
+	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
+	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
+	true
+}
+
+post_upgrade() {
+	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
+		cat <<EOF
+
+==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
+==> If you made changes to the former, please update the latter.
+
+EOF
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
+		cat <<EOF
+
+==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
+==> and the new rc.d script only takes the latter into account.
+==> To stop your old ntpd process, please kill it manually.
+
+EOF
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
+		post_install
+	fi
+	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
+		chown -R ntp /var/lib/ntp
+	fi
+}
+
+post_remove() {
+	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
+	getent group ntp &>/dev/null && groupdel ntp >/dev/null
+	true
+}

Deleted: extra-x86_64/ntp.conf
===================================================================
--- extra-x86_64/ntp.conf	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntp.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,22 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default noquery nopeer
-restrict 127.0.0.1
-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

Copied: ntp/repos/extra-x86_64/ntp.conf (from rev 184343, ntp/trunk/ntp.conf)
===================================================================
--- extra-x86_64/ntp.conf	                        (rev 0)
+++ extra-x86_64/ntp.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,22 @@
+# With the default settings below, ntpd will only synchronize your clock.
+#
+# For details, see:
+# - the ntp.conf man page
+# - http://support.ntp.org/bin/view/Support/GettingStarted
+# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
+
+# Associate to public NTP pool servers; see http://www.pool.ntp.org/
+server 0.pool.ntp.org
+server 1.pool.ntp.org
+server 2.pool.ntp.org
+
+# Only allow read-only access from localhost
+restrict default noquery nopeer
+restrict 127.0.0.1
+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

Deleted: extra-x86_64/ntpd
===================================================================
--- extra-x86_64/ntpd	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntpd	2013-05-06 10:28:53 UTC (rev 184344)
@@ -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

Copied: ntp/repos/extra-x86_64/ntpd (from rev 184343, ntp/trunk/ntpd)
===================================================================
--- extra-x86_64/ntpd	                        (rev 0)
+++ extra-x86_64/ntpd	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,47 @@
+#!/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: extra-x86_64/ntpd.conf
===================================================================
--- extra-x86_64/ntpd.conf	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntpd.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -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"

Copied: ntp/repos/extra-x86_64/ntpd.conf (from rev 184343, ntp/trunk/ntpd.conf)
===================================================================
--- extra-x86_64/ntpd.conf	                        (rev 0)
+++ extra-x86_64/ntpd.conf	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,5 @@
+# client options for "ntpd -q" - ntpdate equivalent
+NTP_CLIENT_OPTION="-g -u ntp"
+
+# arguments passed to ntpd when started
+NTPD_ARGS="-g -u ntp"

Deleted: extra-x86_64/ntpd.service
===================================================================
--- extra-x86_64/ntpd.service	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntpd.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target nss-lookup.target
-
-[Service]
-Type=forking
-PrivateTmp=true
-ExecStart=/usr/bin/ntpd -g -u ntp:ntp
-ControlGroup=cpu:/
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: ntp/repos/extra-x86_64/ntpd.service (from rev 184343, ntp/trunk/ntpd.service)
===================================================================
--- extra-x86_64/ntpd.service	                        (rev 0)
+++ extra-x86_64/ntpd.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Network Time Service
+After=network.target nss-lookup.target
+
+[Service]
+Type=forking
+PrivateTmp=true
+ExecStart=/usr/bin/ntpd -g -u ntp:ntp
+ControlGroup=cpu:/
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/ntpdate
===================================================================
--- extra-x86_64/ntpdate	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntpdate	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac

Copied: ntp/repos/extra-x86_64/ntpdate (from rev 184343, ntp/trunk/ntpdate)
===================================================================
--- extra-x86_64/ntpdate	                        (rev 0)
+++ extra-x86_64/ntpdate	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ntpd.conf
+
+case "$1" in
+	start)
+		stat_busy "Starting NTP Client"
+		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
+			add_daemon ntpdate
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NTP Client"
+		rm_daemon ntpdate
+		stat_done
+		;;
+	restart)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac

Deleted: extra-x86_64/ntpdate.service
===================================================================
--- extra-x86_64/ntpdate.service	2013-05-06 10:27:52 UTC (rev 184343)
+++ extra-x86_64/ntpdate.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -1,12 +0,0 @@
-[Unit]
-Description=One-Shot Network Time Service
-After=network.target nss-lookup.target
-
-[Service]
-Type=oneshot
-PrivateTmp=true
-ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
-ControlGroup=cpu:/
-
-[Install]
-WantedBy=multi-user.target

Copied: ntp/repos/extra-x86_64/ntpdate.service (from rev 184343, ntp/trunk/ntpdate.service)
===================================================================
--- extra-x86_64/ntpdate.service	                        (rev 0)
+++ extra-x86_64/ntpdate.service	2013-05-06 10:28:53 UTC (rev 184344)
@@ -0,0 +1,12 @@
+[Unit]
+Description=One-Shot Network Time Service
+After=network.target nss-lookup.target
+
+[Service]
+Type=oneshot
+PrivateTmp=true
+ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list