Hello community, here is the log from the commit of package ntp for openSUSE:11.4 checked in at Tue Jun 7 05:02:14 CEST 2011.
-------- --- old-versions/11.4/all/ntp/ntp.changes 2011-02-03 17:15:58.000000000 +0100 +++ /mounts/work_src_done/11.4/ntp/ntp.changes 2011-06-01 11:19:13.000000000 +0200 @@ -1,0 +2,16 @@ +Tue May 31 15:03:25 UTC 2011 - [email protected] + +- bnc#689070 - ntp post install script always removes /etc/sysconfig/ntp +- bnc#688529 - (ntp) ntpq and ntpdc command history broken +- bnc#682745 - ntpd does not start if a local dcf77 refclock is configured, + preventing a successful system boot +- bnc#688132 - fix/improve init script + * related to bugzilla 688132 + * "rcntp ntptimeset" could not parse servers from ntp.conf when IP proto + was specified (server [-4|-6] hostname) + * "rcntp ntptimeset" is now using ip proto parameter (-4|-6) if it's set in + NTPD_OPTIONS and skip servers where the opposite proto is defined +- bnc#695598 - "Started sntp" in /var/log/messages +- The default timeout for sntp is to long. This can stop booting. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/ntp Destination is old-versions/11.4/UPDATES/all/ntp calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.6rAJ7c/_old 2011-06-07 05:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.6rAJ7c/_new 2011-06-07 05:01:30.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/Other Version: 4.2.6p3 -Release: 6.<RELEASE2> +Release: 6.<RELEASE11> 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.gz @@ -216,7 +216,8 @@ --enable-linuxcaps \ --enable-ipv6 \ --with-sntp \ - --enable-ntp-signd + --enable-ntp-signd \ + --with-lineeditlibs=readline make %{?_smp_mflags} %install @@ -301,12 +302,6 @@ fi # Are we in update mode? if [ -f /etc/sysconfig/ntp ]; then - # convert parameters and description in existing sysconfig file - cvt_tmp=/etc/sysconfig/sysconfig.ntp.$$ - sed -e "s@^XNTPD_@NTPD_@" -e "s@\(\".*\)-U ntp\(.*\"\)@\1-u ntp\2@" \ - /etc/sysconfig/ntp > $cvt_tmp && \ - test -e $cvt_tmp && mv $cvt_tmp /etc/sysconfig/ntp - test -e /etc/sysconfig/ntp && rm -f /etc/sysconfig/ntp grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || { echo "# # Authentication stuff ++++++ conf.ntp.init ++++++ --- /var/tmp/diff_new_pack.6rAJ7c/_old 2011-06-07 05:01:31.000000000 +0200 +++ /var/tmp/diff_new_pack.6rAJ7c/_new 2011-06-07 05:01:31.000000000 +0200 @@ -147,6 +147,20 @@ logger -t $0 "runtime configuration: $NTPDC_LOG" } +function get_ntpd_ip_proto() { + local -a OPTS + read -ra OPTS <<< "$NTPD_OPTIONS" + for i in "${OPTS[@]}"; do + if [ "$i" = "-4" ] || [ "$i" = "-6" ]; then + # first occurrence wins safely because ntpd couldn't handle more anyway + echo "$i" + return + fi + done + echo "" + return +} + case "$1" in start) if [ "$NTPD_FORCE_SYNC_ON_STARTUP" = "yes" ]; then @@ -224,15 +238,30 @@ rc_status ;; ntptimeset) - for i in $(gawk '/^server/ { if( $2 != "127.127.1.0" ) print $2 }' $NTP_CONF) - do - sntp -s $i 2> /dev/null && { SYNCHRONISED=$i; break; }; + NTPD_PROTO="$( get_ntpd_ip_proto )" + for i in $(gawk '/^server/ { if( $2 !~ "^127.127." ) print $2","$3 }' $NTP_CONF) + do + IFS=',' read -ra SERVER <<< "$i" + if [ ${SERVER[0]} = "-4" ] || [ ${SERVER[0]} = "-6" ] + then + if [ -z "${NTPD_PROTO}" ] || [ "${NTPD_PROTO}" = "${SERVER[0]}" ] + then + SNTP_OPT="${SERVER[0]} ${SERVER[1]}" + else + # ignore servers with conflicting proto + continue + fi + else + # here the usual case with empty NTPD_PROTO (default/yast config) + SNTP_OPT="$NTPD_PROTO ${SERVER[0]}" + fi + sntp -t 2 -l /dev/null -s $SNTP_OPT 2> /dev/null && { SYNCHRONISED=$SNTP_OPT; break; }; done if [ "$SYNCHRONISED" ] then - echo "Time synchronized with $SYNCHRONISED" + echo "Time synchronized with $SYNCHRONISED" else - echo "Time could not be synchronized" + echo "Time could not be synchronized" fi ;; reload) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
