Hello community, here is the log from the commit of package ntp checked in at Mon Jul 14 21:06:11 CEST 2008. -------- --- ntp/ntp.changes 2008-05-26 23:09:14.000000000 +0200 +++ ntp/ntp.changes 2008-06-17 11:44:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 17 11:43:45 CEST 2008 - varkoly@suse.de + +- (bnc#398437) - ntp client has missing dependency to package timezone +- (bnc#397422) - ntp rpm throws an error when installing + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.QZ1198/_old 2008-07-14 21:05:27.000000000 +0200 +++ /var/tmp/diff_new_pack.QZ1198/_new 2008-07-14 21:05:27.000000000 +0200 @@ -20,7 +20,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p4 -Release: 41 +Release: 50 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz2 @@ -65,6 +65,7 @@ Obsoletes: xntp3 xntp <= 4.2.4p4 Conflicts: openntpd PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff /usr/bin/grep +Requires: timezone %description The Network Time Protocol (NTP) is used to synchronize the time of a @@ -124,7 +125,7 @@ AutoReqProv: on Provides: ntpdoc xntpdoc xntp-doc = 4.2.4 Obsoletes: ntpdoc xntpdoc xntp-doc <= 4.2.4 -Summary: Additional Package Documentation for xntp +Summary: Additional Package Documentation for ntp %description doc The complete set of documentation for building and configuring an NTP @@ -299,6 +300,7 @@ /usr/sbin/groupadd -r ntp 2> /dev/null || : /usr/sbin/useradd -r -o -g ntp -u 74 -s /bin/false -c "NTP daemon" -d /var/lib/ntp ntp 2> /dev/null || : /usr/sbin/usermod -g ntp ntp 2>/dev/null || : +test -L /var/run/ntp || rm -rf /var/run/ntp && : %preun %stop_on_removal ntp @@ -378,7 +380,8 @@ %attr(0755,ntp,ntp) %dir /var/lib/ntp/drift %{_mandir}/man1/* /var/adm/fillup-templates/* -%attr(0755,ntp,root)/var/run/ntp +%attr(0755,ntp,root)/var/lib/ntp/var/run/ntp +/var/run/ntp %ghost %config(noreplace) /var/log/ntp %ghost %config %{_sysconfdir}/sysconfig/network/if-up.d/50-ntp %{_sysconfdir}/sysconfig/network/scripts/50-ntp @@ -391,6 +394,9 @@ %doc html/* %changelog +* Tue Jun 17 2008 varkoly@suse.de +- (bnc#398437) - ntp client has missing dependency to package timezone +- (bnc#397422) - ntp rpm throws an error when installing * Tue May 27 2008 varkoly@suse.de - (bnc#393305) – /etc/ntp.conf gets overwritten during an update * Tue May 20 2008 varkoly@suse.de ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-04-01 14:00:59.000000000 +0200 +++ ntp/conf.ntp.init 2008-06-17 11:43:42.000000000 +0200 @@ -99,7 +99,13 @@ function prepare_chroot() { for configfile in /etc/{localtime,ntp.keys} $NTP_CONF $NTPD_CHROOT_FILES; do test -d ${CHROOT_PREFIX}/${configfile%/*} || mkdir -p ${CHROOT_PREFIX}/${configfile%/*} - cp -auL ${configfile} ${CHROOT_PREFIX}/${configfile%/*} + if [ -r ${configfile} ] + then + cp -auL ${configfile} ${CHROOT_PREFIX}/${configfile%/*} + else + echo + echo "Warning: ${configfile} not found or not readable" + fi mkdir -p ${CHROOT_PREFIX}/proc mount -t proc -o ro proc ${CHROOT_PREFIX}/proc 2>/dev/null done @@ -132,6 +138,14 @@ logger -t $0 "runtime configuration: $NTPDC_LOG" } +#clean up at boot time +if [ "${PREVLEVEL}" = "N" ] +then + for f in /var/run/ntp/servers*; do + rm -rf ${f} + done +fi + case "$1" in start) ntpd_is_running || $0 ntptimeset ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org