Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2011-11-25 23:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2011-10-27 13:57:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2011-11-25 23:05:17.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 24 14:56:45 UTC 2011 - [email protected] + +- bnc#730374 - Hardware Clock does not get synchronized + +------------------------------------------------------------------- +Wed Nov 23 09:29:50 UTC 2011 - [email protected] + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- @@ -1261 +1271 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1267 +1277 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1275 +1285 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1283 +1293 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1288 +1298 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1296 +1306 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1305 +1315 @@ ----------------------------------------------------------------------------- +------------------------------------------------------------------- @@ -1313 +1323 @@ -------------------------------------------------------------------------- +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.pfdfnN/_old 2011-11-25 23:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.pfdfnN/_new 2011-11-25 23:05:19.000000000 +0100 @@ -19,7 +19,7 @@ Name: ntp -BuildRequires: fdupes libcap-devel openssl-devel readline-devel +BuildRequires: fdupes libcap-devel libtool openssl-devel readline-devel # to allow the postinst script to succeed BuildRequires: pwdutils %define ntpfaqversion 3.4 @@ -27,7 +27,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/Other Version: 4.2.6p3 -Release: 14 +Release: 1 Summary: Network Time Protocol daemon (version 4) # main source Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2 ++++++ conf.ntp.init ++++++ --- /var/tmp/diff_new_pack.pfdfnN/_old 2011-11-25 23:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.pfdfnN/_new 2011-11-25 23:05:19.000000000 +0100 @@ -76,6 +76,49 @@ # Override defaults, if we have the sysconfig file test -f /etc/sysconfig/ntp && . /etc/sysconfig/ntp +function update_cmos() { return 0; } +# Now see if we have to fix the CMOS clock +if [ "$NTPD_FORCE_SYNC_ON_STARTUP" = yes -a "$1" = ntptimeset ] ; then + test -f /etc/sysconfig/clock && . /etc/sysconfig/clock + if test -r /proc/xen/capabilities ; then + read -t1 caps < /proc/xen/capabilities + test "$caps" = "${caps%control_d*}" && NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=no + fi + case "$(uname -i)" in + s390*) NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=no + esac + if [ "$NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" = yes ] ; then + function update_cmos() { + if test -e /dev/rtc ; then + /sbin/hwclock --systohc $HWCLOCK --noadjfile + return $? + fi + if test -z "$(/sbin/modprobe -l rtc_cmos)" ; then + /sbin/hwclock --systohc $HWCLOCK --noadjfile + return $? + fi + local temprules=/dev/.udev/rules.d + local uevseqnum=/sys/kernel/uevent_seqnum + local rule=$temprules/95-rtc-cmos.rules + local -i start=0 end=0 + /bin/mkdir -m 0755 -p $temprules + echo ACTION==\"add\", KERNEL==\"rtc0\", RUN=\"/sbin/hwclock --systohc $HWCLOCK --noadjfile --rtc=\$env{DEVNAME}\" > $rule + test -e $uevseqnum && read -t 1 start < $uevseqnum + if /sbin/modprobe -q rtc_cmos ; then + test -e $uevseqnum && read -t 1 end < $uevseqnum + if test $start -lt $end ; then + /sbin/udevadm settle --quiet --seq-start=$start --seq-end=$end + else + /sbin/udevadm settle --quiet + fi + else + rm -f $rule + /sbin/hwclock --systohc $HWCLOCK --noadjfile + fi + } + fi +fi + # set Default CHROOT path if not set but wanted test "${NTPD_RUN_CHROOTED}" = "yes" && \ CHROOT_PREFIX="/var/lib/ntp" || \ @@ -256,6 +299,7 @@ if [ "$SYNCHRONISED" ] then echo "Time synchronized with $SYNCHRONISED" + update_cmos else echo "Time could not be synchronized" fi ++++++ conf.sysconfig.ntp ++++++ --- /var/tmp/diff_new_pack.pfdfnN/_old 2011-11-25 23:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.pfdfnN/_new 2011-11-25 23:05:19.000000000 +0100 @@ -60,3 +60,12 @@ # Force time synchronization befor start ntpd # NTPD_FORCE_SYNC_ON_STARTUP="yes" + +## Type: boolean +## Default: "no" +# +# Force time synchronization of hwclock befor start ntpd. +# This works only if NTPD_FORCE_SYNC_ON_STARTUP is set +# to yes. +# +NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP="yes" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
