Hello community, here is the log from the commit of package xntp checked in at Wed Aug 29 22:59:38 CEST 2007. -------- --- xntp/xntp.changes 2007-07-09 11:55:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xntp/xntp.changes 2007-08-29 13:03:24.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 29 11:25:43 CEST 2007 - mskibbe@suse.de + +- Bug 283706 – ntpdate in the init script of ntp fails if the + network interface is not active +- Bug 256291 - setting initial time and date via ntp and mounting + of nfs shares with network manager fails + +------------------------------------------------------------------- New: ---- conf.ntp.ifupdown ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xntp.spec ++++++ --- /var/tmp/diff_new_pack.F28783/_old 2007-08-29 22:59:25.000000000 +0200 +++ /var/tmp/diff_new_pack.F28783/_new 2007-08-29 22:59:25.000000000 +0200 @@ -19,7 +19,7 @@ License: X11/MIT Group: Productivity/Networking/Other Version: 4.2.4p3 -Release: 1 +Release: 16 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz2 @@ -31,12 +31,13 @@ Source5: conf.sysconfig.syslog-ntp Source6: conf.ntp.reg Source7: %name.firewall +Source8: conf.ntp.ifupdown +Source9: NetworkManager-ntp # documentation Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2 Source11: ntp.1.gz Source12: README.SUSE Source13: ntp-4.2.0-rh-manpages.tar.gz -Source14: NetworkManager-ntp Patch0: ntp-4.1.1.SuSE-Config.diff Patch1: ntp-4.2.0.ntpdate_overflow.diff Patch2: xntp-posix_options.diff @@ -265,14 +266,9 @@ # # man pages # -mkdir -p %{buildroot}/%{_mandir}/man1 +install -d %{buildroot}/%{_mandir}/man1 install -m 644 man/* %{buildroot}/%{_mandir}/man1 # -# NetworkManagerDispatcher script -# -mkdir -p %{buildroot}/etc/NetworkManager/dispatcher.d/ -cp %{S:14} %{buildroot}/etc/NetworkManager/dispatcher.d/ntp -# # firewall # install -d $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/ @@ -282,6 +278,15 @@ # install -d $RPM_BUILD_ROOT/var/log/ touch $RPM_BUILD_ROOT/var/log/ntp +# +# NetworkManagerDispatcher and ifup/down scripts +# +#install -d %{buildroot}/etc/NetworkManager/dispatcher.d/ +install -d %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/ +install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/ +#install -m 755 %{S:9} %{buildroot}/etc/NetworkManager/dispatcher.d/ntp +install -m 755 %{S:8} %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/50-ntp +touch %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/50-ntp %clean rm -rf $RPM_BUILD_ROOT @@ -326,6 +331,11 @@ touch /var/log/ntp chmod 644 /var/log/ntp fi +#install dispatcher file only if old nm scripts are here or while a new installation +if [ ${1:-0} -eq 1 -o -f /etc/NetworkManager/dispatcher.d/ntp ] ; then + rm /etc/sysconfig/network/if-up.d/50-ntp + ln -s /etc/sysconfig/network/scripts/50-ntp /etc/sysconfig/network/if-up.d/50-ntp +fi %postun %restart_on_update ntp @@ -339,9 +349,9 @@ %config(noreplace) /etc/slp.reg.d/ntp.reg %{_sysconfdir}/init.d/ntp %{_sysconfdir}/logrotate.d/ntp -%dir /etc/NetworkManager -%dir /etc/NetworkManager/dispatcher.d -%attr(0755,root,root) /etc/NetworkManager/dispatcher.d/ntp +#%dir /etc/NetworkManager +#%dir /etc/NetworkManager/dispatcher.d +#%attr(0755,root,root) /etc/NetworkManager/dispatcher.d/ntp %{_sbindir}/* /var/lib/ntp %attr(0640,root,ntp) %config(noreplace) /var/lib/ntp/etc/ntp.conf.iburst @@ -353,12 +363,19 @@ %dir /etc/SuSEfirewall2.d %dir /etc/SuSEfirewall2.d/services %ghost %config(noreplace) /var/log/ntp +%ghost %config %{_sysconfdir}/sysconfig/network/if-up.d/50-ntp +%{_sysconfdir}/sysconfig/network/scripts/50-ntp %files doc %defattr(-,root,root) %doc html/* %changelog +* Wed Aug 29 2007 - mskibbe@suse.de +- Bug 283706 – ntpdate in the init script of ntp fails if the + network interface is not active +- Bug 256291 - setting initial time and date via ntp and mounting + of nfs shares with network manager fails * Mon Jul 09 2007 - mskibbe@suse.de - update to 2.4.4p3 which o Broadcast address was not correctly set for interface addresses ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org