Hello community, here is the log from the commit of package ntp checked in at Mon Nov 3 14:14:04 CET 2008. -------- --- ntp/ntp.changes 2008-10-24 09:31:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-10-29 17:56:25.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 29 17:54:19 CET 2008 - varkoly@suse.de + +- (bnc#439813) - autobuild does not run because time is appearently out of sync + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ntp-sntp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.D29545/_old 2008-11-03 14:11:14.000000000 +0100 +++ /var/tmp/diff_new_pack.D29545/_new 2008-11-03 14:11:14.000000000 +0100 @@ -27,7 +27,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p5 -Release: 11 +Release: 12 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz @@ -60,6 +60,7 @@ Patch11: ntp-4.2.0a-seed_file.patch Patch12: ntp-kernel-time-sync-message.patch Patch13: ntp-code-cleanup.patch +Patch14: ntp-sntp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Provides: ntp-daemon xntp3 xntp <= 4.2.4p5 @@ -204,6 +205,7 @@ %patch11 -p1 %patch12 %patch13 +%patch14 %build rm -rf acconfig.h @@ -373,6 +375,8 @@ %doc html/* %changelog +* Wed Oct 29 2008 varkoly@suse.de +- (bnc#439813) - autobuild does not run because time is appearently out of sync * Fri Oct 24 2008 varkoly@suse.de - Add ntp-wait script. This tests if the time is synchronized. Very important for time critical services like kerberos. @@ -864,7 +868,7 @@ - update to ntp-4.0.92c * Fri Mar 26 1999 ro@suse.de - fixed spec-naming -* Thu Mar 25 1999 ma@suse.de +* Wed Mar 24 1999 ma@suse.de - update to 3.5.93e - ntptime now builds on glibc - Additional patch from Ulrich Windl for DCF77 receiver ++++++ conf.ntp.init ++++++ --- /var/tmp/diff_new_pack.D29545/_old 2008-11-03 14:11:14.000000000 +0100 +++ /var/tmp/diff_new_pack.D29545/_new 2008-11-03 14:11:14.000000000 +0100 @@ -126,6 +126,7 @@ } function add_runtime_server() { + /usr/sbin/sntp -F -r $@ NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n" NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) logger -t $0 "runtime configuration: $NTPDC_LOG" ++++++ ntp-sntp.patch ++++++ --- sntp/main.c 2008-10-29 17:13:22.000000000 +0100 +++ sntp/main.c 2008-10-29 17:47:39.000000000 +0100 @@ -13,7 +13,7 @@ sntp [ --help | -h | -? ] [ -v | -V | -W ] [ -q [ -f savefile ] | - [ { -r | -a } [ -P prompt ] [ -l lockfile ] ] + [ [ -F ] { -r | -a } [ -P prompt ] [ -l lockfile ] ] [ -c count ] [ -e minerr ][ -E maxerr ] [ -d delay | -x [ separation ] [ -f savefile ] ] [ -4 | -6 ] [ address(es) ] ] @@ -39,6 +39,8 @@ -a indicates that the system clock should be reset by 'adjtime'. Naturally, this will work only if the user has enough privilege. + -F force time set even if the corretion is to large + -x indicates that the program should run as a daemon (i.e. forever), and allow for clock drift. @@ -181,6 +183,7 @@ operation = 0; /* Defined in header.h - see action */ const char *lockname = NULL; /* The name of the lock file */ int unprivport = 0; /* Use an unpriv port for query? */ +int force = 0; #define COUNT_MAX 25 /* Do NOT increase this! */ #define WEEBLE_FACTOR 1.2 /* See run_server() and run_daemon() */ @@ -284,7 +287,7 @@ fprintf(stderr,"Syntax: %s [ --help | -h | -? ] [ -v | -V | -W ] \n",argv0); fprintf(stderr," [ -q [ -f savefile ] |\n"); - fprintf(stderr," [ { -r | -a } [ -P prompt ] [ -l lockfile ] ]\n"); + fprintf(stderr," [ [ -F ] { -r | -a } [ -P prompt ] [ -l lockfile ] ]\n"); fprintf(stderr," [ -c count ] [ -e minerr ] [ -E maxerr ]\n"); fprintf(stderr," [ -d delay | -x [ separation ] "); fprintf(stderr,"[ -f savefile ] ]\n"); @@ -627,7 +630,7 @@ /* If the correction is large, ask for confirmation before proceeding. */ - if (absoff > prompt) { + if ( ! force && (absoff > prompt) ) { if (! daemon && ftty(stdin) && ftty(stdout)) { printf("The time correction is %.3f +/- %.3f+%.3f seconds\n", offset,dispersion,error); @@ -1569,6 +1572,8 @@ preferred_family(PREF_FAM_INET6); else if (strcmp(argv[1],"-u") == 0) ++unprivport; + else if (strcmp(argv[1],"-F") == 0) + force = 1; else if (strcmp(argv[1],"-q") == 0 && action == 0) action = action_query; else if (strcmp(argv[1],"-r") == 0 && action == 0) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org