Hello community, here is the log from the commit of package ntp checked in at Mon Sep 29 18:07:35 CEST 2008. -------- --- ntp/ntp.changes 2008-09-11 09:01:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-09-29 16:55:34.767914000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 26 16:23:47 CEST 2008 - varkoly@suse.de + +- (bnc#387236) - VUL-0: ntp complains about format/parity error + for MD5 key 1, not used + In the ntp 4.2.4p5 version this problem is solved. + Only the 4.2.4-w32-time-authentification patch had caused it + that that did not function. Now we have droped this patch. + +------------------------------------------------------------------- Old: ---- ntp-4.2.4-w32-time-authentification.fix.patch ntp-4.2.4-w32-time-authentification.patch ntp-kernel-time-sync-message.diff New: ---- ntp-kernel-time-sync-message.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p5 -Release: 1 +Release: 4 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz @@ -63,10 +63,7 @@ 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 +Patch21: ntp-kernel-time-sync-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Provides: ntp-daemon xntp3 xntp <= 4.2.4p5 @@ -201,9 +198,6 @@ %patch6 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch19 -# see Bug 332118 - W32Time authentication support in NTP is not upstream but new version is here %patch10 %patch13 -p1 %if %_lib == lib64 @@ -213,11 +207,11 @@ cp %{S:12} . tar xzf %{S:13} %patch14 -%patch15 -%patch16 +%patch15 -p1 +%patch16 -p1 %patch17 -%patch18 -%patch20 +%patch18 -p1 +%patch20 -p1 %patch21 %build @@ -401,6 +395,12 @@ %doc html/* %changelog +* Fri Sep 26 2008 varkoly@suse.de +- (bnc#387236) - VUL-0: ntp complains about format/parity error + for MD5 key 1, not used + In the ntp 4.2.4p5 version this problem is solved. + Only the 4.2.4-w32-time-authentification patch had caused it + that that did not function. Now we have droped this patch. * Thu Sep 11 2008 varkoly@suse.de - (bnc#407804) - ntpd stalls boot process * Tue Sep 09 2008 varkoly@suse.de ++++++ ntp-4.2.0a-seed_file.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- ntpd/ntp_crypto.c -+++ ntpd/ntp_crypto.c -@@ -3904,10 +3904,15 @@ +diff -ur ntp-strcat//ntpd/ntp_crypto.c ntp-4.2.0a-seed_file//ntpd/ntp_crypto.c +--- ntp-strcat//ntpd/ntp_crypto.c 2008-09-25 17:18:45.000000000 +0200 ++++ ntp-4.2.0a-seed_file//ntpd/ntp_crypto.c 2008-09-25 17:29:17.000000000 +0200 +@@ -3898,10 +3898,15 @@ exit (-1); } if ((bytes = RAND_load_file(rand_file, -1)) == 0) { @@ -18,3 +19,4 @@ } get_systime(&seed); RAND_seed(&seed, sizeof(l_fp)); +Nur in ntp-4.2.0a-seed_file//ntpd: ntp_crypto.c.orig. ++++++ ntp-config.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- configure.ac -+++ configure.ac -@@ -4123,7 +4123,7 @@ $isc_netinet6in6_hack +diff -N -ur ntp-stable-4.2.0a-20050816-loconly//configure.ac ntp-config//configure.ac +--- ntp-stable-4.2.0a-20050816-loconly//configure.ac 2008-09-25 17:18:45.000000000 +0200 ++++ ntp-config//configure.ac 2008-09-25 17:24:47.000000000 +0200 +@@ -4129,7 +4129,7 @@ [struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0);], [AC_MSG_RESULT(yes) AC_DEFINE(ISC_PLATFORM_HAVESCOPEID, , @@ -9,8 +10,9 @@ result="#define LWRES_HAVE_SIN6_SCOPE_ID 1"], [AC_MSG_RESULT(no) ISC_PLATFORM_HAVESCOPEID="#undef ISC_PLATFORM_HAVESCOPEID" ---- ntpd/Makefile.am -+++ ntpd/Makefile.am +diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am ntp-config//ntpd/Makefile.am +--- ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am 2008-03-22 12:03:20.000000000 +0100 ++++ ntp-config//ntpd/Makefile.am 2008-09-25 17:24:47.000000000 +0200 @@ -1,7 +1,5 @@ AUTOMAKE_OPTIONS= ../util/ansi2knr @@ -19,8 +21,9 @@ bin_PROGRAMS= ntpd @MAKE_NTPDSIM@ noinst_LIBRARIES= libntpd.a ---- ntpdate/Makefile.am -+++ ntpdate/Makefile.am +diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpdate/Makefile.am ntp-config//ntpdate/Makefile.am +--- ntp-stable-4.2.0a-20050816-loconly//ntpdate/Makefile.am 2007-02-19 12:02:14.000000000 +0100 ++++ ntp-config//ntpdate/Makefile.am 2008-09-25 17:24:47.000000000 +0200 @@ -1,6 +1,5 @@ #AUTOMAKE_OPTIONS= ../util/ansi2knr @@ -28,8 +31,9 @@ #bin_PROGRAMS= ntpdate ntptimeset bin_PROGRAMS= ntpdate EXTRA_PROGRAMS= ntptimeset ---- ntpdc/Makefile.am -+++ ntpdc/Makefile.am +diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am ntp-config//ntpdc/Makefile.am +--- ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am 2008-03-22 12:03:23.000000000 +0100 ++++ ntp-config//ntpdc/Makefile.am 2008-09-25 17:24:47.000000000 +0200 @@ -1,6 +1,5 @@ AUTOMAKE_OPTIONS= ../util/ansi2knr @@ -37,13 +41,14 @@ bin_PROGRAMS= ntpdc EXTRA_PROGRAMS= ntpdc-layout EXTRA_DATA= check-layout ---- sntp/Makefile.am -+++ sntp/Makefile.am -@@ -10,7 +10,6 @@ LDADD= $(LIBOPTS_LDADD) +diff -N -ur ntp-stable-4.2.0a-20050816-loconly//sntp/Makefile.am ntp-config//sntp/Makefile.am +--- ntp-stable-4.2.0a-20050816-loconly//sntp/Makefile.am 2008-08-10 13:02:42.000000000 +0200 ++++ ntp-config//sntp/Makefile.am 2008-09-25 17:24:47.000000000 +0200 +@@ -10,7 +10,6 @@ NULL= -bindir= ${exec_prefix}/${BINSUBDIR} bin_PROGRAMS= sntp - #run_ag= cd $(srcdir) && autogen -L $(top_srcdir)/include - run_ag= cd $(srcdir) && autogen + #run_ag= cd $(srcdir) && autogen --writable -L $(top_srcdir)/include + run_ag= cd $(srcdir) && autogen --writable ++++++ ntp-kernel-time-sync-message.patch ++++++ --- 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) ++++++ ntp-linuxcaps.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,7 +1,8 @@ ---- configure.ac -+++ configure.ac -@@ -63,6 +63,13 @@ - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__" +diff -ru configure.ac configure.ac +--- configure.ac 2008-05-20 09:06:11.000000000 +0200 ++++ configure.ac 2008-09-25 17:04:34.000000000 +0200 +@@ -67,6 +67,13 @@ + CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" libxnet=-lxnet ;; + *-*-linux*) @@ -14,7 +15,7 @@ esac AMU_OS_CFLAGS -@@ -182,11 +189,7 @@ +@@ -186,11 +193,7 @@ esac AC_CACHE_CHECK(if we have linux capabilities (libcap), ac_linuxcaps, @@ -27,3 +28,4 @@ # End of AC_CACHE_CHECK for linuxcaps AC_CHECK_HEADERS(sys/capability.h) AC_CHECK_HEADERS(sys/prctl.h) +Nur in ntp-linuxcaps/: configure.ac.orig. ++++++ ntp-offset.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- ntpdate/ntpdate.c -+++ ntpdate/ntpdate.c -@@ -1263,25 +1263,23 @@ +diff -N -ur ntp-config//ntpdate/ntpdate.c ntp-offset//ntpdate/ntpdate.c +--- ntp-config//ntpdate/ntpdate.c 2008-09-25 17:18:45.000000000 +0200 ++++ ntp-offset//ntpdate/ntpdate.c 2008-09-25 17:26:25.000000000 +0200 +@@ -1261,25 +1261,23 @@ clock_filter(sp); server = clock_select(); ++++++ ntp-segfault_on_invalid_device.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- ntpd/refclock_parse.c -+++ ntpd/refclock_parse.c -@@ -3257,6 +3257,10 @@ +diff -ru ntpd/refclock_parse.c ntpd/refclock_parse.c +--- ntpd/refclock_parse.c 2007-08-18 22:24:46.000000000 +0200 ++++ ntpd/refclock_parse.c 2008-09-25 17:03:56.000000000 +0200 +@@ -3319,6 +3319,10 @@ struct parseunit *parse = (struct parseunit *)peer->procptr->unitptr; parsectl_t tmpctl; @@ -11,3 +12,4 @@ static char outstatus[400]; /* status output buffer */ if (out) +Nur in ntp-segfault_on_invalid_device/ntpd: refclock_parse.c.orig. ++++++ ntp-stable-4.2.0a-20050816-loconly.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- ntp-4.2.4p4/ntpd/ntp_proto.c -+++ ntp-4.2.4p4/ntpd/ntp_proto.c -@@ -2871,6 +2871,12 @@ +diff -ru ntpd-using_wrong_group//ntpd/ntp_proto.c ntp-stable-4.2.0a-20050816-loconly//ntpd/ntp_proto.c +--- ntpd-using_wrong_group//ntpd/ntp_proto.c 2008-09-25 17:18:45.000000000 +0200 ++++ ntp-stable-4.2.0a-20050816-loconly//ntpd/ntp_proto.c 2008-09-25 17:22:15.000000000 +0200 +@@ -2870,6 +2870,12 @@ xpkt.li_vn_mode = PKT_LI_VN_MODE(sys_leap, PKT_VERSION(rpkt->li_vn_mode), xmode); xpkt.stratum = STRATUM_TO_PKT(sys_stratum); @@ -13,3 +14,4 @@ xpkt.refid = sys_refid; xpkt.rootdelay = HTONS_FP(DTOFP(sys_rootdelay)); xpkt.rootdispersion = +Nur in ntp-stable-4.2.0a-20050816-loconly//ntpd: ntp_proto.c.orig. ++++++ ntp-strcat.patch ++++++ --- /var/tmp/diff_new_pack.O12323/_old 2008-09-29 18:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O12323/_new 2008-09-29 18:06:42.000000000 +0200 @@ -1,6 +1,7 @@ ---- ntpd/refclock_parse.c -+++ ntpd/refclock_parse.c -@@ -3579,7 +3579,7 @@ +diff -N -u -r ntp-offset/ntpd/refclock_parse.c ntp-strcat/ntpd/refclock_parse.c +--- ntp-offset/ntpd/refclock_parse.c 2008-09-25 17:03:56.000000000 +0200 ++++ ntp-strcat/ntpd/refclock_parse.c 2008-09-25 17:28:03.000000000 +0200 +@@ -3578,7 +3578,7 @@ NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */ msyslog(LOG_WARNING, "PARSE receiver #%d: conversion status \"%s\"", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org