Hello community, here is the log from the commit of package ntp checked in at Sat Sep 13 06:08:00 CEST 2008. -------- --- ntp/ntp.changes 2008-09-08 11:45:35.000000000 +0200 +++ ntp/ntp.changes 2008-09-11 09:01:39.294554000 +0200 @@ -1,0 +2,24 @@ +Thu Sep 11 09:01:11 CEST 2008 - varkoly@suse.de + +- (bnc#407804) - ntpd stalls boot process + +------------------------------------------------------------------- +Tue Sep 9 12:15:42 CEST 2008 - varkoly@suse.de + +- (bnc#274833) - Cypress beta site would like to see NTP as a service to monitor under Health Monitor in NRM. +- update to 4.2.4p5 which + * Month off by one in leap second message written to clockstats file fixed. + * Built-in getpass() function also prompts for password if not built with DEBUG. + * Fix memory leak when fetching system messages. + * Wake up the resolver thread/process when a new interface has become available. + * Correctly apply negative-sawtooth for oncore 12 channel receiver. + * Startup code for original LinuxPPS removed. LinuxPPS now conforms to the PPSAPI. + * drop minimum time restriction for interface update interval. + * Fix mismatching #ifdefs for builds without IPv6. + * Update the copyright year. + * Build system cleanup (make autogen-generated files writable). + * nptdate timeout is too long if several servers are supplied. + * ntpdate debug mode adjusts system clock when it shouldn't. + * ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set + +------------------------------------------------------------------- Old: ---- ntp-4.2.4p4.tar.bz2 New: ---- ntp-4.2.4p5.tar.bz ntp-kernel-time-sync-message.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.z11071/_old 2008-09-13 06:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.z11071/_new 2008-09-13 06:03:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ntp (Version 4.2.4p4) +# spec file for package ntp (Version 4.2.4p5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,11 +26,11 @@ Url: http://www.ntp.org/ License: BSD 3-Clause Group: Productivity/Networking/Other -Version: 4.2.4p4 -Release: 77 +Version: 4.2.4p5 +Release: 1 Summary: Network Time Protocol daemon (version 4) # main source -Source0: ntp-%{version}.tar.bz2 +Source0: ntp-%{version}.tar.bz # configuration Source1: conf.logrotate.ntp Source2: conf.ntp.conf @@ -63,13 +63,14 @@ Patch17: ntp-man-pages.patch Patch18: ntp-strcat.patch Patch20: ntp-4.2.0a-seed_file.patch +Patch21: ntp-kernel-time-sync-message.diff # see Bug 332118 - W32Time authentication support in NTP is not upstream but new version is here Patch9: ntp-4.2.4-w32-time-authentification.patch Patch19: ntp-4.2.4-w32-time-authentification.fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Provides: ntp-daemon xntp3 xntp <= 4.2.4p4 -Obsoletes: xntp3 xntp <= 4.2.4p4 +Provides: ntp-daemon xntp3 xntp <= 4.2.4p5 +Obsoletes: xntp3 xntp <= 4.2.4p5 Conflicts: openntpd PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff /usr/bin/grep Requires: timezone @@ -200,8 +201,8 @@ %patch6 %patch7 -p1 %patch8 -p1 -#%patch9 -p1 -#%patch19 +%patch9 -p1 +%patch19 # see Bug 332118 - W32Time authentication support in NTP is not upstream but new version is here %patch10 %patch13 -p1 @@ -217,6 +218,7 @@ %patch17 %patch18 %patch20 +%patch21 %build rm -rf acconfig.h @@ -297,8 +299,8 @@ # # service xml # -%__install -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ -%__install -m 644 %{S:14} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ +install -d %{buildroot}/usr/share/omc/svcinfo.d/ +install -m 644 %{S:14} %{buildroot}/usr/share/omc/svcinfo.d/ %clean %__rm -rf %{buildroot} @@ -377,12 +379,12 @@ %doc COPYRIGHT ChangeLog NEWS README* TODO WHERE-TO-START conf %attr(0640,root,ntp) %config(noreplace) %{_sysconfdir}/ntp.conf %dir %{_sysconfdir}/slp.reg.d -%config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg %{_sysconfdir}/init.d/ntp -%{_sysconfdir}/logrotate.d/ntp +%config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg +%config %{_sysconfdir}/logrotate.d/ntp +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp %{_sbindir}/* /var/lib/ntp -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp %attr(0640,root,ntp) %config(noreplace) /var/lib/ntp/etc/ntp.conf.iburst %attr(0755,ntp,ntp) %dir /var/lib/ntp/drift %{_mandir}/man1/* @@ -392,15 +394,31 @@ %ghost %config(noreplace) /var/log/ntp %ghost %config %{_sysconfdir}/sysconfig/network/if-up.d/50-ntp %{_sysconfdir}/sysconfig/network/scripts/50-ntp -%dir %{_sysconfdir}/omc/ -%dir %{_sysconfdir}/omc/srvinfo.d/ -%{_sysconfdir}/omc/srvinfo.d/ntp.xml +/usr/share/omc/svcinfo.d/ntp.xml %files doc %defattr(-,root,root) %doc html/* %changelog +* Thu Sep 11 2008 varkoly@suse.de +- (bnc#407804) - ntpd stalls boot process +* Tue Sep 09 2008 varkoly@suse.de +- (bnc#274833) - Cypress beta site would like to see NTP as a service to monitor under Health Monitor in NRM. +- update to 4.2.4p5 which + * Month off by one in leap second message written to clockstats file fixed. + * Built-in getpass() function also prompts for password if not built with DEBUG. + * Fix memory leak when fetching system messages. + * Wake up the resolver thread/process when a new interface has become available. + * Correctly apply negative-sawtooth for oncore 12 channel receiver. + * Startup code for original LinuxPPS removed. LinuxPPS now conforms to the PPSAPI. + * drop minimum time restriction for interface update interval. + * Fix mismatching #ifdefs for builds without IPv6. + * Update the copyright year. + * Build system cleanup (make autogen-generated files writable). + * nptdate timeout is too long if several servers are supplied. + * ntpdate debug mode adjusts system clock when it shouldn't. + * ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set * Mon Sep 08 2008 varkoly@suse.de - (bnc#423463) - 2 bugs found in ntpd init script * Tue Jun 17 2008 varkoly@suse.de ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-09-08 11:44:26.000000000 +0200 +++ ntp/conf.ntp.init 2008-09-11 09:01:02.402291000 +0200 @@ -223,7 +223,11 @@ ;; ntptimeset) if grep -v 127.127.1.0 $NTP_CONF | grep ^server >/dev/null; then - $NTPD_BIN $NTPD_OPTIONS -c $NTP_CONF -q + # Do not execute by booting when not allowed! + if [ "$PREVLEVEL" != "N" -o "$NTPD_BOOT_SYNC" = "yes" ] + then + $NTPD_BIN $NTPD_OPTIONS -c $NTP_CONF -q + fi else echo "no server configured" fi ++++++ conf.sysconfig.ntp ++++++ --- ntp/conf.sysconfig.ntp 2008-03-25 11:04:49.000000000 +0100 +++ ntp/conf.sysconfig.ntp 2008-09-11 09:01:02.443258000 +0200 @@ -62,3 +62,12 @@ # /usr/share/doc/packages/xntp-doc/drivers/driver8.html # NTP_PARSE_DEVICE="" + +## Type: yesno +## Default: yes +## ServiceRestart: ntp +# +# Shall the time server ntpd syncronize the time by booting the system? +# +NTPD_BOOT_SYNC="yes" + ++++++ ntp-4.2.0.ntpdate_overflow.patch ++++++ --- /var/tmp/diff_new_pack.z11071/_old 2008-09-13 06:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.z11071/_new 2008-09-13 06:03:15.000000000 +0200 @@ -1,5 +1,5 @@ ---- ntpdate/ntpdate.c -+++ ntpdate/ntpdate.c +--- ntpdate/ntpdate.c 2008-03-22 12:03:22.000000000 +0100 ++++ ntpdate/ntpdate.c 2008-09-09 12:08:17.000000000 +0200 @@ -1255,14 +1255,24 @@ register struct server *sp, *server; s_fp absoffset; @@ -37,16 +37,16 @@ @@ -1284,9 +1294,16 @@ if (dostep) { - if (simple_query || l_step_systime(&server->offset)) { + if (simple_query || debug || l_step_systime(&server->offset)){ - msyslog(LOG_NOTICE, "step time server %s offset %s sec", - stoa(&server->srcadr), - lfptoa(&server->offset, 6)); -+ if (dobigstep) { -+ L_ADD(&server->offset, &big); -+ msyslog(LOG_NOTICE, "step time server %s offset %s sec", -+ stoa(&server->srcadr), -+ ulfptoa(&server->offset, 6)); -+ } else { ++ if (dobigstep) { ++ L_ADD(&server->offset, &big); ++ msyslog(LOG_NOTICE, "step time server %s offset %s sec", ++ stoa(&server->srcadr), ++ ulfptoa(&server->offset, 6)); ++ } else { + msyslog(LOG_NOTICE, "step time server %s offset %s sec", + stoa(&server->srcadr), + lfptoa(&server->offset, 6)); ++++++ ntp-4.2.4-w32-time-authentification.patch ++++++ --- /var/tmp/diff_new_pack.z11071/_old 2008-09-13 06:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.z11071/_new 2008-09-13 06:03:15.000000000 +0200 @@ -905,9 +905,7 @@ /* - * The key cache. We cache the last key we looked at here. -+ * Internal authentication provider, shared between keyfile -+ * and autokey backends. - */ +- */ -keyid_t cache_keyid; /* key identifier */ -u_char *cache_key; /* key pointer */ -u_int cache_keylen; /* key length */ @@ -929,7 +927,9 @@ - -/* - * auth_findkey - find a key in the hash table -- */ ++ * Internal authentication provider, shared between keyfile ++ * and autokey backends. + */ -struct savekey * -auth_findkey( - keyid_t keyno @@ -998,7 +998,7 @@ - return (0); -} - - +- -/* - * authhavekey - return one and cache the key, if known and trusted. - */ @@ -1008,7 +1008,7 @@ - ) -{ - struct savekey *sk; -- + - authkeylookups++; - if (keyno == 0 || keyno == cache_keyid) - return (1); @@ -1178,22 +1178,22 @@ -authistrusted( +static int +internal_authprov_istrusted( -+ struct authkey_be *be, ++ struct authkey_be *be, keyid_t keyno ) { -+ struct internal_authkey_be *ibe = (struct internal_authkey_be *)be; ++ struct internal_authkey_be *ibe = (struct internal_authkey_be *)be; struct savekey *sk; - if (keyno == cache_keyid) - return ((cache_flags & KEY_TRUSTED) != 0); -+ if (keyno == ibe->cache_keyid) -+ return ((ibe->cache_flags & KEY_TRUSTED) != 0); ++ if (keyno == ibe->cache_keyid) ++ return ((ibe->cache_flags & KEY_TRUSTED) != 0); - authkeyuncached++; - sk = key_hash[KEYHASH(keyno)]; -+ ibe->stats.keyuncached++; -+ sk = ibe->key_hash[KEYHASH(keyno)]; ++ ibe->stats.keyuncached++; ++ sk = ibe->key_hash[KEYHASH(keyno)]; while (sk != 0) { if (keyno == sk->keyid) break; @@ -1201,11 +1201,11 @@ } if (sk == 0) { - authkeynotfound++; -+ ibe->stats.keynotfound++; ++ ibe->stats.keynotfound++; return (0); } else if (!(sk->flags & KEY_TRUSTED)) { - authkeynotfound++; -+ ibe->stats.keynotfound++; ++ ibe->stats.keynotfound++; return (0); } return (1); @@ -1216,31 +1216,31 @@ -MD5auth_setkey( +/* + * internal_authprov_setkey - associate a key with a key ID -+ */ ++*/ +static int +internal_authprov_setkey( -+ struct authkey_be *be, - keyid_t keyno, ++ struct authkey_be *be, + int type, + keyid_t keyno, const u_char *key, -- const u_int len +- const int len + const int len, + u_long trust ) { -+ struct internal_authkey_be *ibe = (struct internal_authkey_be *)be; ++ struct internal_authkey_be *ibe = (struct internal_authkey_be *)be; struct savekey *sk; + -+ if (type != KEY_TYPE_MD5) { -+ return (0); -+ } ++ if (type != KEY_TYPE_MD5) { ++ return (0); ++ } /* * See if we already have the key. If so just stick in the * new value. */ - sk = key_hash[KEYHASH(keyno)]; -+ sk = ibe->key_hash[KEYHASH(keyno)]; ++ sk = ibe->key_hash[KEYHASH(keyno)]; while (sk != 0) { if (keyno == sk->keyid) { strncpy((char *)sk->k.MD5_key, (const char *)key, @@ -1326,9 +1326,12 @@ + } + + return (0); -+} + } +- + -+/* + /* +- * auth_delkeys - delete all known keys, in preparation for rereading +- * the keys file (presumably) + * internal_authprov_verifymac - verify message authenticator + * + * Returns one if authenticator valid, zero if invalid or key not found. @@ -1355,8 +1358,7 @@ + } + + return (0); - } -- ++} + +/* + * internal_authprov_stats - get authentication provider statistics @@ -1373,9 +1375,7 @@ + return (1); +} + - /* -- * auth_delkeys - delete all known keys, in preparation for rereading -- * the keys file (presumably) ++/* + * internal_authprov_reset_stats - reset authentication provider statistics + */ +static void @@ -1653,7 +1653,9 @@ - return (0); + return (AUTOKEY_BE_P(be)); +} -+ + +- if (cache_flags & KEY_MD5) +- return (MD5authdecrypt(cache_key, pkt, length, size)); +/* + * autokey_untrust - untrust an autokey with a single provider lookup + */ @@ -1662,11 +1664,9 @@ +{ + struct authkey_be *be; -- if (cache_flags & KEY_MD5) -- return (MD5authdecrypt(cache_key, pkt, length, size)); -+ be = authprov_select(keyid); - - return (0); ++ be = authprov_select(keyid); ++ + if (AUTOKEY_BE_P(be)) { + be->trust(be, keyid, 0); + } ++++++ ntp-kernel-time-sync-message.diff ++++++ --- ntpd/ntp_loopfilter.c 2008-07-29 13:19:54.000000000 +0200 +++ ntpd/ntp_loopfilter.c 2008-07-29 13:21:00.000000000 +0200 @@ -642,9 +642,10 @@ * frequency and pretend we did it here. */ if (ntp_adjtime(&ntv) == TIME_ERROR) { + if (ntv.status != pll_status) NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) msyslog(LOG_NOTICE, - "kernel time sync error %04x", ntv.status); + "kernel time sync state %04x", ntv.status); ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME); } else { if ((ntv.status ^ pll_status) & ~STA_FLL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org