Date: Saturday, June 16, 2012 @ 13:15:59
Author: dreisner
Revision: 161933
db-move: moved ntp from [staging] to [testing] ( i686, x86_64)
Added:
ntp/repos/testing-i686/
ntp/repos/testing-i686/PKGBUILD
(from rev 161923, ntp/repos/staging-i686/PKGBUILD)
ntp/repos/testing-i686/install
(from rev 161923, ntp/repos/staging-i686/install)
ntp/repos/testing-i686/logrotate.d
(from rev 161923, ntp/repos/staging-i686/logrotate.d)
ntp/repos/testing-i686/ntp.conf
(from rev 161923, ntp/repos/staging-i686/ntp.conf)
ntp/repos/testing-i686/ntpd
(from rev 161923, ntp/repos/staging-i686/ntpd)
ntp/repos/testing-i686/ntpd.conf
(from rev 161923, ntp/repos/staging-i686/ntpd.conf)
ntp/repos/testing-i686/ntpd.service
(from rev 161923, ntp/repos/staging-i686/ntpd.service)
ntp/repos/testing-i686/ntpdate
(from rev 161923, ntp/repos/staging-i686/ntpdate)
ntp/repos/testing-x86_64/
ntp/repos/testing-x86_64/PKGBUILD
(from rev 161923, ntp/repos/staging-x86_64/PKGBUILD)
ntp/repos/testing-x86_64/install
(from rev 161923, ntp/repos/staging-x86_64/install)
ntp/repos/testing-x86_64/logrotate.d
(from rev 161923, ntp/repos/staging-x86_64/logrotate.d)
ntp/repos/testing-x86_64/ntp.conf
(from rev 161923, ntp/repos/staging-x86_64/ntp.conf)
ntp/repos/testing-x86_64/ntpd
(from rev 161923, ntp/repos/staging-x86_64/ntpd)
ntp/repos/testing-x86_64/ntpd.conf
(from rev 161923, ntp/repos/staging-x86_64/ntpd.conf)
ntp/repos/testing-x86_64/ntpd.service
(from rev 161923, ntp/repos/staging-x86_64/ntpd.service)
ntp/repos/testing-x86_64/ntpdate
(from rev 161923, ntp/repos/staging-x86_64/ntpdate)
Deleted:
ntp/repos/staging-i686/
ntp/repos/staging-x86_64/
-----------------------------+
testing-i686/PKGBUILD | 64 ++++++++++++++++++++++++++++++++++++++++++
testing-i686/install | 37 ++++++++++++++++++++++++
testing-i686/logrotate.d | 4 ++
testing-i686/ntp.conf | 23 +++++++++++++++
testing-i686/ntpd | 47 ++++++++++++++++++++++++++++++
testing-i686/ntpd.conf | 5 +++
testing-i686/ntpd.service | 12 +++++++
testing-i686/ntpdate | 29 +++++++++++++++++++
testing-x86_64/PKGBUILD | 64 ++++++++++++++++++++++++++++++++++++++++++
testing-x86_64/install | 37 ++++++++++++++++++++++++
testing-x86_64/logrotate.d | 4 ++
testing-x86_64/ntp.conf | 23 +++++++++++++++
testing-x86_64/ntpd | 47 ++++++++++++++++++++++++++++++
testing-x86_64/ntpd.conf | 5 +++
testing-x86_64/ntpd.service | 12 +++++++
testing-x86_64/ntpdate | 29 +++++++++++++++++++
16 files changed, 442 insertions(+)
Copied: ntp/repos/testing-i686/PKGBUILD (from rev 161923,
ntp/repos/staging-i686/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: kevin <ke...@archlinux.org>
+
+pkgname=ntp
+pkgver=4.2.6.p5
+_realver=4.2.6p5
+pkgrel=7
+pkgdesc='Network Time Protocol reference implementation'
+url='http://www.ntp.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+makedepends=('perl-html-parser')
+depends=('openssl' 'readline' 'libcap')
+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'
+ 'logrotate.d'
+ 'ntpd.service')
+sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
+ '4e324e625c1f080b5c028be5092aa71adbf9bd99'
+ '01394b8a952f5edc85d19df8335eeac3980320f4'
+ 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
+ '4537d1f58b299d463db5048129cb264511474b0b'
+ '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
+ '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
+
+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 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
+ install -Dm644 ../ntpd.service
"${pkgdir}"/usr/lib/systemd/system/ntpd.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
+}
Copied: ntp/repos/testing-i686/install (from rev 161923,
ntp/repos/staging-i686/install)
===================================================================
--- testing-i686/install (rev 0)
+++ testing-i686/install 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
+}
Copied: ntp/repos/testing-i686/logrotate.d (from rev 161923,
ntp/repos/staging-i686/logrotate.d)
===================================================================
--- testing-i686/logrotate.d (rev 0)
+++ testing-i686/logrotate.d 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,4 @@
+/var/log/ntp.log {
+ missingok
+ copytruncate
+}
Copied: ntp/repos/testing-i686/ntp.conf (from rev 161923,
ntp/repos/staging-i686/ntp.conf)
===================================================================
--- testing-i686/ntp.conf (rev 0)
+++ testing-i686/ntp.conf 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,23 @@
+# 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 and log files
+driftfile /var/lib/ntp/ntp.drift
+logfile /var/log/ntp.log
+
+# 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/testing-i686/ntpd (from rev 161923,
ntp/repos/staging-i686/ntpd)
===================================================================
--- testing-i686/ntpd (rev 0)
+++ testing-i686/ntpd 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
Copied: ntp/repos/testing-i686/ntpd.conf (from rev 161923,
ntp/repos/staging-i686/ntpd.conf)
===================================================================
--- testing-i686/ntpd.conf (rev 0)
+++ testing-i686/ntpd.conf 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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"
Copied: ntp/repos/testing-i686/ntpd.service (from rev 161923,
ntp/repos/staging-i686/ntpd.service)
===================================================================
--- testing-i686/ntpd.service (rev 0)
+++ testing-i686/ntpd.service 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Network Time Service
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/ntpd.pid
+EnvironmentFile=/etc/conf.d/ntpd.conf
+ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid
+
+[Install]
+WantedBy=multi-user.target
Copied: ntp/repos/testing-i686/ntpdate (from rev 161923,
ntp/repos/staging-i686/ntpdate)
===================================================================
--- testing-i686/ntpdate (rev 0)
+++ testing-i686/ntpdate 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
Copied: ntp/repos/testing-x86_64/PKGBUILD (from rev 161923,
ntp/repos/staging-x86_64/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: kevin <ke...@archlinux.org>
+
+pkgname=ntp
+pkgver=4.2.6.p5
+_realver=4.2.6p5
+pkgrel=7
+pkgdesc='Network Time Protocol reference implementation'
+url='http://www.ntp.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+makedepends=('perl-html-parser')
+depends=('openssl' 'readline' 'libcap')
+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'
+ 'logrotate.d'
+ 'ntpd.service')
+sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
+ '4e324e625c1f080b5c028be5092aa71adbf9bd99'
+ '01394b8a952f5edc85d19df8335eeac3980320f4'
+ 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
+ '4537d1f58b299d463db5048129cb264511474b0b'
+ '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
+ '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
+
+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 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
+ install -Dm644 ../ntpd.service
"${pkgdir}"/usr/lib/systemd/system/ntpd.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
+}
Copied: ntp/repos/testing-x86_64/install (from rev 161923,
ntp/repos/staging-x86_64/install)
===================================================================
--- testing-x86_64/install (rev 0)
+++ testing-x86_64/install 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
+}
Copied: ntp/repos/testing-x86_64/logrotate.d (from rev 161923,
ntp/repos/staging-x86_64/logrotate.d)
===================================================================
--- testing-x86_64/logrotate.d (rev 0)
+++ testing-x86_64/logrotate.d 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,4 @@
+/var/log/ntp.log {
+ missingok
+ copytruncate
+}
Copied: ntp/repos/testing-x86_64/ntp.conf (from rev 161923,
ntp/repos/staging-x86_64/ntp.conf)
===================================================================
--- testing-x86_64/ntp.conf (rev 0)
+++ testing-x86_64/ntp.conf 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,23 @@
+# 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 and log files
+driftfile /var/lib/ntp/ntp.drift
+logfile /var/log/ntp.log
+
+# 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/testing-x86_64/ntpd (from rev 161923,
ntp/repos/staging-x86_64/ntpd)
===================================================================
--- testing-x86_64/ntpd (rev 0)
+++ testing-x86_64/ntpd 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
Copied: ntp/repos/testing-x86_64/ntpd.conf (from rev 161923,
ntp/repos/staging-x86_64/ntpd.conf)
===================================================================
--- testing-x86_64/ntpd.conf (rev 0)
+++ testing-x86_64/ntpd.conf 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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"
Copied: ntp/repos/testing-x86_64/ntpd.service (from rev 161923,
ntp/repos/staging-x86_64/ntpd.service)
===================================================================
--- testing-x86_64/ntpd.service (rev 0)
+++ testing-x86_64/ntpd.service 2012-06-16 17:15:59 UTC (rev 161933)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Network Time Service
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/ntpd.pid
+EnvironmentFile=/etc/conf.d/ntpd.conf
+ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid
+
+[Install]
+WantedBy=multi-user.target
Copied: ntp/repos/testing-x86_64/ntpdate (from rev 161923,
ntp/repos/staging-x86_64/ntpdate)
===================================================================
--- testing-x86_64/ntpdate (rev 0)
+++ testing-x86_64/ntpdate 2012-06-16 17:15:59 UTC (rev 161933)
@@ -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
