[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a8b7d0a3d2becc1ebf858ab194855b11c9ae3179)

Vlad Glagolev scm at sourcemage.org
Sat Jul 16 03:24:48 EDT 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 net/chrony/BUILD              |    7 
 net/chrony/CONFIGURE          |    3 
 net/chrony/CONFLICTS          |    1 
 net/chrony/DEPENDS            |   19 +-
 net/chrony/DETAILS            |   53 +++++--
 net/chrony/HISTORY            |   13 +
 net/chrony/INSTALL            |   21 ++
 net/chrony/chrony.conf        |  317 ------------------------------------------
 net/chrony/init.d/chrony      |    3 
 net/chrony/init.d/chrony.conf |    3 
 10 files changed, 101 insertions(+), 339 deletions(-)

New commits:
commit a8b7d0a3d2becc1ebf858ab194855b11c9ae3179
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    chrony: post-update fixes

diff --git a/net/chrony/BUILD b/net/chrony/BUILD
index 5f5cfb1..98e121a 100755
--- a/net/chrony/BUILD
+++ b/net/chrony/BUILD
@@ -1,6 +1,9 @@
 ./configure --prefix=${INSTALL_ROOT}/usr \
             --mandir=${INSTALL_DIR}/usr/share/man \
            --infodir=${INSTALL_DIR}/usr/share/info \
-                     ${OPTS} &&
+                     ${CHRONY_OPTS} ${OPTS} &&
 make &&
-make docs
+
+if is_depends_enabled $SPELL texinfo; then
+  make docs
+fi
diff --git a/net/chrony/CONFIGURE b/net/chrony/CONFIGURE
new file mode 100755
index 0000000..9e991b3
--- /dev/null
+++ b/net/chrony/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option CHRONY_OPTS \
+                    "Enable IPv6?" y \
+                    "" "--disable-ipv6"
diff --git a/net/chrony/CONFLICTS b/net/chrony/CONFLICTS
deleted file mode 100755
index bc147d9..0000000
--- a/net/chrony/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts ntp
diff --git a/net/chrony/DEPENDS b/net/chrony/DEPENDS
index 6db15ba..c5623aa 100755
--- a/net/chrony/DEPENDS
+++ b/net/chrony/DEPENDS
@@ -1,4 +1,15 @@
-depends psmisc
-#psmisc contains killall
-depends texinfo
-optional_depends "readline" "" "" "Hit up-arrow and get the previous command"
+depends ncurses &&
+
+optional_depends texinfo "" "" "for info documentation" &&
+
+optional_depends MAIL-TRANSPORT-AGENT \
+                 "--with-sendmail=$INSTALL_ROOT/usr/lib/sendmail" "" \
+                 "for reporting big clock changes" &&
+
+optional_depends libcap \
+                 "" "--disable-linuxcaps" \
+                 "for Linux capabilities support" &&
+
+optional_depends readline \
+                 "" "--disable-readline" \
+                 "for line editing support"
diff --git a/net/chrony/DETAILS b/net/chrony/DETAILS
index 83c0bc8..8b4af4d 100755
--- a/net/chrony/DETAILS
+++ b/net/chrony/DETAILS
@@ -3,20 +3,53 @@
      SOURCE_HASH=sha512:6fe3d591eac13d5bf410e377212e3c0848fc0215301c1f6450c3934f20b6e5c21ee75f0ed0fd6798927c053ba2bc53ac4c44875d6517f1f452174c6bba62a4d0
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.tuxfamily.org/chrony/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://download.tuxfamily.org/$SPELL/$SOURCE
         WEB_SITE=http://chrony.sunsite.dk/
          ENTERED=20021216
       LICENSE[0]=GPL
         KEYWORDS="net"
-           SHORT="chrony syncs your time with an ntp server"
+           SHORT="daemon for maintaining the accuracy of computer clocks"
 cat << EOF
-Chrony is an implementation of Network Time Protocol by Richard Curnow.
-It handles an intermittently connected computer better than the ntp program,
-but does not yet know how to use a hardware reference clock (GPS receiver,
-cesium clock, etc.)
+Chrony can be used to keep your computer clock in step with the true time
+(actually UTC), and/or to keep a network of computers in time with one another.
 
