Mailinglist Archive: opensuse-commit (914 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package ntp for openSUSE:Factory
checked in at Wed Jun 1 12:38:24 CEST 2011.



--------
--- ntp/ntp.changes     2011-04-01 16:52:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntp/ntp.changes        2011-06-01 
11:18:25.000000000 +0200
@@ -1,0 +2,27 @@
+Wed Jun  1 09:07:48 UTC 2011 - varkoly@xxxxxxx
+
+- The default timeout for sntp is to long. This can stop booting 
+- bnc#689070 - ntp post install script always removes /etc/sysconfig/ntp
+- bnc#688529 - (ntp) ntpq and ntpdc command history broken
+- bnc#695598 - "Started sntp" in /var/log/messages
+
+-------------------------------------------------------------------
+Sun May  1 23:15:01 CEST 2011 - hpj@xxxxxxxxx
+
+- fix "rcntp ntptimeset"
+   * never try to syncronize with local clocks (127.127.*), which led to 
+     sntp blocking until timeout elapsed (and probably blocking boot 
+     sequence for ~5 min per device..)
+- fix DOS line breaks in some doc files
+
+-------------------------------------------------------------------
+Tue Apr 26 06:56:05 UTC 2011 - varkoly@xxxxxxxxxx
+
+- 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
+ 
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ntp.spec ++++++
--- /var/tmp/diff_new_pack.2tXS4W/_old  2011-06-01 12:35:37.000000000 +0200
+++ /var/tmp/diff_new_pack.2tXS4W/_new  2011-06-01 12:35:37.000000000 +0200
@@ -27,7 +27,7 @@
 License:        BSD3c(or similar)
 Group:          Productivity/Networking/Other
 Version:        4.2.6p3
-Release:        9
+Release:        12
 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
@@ -196,6 +196,8 @@
 # don't build ntpdate (replaced with %{SOURCE15} script)
 sed -i '/\tntpdate/d
 s/ntpdate //g' Makefile.in Makefile.am
+# fix DOS line breaks
+sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
 
 %build
 rm -rf acconfig.h
@@ -218,7 +220,8 @@
        --enable-linuxcaps \
        --enable-ipv6 \
        --with-sntp \
-    --enable-ntp-signd
+       --enable-ntp-signd \
+       --with-lineeditlibs=readline
 make %{?_smp_mflags}
 
 %install
@@ -303,8 +306,6 @@
 fi
 # Are we in update mode?
 if [ -f /etc/sysconfig/ntp ]; then
-       # convert parameters and description in existing sysconfig file
-        sed -i -e "s@^XNTPD_@NTPD_@" -e "s@\(\".*\)-U ntp\(.*\"\)@\1-u ntp\2@" 
/etc/sysconfig/ntp
        grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || {
         echo "#
 # Authentication stuff

++++++ conf.ntp.init ++++++
--- /var/tmp/diff_new_pack.2tXS4W/_old  2011-06-01 12:35:37.000000000 +0200
+++ /var/tmp/diff_new_pack.2tXS4W/_new  2011-06-01 12:35:37.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,9 +238,24 @@
     rc_status
   ;;
   ntptimeset)
-    for i in $(gawk '/^server/ { if( $2 != "127.127.1.0" ) print $2 }' 
$NTP_CONF)
+    NTPD_PROTO="$( get_ntpd_ip_proto )"
+    for i in $(gawk '/^server/ { if( $2 !~ "^127.127." ) print $2","$3 }' 
$NTP_CONF)
     do 
-           sntp -s $i 2> /dev/null && { SYNCHRONISED=$i; break; };
+        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




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx