commit 3547f6d8bef14a87b92d078e4349f5cef9d238a3 Author: Juergen Daubert <jue@jue.li> Date: Wed Dec 2 12:09:08 2015 +0100 chrony: install config file from sources, don't use -s option on startup, remove README diff --git a/chrony/.footprint b/chrony/.footprint index cf722a7..53004ba 100644 --- a/chrony/.footprint +++ b/chrony/.footprint @@ -1,19 +1,20 @@ drwxr-xr-x root/root etc/ --rw------- root/root etc/chrony.conf +-rwxr-xr-x root/root etc/chrony.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/chronyd drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/chronyc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/chronyc.1.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/chrony.conf.5.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/chronyd.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/chronyd +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/chronyc.1.gz +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/chrony.conf.5.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/chronyd.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/chrony/ diff --git a/chrony/.md5sum b/chrony/.md5sum index 93ae690..f209a68 100644 --- a/chrony/.md5sum +++ b/chrony/.md5sum @@ -1,3 +1,2 @@ 17bc77d3d2ce942675f9600b60452717 chrony-2.2.tar.gz -e31f942cdd3f6f00f41f6de344a4e5e2 chrony.conf -d796db9fedfc3ab9cadca2e102caa97b chronyd +4bdea4aea28853c7be54ffdb9f6b87a8 chronyd diff --git a/chrony/Pkgfile b/chrony/Pkgfile index 7a68085..de71b00 100644 --- a/chrony/Pkgfile +++ b/chrony/Pkgfile @@ -5,19 +5,19 @@ name=chrony version=2.2 -release=1 +release=2 source=(http://download.tuxfamily.org/$name/$name-$version.tar.gz - chronyd chrony.conf) + chronyd) build () { cd $name-$version - ./configure --prefix=/usr --mandir=/usr/man + ./configure --prefix=/usr make make DESTDIR=$PKG install 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 + install -D -m 0755 $SRC/chronyd $PKG/etc/rc.d/chronyd + install examples/chrony.conf.example1 $PKG/etc/chrony.conf } diff --git a/chrony/README b/chrony/README deleted file mode 100644 index 9f1f933..0000000 --- a/chrony/README +++ /dev/null @@ -1,25 +0,0 @@ -README for chrony 2.x - -REQUIREMENTS - -PRE-INSTALL - -POST-INSTALL - -Add up to eight time server of your country to /etc/chrony.conf. -A list of public servers can be found here: - - http://www.eecis.udel.edu/~mills/ntp/clock1a.html - http://www.eecis.udel.edu/~mills/ntp/clock2a.html - - -PRECAUTION - -Remove the '/sbin/hwclock ...' entries from /etc/rc.shutdown and -/etc/rc. No other software should manipulate the system hardware -clock if chronyd is running. - -The start script /etc/rc.d/chronyd has online and offline options. -Use this in your ip-up/ip-down scripts to tell chrony whether we are -online or offline. - diff --git a/chrony/chrony.conf b/chrony/chrony.conf deleted file mode 100644 index a8240db..0000000 --- a/chrony/chrony.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# /etc/chrony.conf -# - -# Change this to some puplic NTP server of your -# country, or the server of your local network -! server ntp1.ptb.de auto_offline -! server ntp1.fau.de auto_offline -server pool.ntp.org - -maxupdateskew 100 -dumponexit -log measurements statistics tracking - -# Keep the hardware clock on UTC -! rtconutc - -allow 192.168.0/24 -cmdallow 192.168.0/24 -cmdallow 127.0.0.1 - -driftfile /var/lib/chrony/chrony.drift -dumpdir /var/lib/chrony -pidfile /var/run/chronyd.pid -logdir /var/log/chrony - -# Enable this only if you have enhanced real time -# clock support build into your kernel -! log rtc -! rtcdevice /dev/rtc -! rtcfile /var/lib/chrony/chrony.rtc - -# End of file diff --git a/chrony/chronyd b/chrony/chronyd index c11331b..b9bcac1 100644 --- a/chrony/chronyd +++ b/chrony/chronyd @@ -6,7 +6,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/chronyd PID=/var/run/chronyd.pid -OPTS="-s -r" +OPTS="-r" case $1 in start)