-It has two programs: chronyd, the daemon, which talks on UDP port 123 to
-other time servers, and chronyc, which asks chronyd on port 323 how well
-it's keeping time.
+To keep in step with true time, your computer has to have a reference to look at.
+This could be one of the following:
+
+* Network time protocol (NTP) server.
+  The Internet contains a large number of NTP servers which themselves are
+  referenced to UTC (via other servers or directly connected hardware clocks).
+  If you can find and get access to one or more NTP servers you will be able to
+  configure Chronyd to synchronise your computer with them. Chronyd can also act
+  as an NTP server in its own right.
+
+* Your wristwatch.
+  If all else fails, you can periodically use chronyc to tell chronyd the true
+  time, by typing it into your keyboard and pressing Return at the correct epoch.
+  chronyd will work out the average rate at which your computer clock loses or
+  gains time, and compensate accordingly the rest of the time.
+
+  Obviously, the accuracy of this method is rather limited, but it can be used if
+  you have an isolated network of computers where the primary requirement is to
+  keep the computers synchronised together, with only a secondary requirement to
+  have them report the true time of day.
+
+* Hardware reference clock.
+  You might have a GPS receiver or radio clock receiver connected to your
+  computer. Chrony has limited support for some of these.
+
+* Your system’s real-time clock.
+  For all recent versions of Linux, there is support for using the systems
+  real-time clock (RTC) (the one that maintains the time when the system is
+  turned off) at boot time to restart Chronyd with a good estimate of the true
+  time. This is done by working out how much time the RTC gains or loses over a
+  certain period, and using this information to correct the RTC reading at the
+  next boot. This is useful for machines that are only powered up while they are
+  being used.
+
+  The other major feature is if you have an intermittent (e.g. dial-up)
+  connection to the network where your NTP servers are. Chronyd has been
+  specifically written to work well in this case, and it still works well in a
+  “permanently connected” mode.
 EOF
diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY
index 9b164cb..ff2499c 100644
--- a/net/chrony/HISTORY
+++ b/net/chrony/HISTORY
@@ -1,3 +1,15 @@
+2011-07-16 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated descriptions; quoting paths
+	* DEPENDS: renewed/corrected dependencies
+	* CONFLICTS: removed deprecated conflict with ntp
+	* CONFIGURE: added, for IPv6 option and future use
+	* BUILD: build docs optionally; use CHRONYD_OPTS
+	* INSTALL: install docs optionally; install config for init script;
+	  install upstream config examples
+	* chrony.conf: removed deprecated config
+	* init.d/chrony: use CHRONYD_ARGS
+	* init.d/chrony.conf: added, for optional chronyd commandline arguments
+
 2011-07-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.26
 
@@ -62,4 +74,3 @@
 
 2003-01-12 Pierre Abbat <phma at webjockey.net>
 	* DETAILS: Added md5sum.
-
diff --git a/net/chrony/INSTALL b/net/chrony/INSTALL
index 9440a04..12f4854 100755
--- a/net/chrony/INSTALL
+++ b/net/chrony/INSTALL
@@ -1,8 +1,21 @@
 default_install &&
-make_single &&
-make install-docs &&
-make_normal &&
+
+if is_depends_enabled $SPELL texinfo; then
+  make_single &&
+  make install-docs &&
+  make_normal
+fi &&
 
 if [[ ! -f "${INSTALL_ROOT}/etc/chrony.conf" ]]; then
-    cp -v "${SCRIPT_DIRECTORY}/chrony.conf" "${INSTALL_ROOT}/etc/"
+  install -vm 644 "${SOURCE_DIRECTORY}/examples/chrony.conf.example" \
+                  "${INSTALL_ROOT}/etc/chrony.conf"
+fi &&
+if [[ ! -f "${INSTALL_ROOT}/etc/chrony.keys" ]]; then
+  install -vm 640 "${SOURCE_DIRECTORY}/examples/chrony.keys.example" \
+                  "${INSTALL_ROOT}/etc/chrony.keys"
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "${SPELL_DIRECTORY}/init.d/chrony.conf" \
+                      "${INSTALL_ROOT}/etc/sysconfig/chrony"
 fi
