Hello community, here is the log from the commit of package ntp checked in at Tue Oct 14 19:09:50 CEST 2008. -------- --- ntp/ntp.changes 2008-10-08 17:42:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-10-14 10:47:15.612403000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 13 19:36:40 CEST 2008 - varkoly@suse.de + +- (bnc#434529) - SLES11 Beta2: Firewall opens both TCP and UDP for ntp +- ntpdate is now a wrapper script around sntp. All parameters + except for the time server will be ignored + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.P18016/_old 2008-10-14 19:08:11.000000000 +0200 +++ /var/tmp/diff_new_pack.P18016/_new 2008-10-14 19:08:11.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p5 -Release: 7 +Release: 8 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz @@ -369,6 +369,10 @@ %doc html/* %changelog +* Mon Oct 13 2008 varkoly@suse.de +- (bnc#434529) - SLES11 Beta2: Firewall opens both TCP and UDP for ntp +- ntpdate is now a wrapper script around sntp. All parameters + except for the time server will be ignored * Wed Oct 08 2008 varkoly@suse.de - Remove redundand patches - Remove ntpdate because this is obsolete. ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-10-08 17:42:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-10-13 20:01:06.932305000 +0200 @@ -147,7 +147,7 @@ case "$1" in start) - ntpd_is_running || $0 ntptimeset + # ntpd_is_running || $0 ntptimeset # get the initial date from the timeservers configured in ntp.conf echo -n "Starting network time protocol daemon (NTPD)" # do we need a refclock symlink? ++++++ ntp-config.patch ++++++ --- /var/tmp/diff_new_pack.P18016/_old 2008-10-14 19:08:11.000000000 +0200 +++ /var/tmp/diff_new_pack.P18016/_new 2008-10-14 19:08:11.000000000 +0200 @@ -81,3 +81,49 @@ bin_PROGRAMS= sntp #run_ag= cd $(srcdir) && autogen --writable -L $(top_srcdir)/include run_ag= cd $(srcdir) && autogen --writable +--- ntp-4.2.4p5-orig/ntpd/ntp_io.c 2008-05-20 09:06:14.000000000 +0200 ++++ ntp-4.2.4p5/ntpd/ntp_io.c 2008-10-09 20:07:25.000000000 +0200 +@@ -16,6 +16,7 @@ + #include "ntp_request.h" + #include "ntp.h" + #include "ntp_unixtime.h" ++#include "ntpd-opts.h" + + /* Don't include ISC's version of IPv6 variables and structures */ + #define ISC_IPV6_H 1 +@@ -3014,6 +3015,10 @@ + fds = activefds; + tvzero.tv_sec = tvzero.tv_usec = 0; + ++ if (HAVE_OPT( QUIT )) ++ { ++ tvzero.tv_usec = 60000; ++ } + n = select(maxactivefd+1, &fds, (fd_set *)0, (fd_set *)0, &tvzero); + + /* +--- ntp-4.2.4p5-orig/ntpd/ntp_intres.c 2008-08-10 13:02:43.000000000 +0200 ++++ ntp-4.2.4p5/ntpd/ntp_intres.c 2008-10-09 22:12:58.000000000 +0200 +@@ -675,7 +675,7 @@ + * doesn't fool us. Note the socket is nonblocking. + */ + tvout.tv_sec = 0; +- tvout.tv_usec = 0; ++ tvout.tv_usec = 600; + FD_ZERO(&fdset); + FD_SET(sockfd, &fdset); + while (select(sockfd + 1, &fdset, (fd_set *)0, (fd_set *)0, &tvout) > +--- ntp-4.2.4p5-orig/ntpd/ntpd.c 2008-08-17 10:47:31.000000000 +0200 ++++ ntp-4.2.4p5/ntpd/ntpd.c 2008-10-09 22:36:16.000000000 +0200 +@@ -1031,8 +1031,10 @@ + (fd_set *)0, &t1); + } + # else ++ struct timeval t1; ++ t1.tv_sec = 0; t1.tv_usec = 60000; + nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0, +- (fd_set *)0, (struct timeval *)0); ++ (fd_set *)0, &t1); + # endif /* VMS */ + if (nfound > 0) + { ++++++ ntpdate ++++++ --- ntp/ntpdate 2008-10-08 17:42:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntpdate 2008-10-13 20:01:07.216021000 +0200 @@ -13,7 +13,9 @@ The functionality ntpdate offered is now provided by the ntpd daemon itself. If you call ntpd with the command line option -q it will retrive the current time and set it accordingly. Please check the Network Time Protocol (NTP) -daemon man page for further information. +daemon man page and the URL +http://support.ntp.org/bin/view/Dev/DeprecatingNtpdate +for further information. The ntpdate program is deprecated and shouldn't be used any more. @@ -21,4 +23,7 @@ poll of the servers specified in /etc/ntp.conf. EOF -exit 0 +a=$(($#-1)) +shift $a + +/usr/sbin/sntp $1 ++++++ ntp.firewall ++++++ --- ntp/ntp.firewall 2008-10-08 17:42:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.firewall 2008-10-13 20:01:07.269967000 +0200 @@ -2,7 +2,7 @@ ## Description: Opens ports for xntp. # space separated list of allowed TCP ports -TCP="ntp" +TCP="" # space separated list of allowed UDP ports UDP="ntp" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org