[arch-commits] Commit in ntp/repos (13 files)
Gaetan Bisson
bisson at archlinux.org
Sun Jan 1 01:38:19 UTC 2012
Date: Saturday, December 31, 2011 @ 20:38:19
Author: bisson
Revision: 145791
db-move: moved ntp from [testing] to [extra] (x86_64)
Added:
ntp/repos/extra-x86_64/PKGBUILD
(from rev 145787, ntp/repos/testing-x86_64/PKGBUILD)
ntp/repos/extra-x86_64/install
(from rev 145787, ntp/repos/testing-x86_64/install)
ntp/repos/extra-x86_64/ntp.conf
(from rev 145787, ntp/repos/testing-x86_64/ntp.conf)
ntp/repos/extra-x86_64/ntpd
(from rev 145787, ntp/repos/testing-x86_64/ntpd)
ntp/repos/extra-x86_64/ntpd.conf
(from rev 145787, ntp/repos/testing-x86_64/ntpd.conf)
ntp/repos/extra-x86_64/ntpdate
(from rev 145787, ntp/repos/testing-x86_64/ntpdate)
Deleted:
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/ntpdate
ntp/repos/testing-x86_64/
-----------+
PKGBUILD | 123 ++++++++++++++++++++++++++++++------------------------------
install | 29 +++++++++-----
ntp.conf | 46 +++++++++++-----------
ntpd | 99 ++++++++++++++++++++++--------------------------
ntpd.conf | 10 ++--
ntpdate | 60 ++++++++++++++---------------
6 files changed, 185 insertions(+), 182 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/PKGBUILD 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,61 +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=1
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'readline' 'libcap')
-makedepends=('perl-html-parser')
-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')
-sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
- '97b41b8bc34f259f4e525ab2e58707c9724e72e2'
- '63572457586379aa6bf75b6e899e71d651e643f4'
- 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
- '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${_realver}"
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-linux-caps \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-$_realver"
-
- make DESTDIR="${pkgdir}" install
-
- 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
-
- 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
- cd ..
-
- rmdir "${pkgdir}"/usr/{lib,sbin}
- install -d "${pkgdir}/var/lib/ntp"
- install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- touch "${pkgdir}"/var/lib/ntp/.placeholder
-}
Copied: ntp/repos/extra-x86_64/PKGBUILD (from rev 145787, ntp/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-01-01 01:38:19 UTC (rev 145791)
@@ -0,0 +1,62 @@
+# $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=2
+pkgdesc='Network Time Protocol reference implementation'
+url='http://www.ntp.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('openssl' 'readline' 'libcap')
+makedepends=('perl-html-parser')
+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')
+sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
+ '4e324e625c1f080b5c028be5092aa71adbf9bd99'
+ '01394b8a952f5edc85d19df8335eeac3980320f4'
+ 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
+ '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${_realver}"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --enable-linux-caps \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-$_realver"
+
+ make DESTDIR="${pkgdir}" install
+
+ 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
+
+ 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
+ cd ..
+
+ rmdir "${pkgdir}"/usr/{lib,sbin}
+ install -d "${pkgdir}/var/lib/ntp"
+ install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ touch "${pkgdir}"/var/lib/ntp/.placeholder
+}
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/install 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,10 +0,0 @@
-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
-}
Copied: ntp/repos/extra-x86_64/install (from rev 145787, ntp/repos/testing-x86_64/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2012-01-01 01:38:19 UTC (rev 145791)
@@ -0,0 +1,19 @@
+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
+}
Deleted: extra-x86_64/ntp.conf
===================================================================
--- extra-x86_64/ntp.conf 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/ntp.conf 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,23 +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
-
-# Select three geolocalized NTP public 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 nomodify 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/extra-x86_64/ntp.conf (from rev 145787, ntp/repos/testing-x86_64/ntp.conf)
===================================================================
--- extra-x86_64/ntp.conf (rev 0)
+++ extra-x86_64/ntp.conf 2012-01-01 01:38:19 UTC (rev 145791)
@@ -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
+
+# Select three geolocalized NTP public 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 nomodify 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
Deleted: extra-x86_64/ntpd
===================================================================
--- extra-x86_64/ntpd 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/ntpd 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-PIDFILE="/var/run/ntpd/ntpd.pid"
-PID=$(cat $PIDFILE 2> /dev/null)
-
-case "$1" in
- start)
- stat_busy "Starting NTP Daemon"
- [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null
- if [ -z "$PID" ]; then
- /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon ntpd
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping NTP Daemon"
- if [ -n "$PID" ]; then
- kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm $PIDFILE &>/dev/null
- rm_daemon ntpd
- stat_done
- fi
- 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 145787, ntp/repos/testing-x86_64/ntpd)
===================================================================
--- extra-x86_64/ntpd (rev 0)
+++ extra-x86_64/ntpd 2012-01-01 01:38:19 UTC (rev 145791)
@@ -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 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/ntpd.conf 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"
Copied: ntp/repos/extra-x86_64/ntpd.conf (from rev 145787, ntp/repos/testing-x86_64/ntpd.conf)
===================================================================
--- extra-x86_64/ntpd.conf (rev 0)
+++ extra-x86_64/ntpd.conf 2012-01-01 01:38:19 UTC (rev 145791)
@@ -0,0 +1,5 @@
+# client options for "ntpd -q" - ntpdate equivalent
+NTP_CLIENT_OPTION="-g"
+
+# arguments passed to ntpd when started
+NTPD_ARGS="-g"
Deleted: extra-x86_64/ntpdate
===================================================================
--- extra-x86_64/ntpdate 2012-01-01 01:38:16 UTC (rev 145790)
+++ extra-x86_64/ntpdate 2012-01-01 01:38:19 UTC (rev 145791)
@@ -1,31 +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"
- /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon ntpdate
- stat_done
- 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 145787, ntp/repos/testing-x86_64/ntpdate)
===================================================================
--- extra-x86_64/ntpdate (rev 0)
+++ extra-x86_64/ntpdate 2012-01-01 01:38:19 UTC (rev 145791)
@@ -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
More information about the arch-commits
mailing list