diff --git a/net/chrony/chrony.conf b/net/chrony/chrony.conf
deleted file mode 100644
index d4ebc87..0000000
--- a/net/chrony/chrony.conf
+++ /dev/null
@@ -1,317 +0,0 @@
-#When run with this conf file as installed, chronyd will check about 64
-#time servers. This is WAY too many for normal operation. Let it run for 
-#several minutes, then run chronyc and type "sources". Pick 2 or 4 nearby
-#servers that are marked '+' and the one marked '*'. Comment the others out.
-
-driftfile /var/chrony.drift
-allow 192.168
-allow 10
-allow 172.16/12
-logdir /var/log/chrony
-#log measurements tracking
-keyfile /etc/chrony.keys
-commandkey 1
-#List of time servers from http://www.eecis.udel.edu/~mills/ntp/clock2.html at 2002-12-16
-server time.sinectis.com.ar
-#server 216.244.192.3
-server tick.nap.com.ar
-#server 200.49.40.1
-server tock.nap.com.ar
-#server 200.49.32.1
-server ntp.saard.net
-#server 203.21.37.18
-server time.deakin.edu.au
-#server 128.184.1.1
-server time.esec.com.au
-#server 203.21.84.4
-server ntp1.belbone.be
-#server 195.13.23.5
-server ntp2.belbone.be
-#server 195.13.1.153
-server ntp.cais.rnp.br
-#server 200.144.121.33
-server ntp.hiway.com.br
-#server 200.246.53.5
-server ntp.pop-pr.rnp.br
-#server 200.238.128.103
-server ntp.ufes.br
-#server 200.137.65.132
-server ntp1.pucpr.br
-#server 200.192.112.8
-server ntp.cpsc.ucalgary.ca
-#server 136.159.2.1
-server ntp1.cmc.ec.gc.ca
-server ntp2.cmc.ec.gc.ca
-server tick.utoronto.ca
-#server 128.100.103.252
-server time.chu.nrc.ca
-#server 209.87.233.53
-server time.nrc.ca
-#server 132.246.168.148
-server timelord.uregina.ca
-#server 142.3.100.15
-server tock.utoronto.ca
-#server 128.100.100.128
-server ntp.karpo.cz
-#server 217.11.227.68
-server clock.netcetera.dk
-#server 130.228.230.2
-server ntp.mikroskosmos.com
-#server 213.5.174.2
-server clock2.netcetera.dk
-#server 194.192.207.9
-server slug.ctv.es
-#server 194.179.52.14
-server tick.keso.fi
-#server 194.137.39.67
-server tock.keso.fi
-#server 194.137.39.68
-server ntp.obspm.fr
-server ntp.tuxfamily.net
-server ntp1.tuxfamily.net
-#server 80.67.177.2
-server ntp2.tuxfamily.net
-#server 80.67.179.2
-server ntp.univ-lyon1.fr
-#server 134.214.100.6
-server ntp.via.ecp.fr
-#server 138.195.130.71
-server zg1.ntp.carnet.hr
-#server 161.53.2.70
-server zg2.ntp.carnet.hr
-#server 161.53.123.4
-server st.ntp.carnet.hr
-#server 161.53.30.3
-server ri.ntp.carnet.hr
-#server 161.53.40.3
-server os.ntp.carnet.hr
-#server 161.53.200.8
-server time.kfki.hu
-#server 148.6.0.1
-server ntp.incaf.net
-#server 202.180.0.71
-server ntp.maths.tcd.ie
-#server ntps.net4u.it
-#server 80.83.192.129
-server ntp.cyber-fleet.net
-server ntp.ewha.net
-#server 211.39.143.103
-server time.nuri.net
-#server 203.255.112.4
-server ntp2a.audiotel.com.mx
-#server 200.34.146.67
-server ntp2b.audiotel.com.mx
-#server 200.34.146.68
-server ntp2c.audiotel.com.mx
-#server 200.34.146.69
-server ntp.supernet300.com
-#server 216.72.109.4
-server ntp1.theinternetone.net
-#server 62.4.94.221
-server ntp2.theinternetone.net
-#server 62.4.94.8
-server ntp3.theinternetone.net
-#server 62.4.94.210
-server fartein.ifi.uio.no
-#server 129.240.64.3
-server time.alcanet.no
-server ntp.iprolink.co.nz
-server ntp.massey.ac.nz
-#server 130.123.128.253
-server ntp.public.otago.ac.nz
-#server 139.80.64.114
-server tk1.ihug.co.nz
-server tk2.ihug.co.nz
-server tk3.ihug.co.nz
-server info.cyf-kr.edu.pl
-#server 149.156.4.11
-server bug.fe.up.pt
-#server 193.136.54.1
-server ntp.ip.ro
-#server 212.93.129.107
-server ntp.psn.ru
-#server 194.149.67.130
-server sign.chg.ru
-#server 193.233.46.10
-server ntp.lth.se
-#server 130.235.20.3
-server ntp.shim.org
-#server biofiz.mf.uni-lj.si
-#server 193.2.69.10
-server ntp1.arnes.si
-#server 193.2.1.66
-server ntp2.arnes.si
-#server 193.2.1.92
-server time.ijs.si
-#server 193.2.4.6
-server time.ijs.si
-#server 193.2.4.6
-server clock.cimat.ues.edu.sv
-#server 168.243.7.66
-server bear.zoo.bt.co.uk
-#server 132.146.236.132
-server ntp.cis.strath.ac.uk
-server ntp.exnet.com
-#server 194.207.34.9
-server ntp2a.mcc.ac.uk
-#server 130.88.202.49
-server ntp2b.mcc.ac.uk
-#server 130.88.200.98
-server ntp2c.mcc.ac.uk
-#server 130.88.200.4
-server ntp2d.mcc.ac.uk
-#server 130.88.203.12
-server ntp2.sandvika.net
-server ntp1.sandvika.net
-server ntp0.sandvika.net
-#server 194.164.127.{4|5|6}
-server ntp0.uk.uu.net
-#server 158.43.128.33
-server ntp1.uk.uu.net
-#server 158.43.128.66
-server ntp2.uk.uu.net
-#server 158.43.192.66
-server tick.tanac.net
-#server 195.112.34.51
-server sushi.compsci.lyon.edu
-#server 150.208.72.154
-server ntp.drydog.com
-#server 207.211.160.111
-server ntp.ucsd.edu
-#server 132.239.254.49
-server ntp1.mainecoon.com
-#server 63.192.96.2
-server ntp2.mainecoon.com
-#server 63.192.96.3
-server ntp1.sf-bay.org
-#server 207.126.97.57
-server ntp2.sf-bay.org
-#server 204.74.68.55
-server reloj.kjsl.com
-#server 204.87.183.6
-server time.berkeley.netdot.net
-#server 216.27.190.202
-server time.five-ten-sg.com
-#server 205.147.40.34
-server louie.udel.edu
-#server 128.4.40.12
-server ntp.shorty.com
-#server 208.21.108.186
-server rolex.usg.edu
-server timex.usg.edu
-server chrivh40.cch.com
-#server 198.147.37.140
-server ntp-0.cso.uiuc.edu
-#server 130.126.24.53
-server ntp-1.cso.uiuc.edu
-#server 130.126.24.24
-server ntp-1.mcs.anl.gov
-#server 140.221.9.20
-server ntp-2.cso.uiuc.edu
-#server 130.126.24.44
-server ntp-2.mcs.anl.gov
-#server 140.221.9.6
-server cisco3.cerias.purdue.edu
-#server 128.10.252.7
-server gilbreth.ecn.purdue.edu
-#server 128.46.129.93# 128.46.141.93# 128.46.147.93# 128.46.148.93# 128.46.171.93
-server harbor.ecn.purdue.edu
-#server 128.46.128.76# 128.46.129.76# 128.46.154.76
-server horologe.cerias.purdue.edu
-#server 128.10.252.1
-server molecule.ecn.purdue.edu
-#server 128.46.129.95# 128.46.132.95# 128.46.136.95# 128.46.145.95# 128.46.167.95# 128.46.169.95# 128.46.181.95
-server tick.cerias.purdue.edu
-#server 128.10.252.9
-server tock.cerias.purdue.edu
-#server 128.10.252.10
-server time.cerias.purdue.edu
-#server 128.10.252.7
-server darkcity.cerias.purdue.edu
-server ntp1.kansas.net
-#server 199.240.130.1
-server ntp2.kansas.net
-#server 199.240.130.12
-server ntp.ourconcord.net
-#server 140.239.10.5
-server ns.nts.umn.edu
-#server 128.101.101.101
-server nss.nts.umn.edu
-#server 134.84.84.84
-server time-ext.missouri.edu
-server chronos1.umt.edu
-#server 192.73.48.1
-server chronos2.umt.edu
-#server 192.73.48.2
-server chronos3.umt.edu
-#server 192.73.48.6
-server clock1.unc.edu
-#server 152.2.21.1
-server tick.jrc.us
-#server 65.211.109.1
-server tock.jrc.us
-#server 65.211.109.11
-server cuckoo.nevada.edu
-#server 131.216.1.101
-server tick.cs.unlv.edu
-#server 131.216.22.15
-server tock.cs.unlv.edu
-#server 131.216.22.17
-server cuckoo.nevada.edu
-#server 131.216.1.101
-server clock.linuxshell.net
-#server 64.243.118.2
-server ntp.ctr.columbia.edu
-#server 128.59.64.60
-server ntp0.cornell.edu
-server sundial.columbia.edu
-#server 128.59.59.177
-server timex.cs.columbia.edu
-#server 128.59.16.20
-server constellation.ecn.uoknor.edu
-#server 129.15.22.8
-server clock-1.cs.cmu.edu
-#server 128.2.250.95
-server clock-2.cs.cmu.edu
-#server 128.2.222.8
-server clock.psu.edu
-#server 128.118.25.3
-server fuzz.psc.edu
-#server 128.182.58.100
-server ntp-1.ece.cmu.edu
-#server 128.2.136.71
-server ntp-2.ece.cmu.edu
-#server 128.2.129.21
-server ntp.cox.smu.edu
-#server 129.119.80.126
-server ntp.fnbhs.com
-#server 209.144.20.76
-server ntp.tmc.edu
-#server 128.249.1.10
-server ntppub.tamu.edu
-server tick.greyware.com
-#server 207.55.146.19
-server tock.greyware.com
-#server 207.55.146.54
-server ntp-1.vt.edu
-#server 198.82.162.213
-server ntp-2.vt.edu
-#server 198.82.161.227
-server ntp.cmr.gov
-#server 140.162.8.3
-server ntp0.state.vt.us
-#server 159.105.23.194
-server ntp1.state.vt.us
-#server 159.105.23.130
-server ntp2.state.vt.us
-#server 170.222.64.130
-server ntp1.cs.wisc.edu
-#server 128.105.39.11
-server ntp3.cs.wisc.edu
-#server 128.105.37.11
-server ntp3.sf-bay.org
-#server 207.126.97.57
-server ntp.linux.org.ve
-#server 150.188.8.196
-server ntp.cs.unp.ac.za
-#server 143.128.82.200
diff --git a/net/chrony/init.d/chrony b/net/chrony/init.d/chrony
old mode 100644
new mode 100755
index 05dfc21..97e5667
--- a/net/chrony/init.d/chrony
+++ b/net/chrony/init.d/chrony
@@ -1,6 +1,9 @@
 #!/bin/bash
 
+. /etc/sysconfig/chrony
+
 PROGRAM=/usr/sbin/chronyd
+ARGS="$CHRONYD_ARGS"
 RUNLEVEL=3
 NEEDS="+network +remote_fs"
 
diff --git a/net/chrony/init.d/chrony.conf b/net/chrony/init.d/chrony.conf
new file mode 100644
index 0000000..1aa824a
--- /dev/null
+++ b/net/chrony/init.d/chrony.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see chronyd(8)
+
+CHRONYD_ARGS=""


More information about the SM-Commit mailing list