Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at Thu Apr 21 13:41:53 CEST 2011.
-------- --- ntp/ntp.changes 2011-02-03 17:15:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2011-04-01 16:52:05.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 1 16:50:21 CET 2011 - [email protected] + +- replace remove-ntpdate.diff with sed script +- don't effectively zap existing /etc/sysconfig/ntp +- while at it, simplify /etc/sysconfig/ntp update +- improve NTP_PARSE_DEVICE documentation for /etc/sysconfig/ntp +- refresh all patches with offsets and fuzz + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ntp-4.2.6p3.tar.gz remove-ntpdate.diff New: ---- ntp-4.2.6p3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:40.000000000 +0200 @@ -27,10 +27,10 @@ License: BSD3c(or similar) Group: Productivity/Networking/Other Version: 4.2.6p3 -Release: 8 +Release: 9 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.gz +Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2 # configuration Source1: conf.logrotate.ntp Source2: conf.ntp.conf @@ -49,7 +49,6 @@ Source16: ntp-wait Patch1: ntp-segfault_on_invalid_device.patch Patch4: ntpd-maxmonmen.patch -Patch9: remove-ntpdate.diff Patch10: ntp-strcat.patch Patch11: ntp-4.2.6p2-seed_file.patch Patch13: ntp-code-cleanup.patch @@ -62,7 +61,7 @@ Obsoletes: xntp3 xntp <= 4.2.4p5 Conflicts: openntpd PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff /usr/bin/grep /sbin/chkconfig -Requires: timezone +Requires: timezone logrotate %description The Network Time Protocol (NTP) is used to synchronize the time of a @@ -187,7 +186,6 @@ # copy README.SUSE cp %{S:12} . tar xzf %{S:13} -%patch9 %patch10 -p1 %patch11 %patch13 @@ -195,6 +193,10 @@ %patch16 %patch18 +# don't build ntpdate (replaced with %{SOURCE15} script) +sed -i '/\tntpdate/d +s/ntpdate //g' Makefile.in Makefile.am + %build rm -rf acconfig.h %{?suse_update_config} @@ -302,11 +304,7 @@ # Are we in update mode? if [ -f /etc/sysconfig/ntp ]; then # convert parameters and description in existing sysconfig file - cvt_tmp=/etc/sysconfig/sysconfig.ntp.$$ - sed -e "s@^XNTPD_@NTPD_@" -e "s@\(\".*\)-U ntp\(.*\"\)@\1-u ntp\2@" \ - /etc/sysconfig/ntp > $cvt_tmp && \ - test -e $cvt_tmp && mv $cvt_tmp /etc/sysconfig/ntp - test -e /etc/sysconfig/ntp && rm -f /etc/sysconfig/ntp + 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.sysconfig.ntp ++++++ --- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:40.000000000 +0200 @@ -41,14 +41,17 @@ # NTP_PARSE_LINK="" -## Type: boolean +## Type: string(/dev/ttyS0,/dev/ttyS1,/dev/ttyUSB0,/dev/ttyUSB1,/dev/ttyUSB2) ## Default: "" ## ServiceRestart: ntp # # Parse driver device +# # For more information see the ntp documentation in the package ntp-doc # /usr/share/doc/packages/ntp-doc/drivers/driver8.html # +# NOTE: Adjust /etc/apparmor.d/tunables/ntpd accordingly +# NTP_PARSE_DEVICE="" ## Type: boolean ++++++ ntp-4.2.6p3.tar.gz -> ntp-4.2.6p3.tar.bz2 ++++++ ++++++ ntp-segfault_on_invalid_device.patch ++++++ --- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:41.000000000 +0200 @@ -1,7 +1,8 @@ -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 @@ +Index: ntpd/refclock_parse.c +=================================================================== +--- ntpd/refclock_parse.c ++++ ntpd/refclock_parse.c +@@ -3315,6 +3315,10 @@ parse_control( struct parseunit *parse = (struct parseunit *)peer->procptr->unitptr; parsectl_t tmpctl; @@ -12,4 +13,3 @@ static char outstatus[400]; /* status output buffer */ if (out) -Nur in ntp-segfault_on_invalid_device/ntpd: refclock_parse.c.orig. ++++++ ntp-strcat.patch ++++++ --- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:41.000000000 +0200 @@ -1,7 +1,8 @@ -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 @@ +Index: b/ntpd/refclock_parse.c +=================================================================== +--- a/ntpd/refclock_parse.c ++++ b/ntpd/refclock_parse.c +@@ -3574,7 +3574,7 @@ parse_process( NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */ msyslog(LOG_WARNING, "PARSE receiver #%d: conversion status \"%s\"", ++++++ ntpd-maxmonmen.patch ++++++ --- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:41.000000000 +0200 @@ -1,6 +1,8 @@ ---- ntp-4.2.4p4/ntpd/ntp_monitor.c -+++ ntp-4.2.4p4/ntpd/ntp_monitor.c -@@ -50,7 +50,7 @@ +Index: b/ntpd/ntp_monitor.c +=================================================================== +--- a/ntpd/ntp_monitor.c ++++ b/ntpd/ntp_monitor.c +@@ -45,7 +45,7 @@ * ... I don't believe the above is true anymore ... jdg */ #ifndef MAXMONMEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
