diff options
author | Juergen Daubert <jue@jue.li> | 2015-10-19 12:22:18 +0200 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2015-10-19 12:22:18 +0200 |
commit | a61ed85214886451755b983d4835e80f3ea2ca1d (patch) | |
tree | b4aa1c0ee99d63a0a92c2c65a590d11437c6e28d /chrony | |
parent | 4c536ac992148ae95a1cdc8202e1ccfdc199ed76 (diff) | |
download | opt-a61ed85214886451755b983d4835e80f3ea2ca1d.tar.gz opt-a61ed85214886451755b983d4835e80f3ea2ca1d.tar.xz |
[notify] chrony: update to 2.2
authentication scheme has been changed, see
- http://article.gmane.org/gmane.comp.time.chrony.devel/1308
- http://chrony.tuxfamily.org/news.html
Diffstat (limited to 'chrony')
-rw-r--r-- | chrony/.footprint | 3 | ||||
-rw-r--r-- | chrony/.md5sum | 7 | ||||
-rw-r--r-- | chrony/Pkgfile | 10 | ||||
-rw-r--r-- | chrony/chrony.conf | 1 | ||||
-rw-r--r-- | chrony/chrony.keys | 7 | ||||
-rw-r--r-- | chrony/chronyd | 9 |
6 files changed, 10 insertions, 27 deletions
diff --git a/chrony/.footprint b/chrony/.footprint index d9c497abb..cf722a7e2 100644 --- a/chrony/.footprint +++ b/chrony/.footprint @@ -1,6 +1,5 @@ drwxr-xr-x root/root etc/ -rw------- root/root etc/chrony.conf --rw------- root/root etc/chrony.keys drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/chronyd drwxr-xr-x root/root usr/ @@ -20,3 +19,5 @@ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/chrony/ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/chrony/ +drwxr-xr-x root/root var/run/ +drwxr-x--- root/root var/run/chrony/ diff --git a/chrony/.md5sum b/chrony/.md5sum index 5042000bf..93ae69032 100644 --- a/chrony/.md5sum +++ b/chrony/.md5sum @@ -1,4 +1,3 @@ -15e470a51ab6e09e65bc0a2fbc5299af chrony-2.1.1.tar.gz -4dff89484fe7b6d6397a9501c7ae51ed chrony.conf -ec43dcf700698a7d2891a1f8504b5e22 chrony.keys -2999f364c83286816d71379130d1eae6 chronyd +17bc77d3d2ce942675f9600b60452717 chrony-2.2.tar.gz +e31f942cdd3f6f00f41f6de344a4e5e2 chrony.conf +d796db9fedfc3ab9cadca2e102caa97b chronyd diff --git a/chrony/Pkgfile b/chrony/Pkgfile index 1a944611c..7a68085c3 100644 --- a/chrony/Pkgfile +++ b/chrony/Pkgfile @@ -4,22 +4,20 @@ # Depends on: readline libcap name=chrony -version=2.1.1 +version=2.2 release=1 source=(http://download.tuxfamily.org/$name/$name-$version.tar.gz - chronyd chrony.conf chrony.keys) + chronyd chrony.conf) build () { cd $name-$version - + ./configure --prefix=/usr --mandir=/usr/man make - touch chrony.txt make DESTDIR=$PKG install - rm -r $PKG/usr/share - install -d $PKG/var/{lib,log}/chrony + install -d -m 0750 $PKG/var/run/chrony install -D -m 755 $SRC/chronyd $PKG/etc/rc.d/chronyd install -m 600 $SRC/chrony.* $PKG/etc } diff --git a/chrony/chrony.conf b/chrony/chrony.conf index 35bdc481a..1b325ce0d 100644 --- a/chrony/chrony.conf +++ b/chrony/chrony.conf @@ -9,7 +9,6 @@ server pool.ntp.org maxupdateskew 100 -commandkey 1 dumponexit log measurements statistics tracking diff --git a/chrony/chrony.keys b/chrony/chrony.keys deleted file mode 100644 index ebed225c0..000000000 --- a/chrony/chrony.keys +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/chrony.keys -# - -1 my_password - -# End of file
\ No newline at end of file diff --git a/chrony/chronyd b/chrony/chronyd index e4d8a5300..c11331b80 100644 --- a/chrony/chronyd +++ b/chrony/chronyd @@ -8,9 +8,6 @@ PROG=/usr/sbin/chronyd PID=/var/run/chronyd.pid OPTS="-s -r" -KEY=$(sed -n "s/^commandkey *//p" /etc/chrony.conf) -PASSWD=$(sed -n "s/^$KEY *//p" /etc/chrony.keys) - case $1 in start) $SSD --start --pidfile $PID --exec $PROG -- $OPTS @@ -23,14 +20,10 @@ restart) $0 start ;; online) - /usr/bin/chronyc << EOF > /dev/null - password $PASSWD - online -EOF + /usr/bin/chronyc online ;; offline) /usr/bin/chronyc << EOF > /dev/null - password $PASSWD offline dump writertc |