Hello community, here is the log from the commit of package ntp checked in at Wed Jan 23 23:21:56 CET 2008. -------- --- ntp/ntp.changes 2008-01-18 12:41:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-01-22 14:43:30.992460000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 22 10:05:49 CET 2008 - mskibbe@suse.de + +- fix specfile + o check for file before the file is removed + o remove a "cut" error on some systems + o fix provides conflict with openntp +- readd sysconfig varible NTPD_RUN_CHROOTED +- fix ifupdown script + +------------------------------------------------------------------- Old: ---- NetworkManager-ntp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.b26643/_old 2008-01-23 23:21:04.000000000 +0100 +++ /var/tmp/diff_new_pack.b26643/_new 2008-01-23 23:21:04.000000000 +0100 @@ -16,10 +16,10 @@ BuildRequires: pwdutils %define ntpfaqversion 3.4 Url: http://www.ntp.org/ -License: X11/MIT +License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p4 -Release: 1 +Release: 3 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz2 @@ -60,8 +60,9 @@ Patch19: ntp-4.2.4-w32-time-authentification.fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Provides: xntp3 xntp = 4.2.4 -Obsoletes: xntp3 xntp <= 4.2.4 +Provides: ntp-daemon xntp3 xntp = %{version} +Obsoletes: xntp3 xntp <= %{version} +Conflicts: openntpd PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff /usr/bin/grep %description @@ -298,15 +299,17 @@ %stop_on_removal ntp # no update? Then remove these files that aren't owned by the package if [ ${FIRST_ARG:-0} -eq 0 ]; then - rm -f /var/lib/ntp/drift/ntp.drift - rm -f /var/lib/ntp/etc/* - rm -f /var/log/ntp + test -e /var/lib/ntp/drift/ntp.drift && rm -f /var/lib/ntp/drift/ntp.drift + rm -f /var/lib/ntp/etc/* 2>/dev/null + test -e /var/log/ntp && rm -f /var/log/ntp fi %post # Create ntp.keys file if [ ! -f /etc/ntp.keys ]; then - echo "1 M $(dd if=/dev/urandom count=1 2>/dev/null | md5sum | cut -c 0-7)" > /etc/ntp.keys + tmp=$(dd if=/dev/urandom count=1 2>/dev/null | md5sum) + tmp=${tmp:0:7} > /etc/ntp.keys + echo "1 M $tmp" > /etc/ntp.keys chown root:ntp /etc/ntp.keys chmod 0640 /etc/ntp.keys fi @@ -316,8 +319,8 @@ cvt_tmp=/etc/sysconfig/sysconfig.ntp.$$ sed -e "s@^XNTPD_@NTPD_@" -e "s@\(\".*\)-U ntp\(.*\"\)@\1-u ntp\2@" \ /etc/sysconfig/ntp > $cvt_tmp && \ - mv $cvt_tmp /etc/sysconfig/ntp - rm -f /etc/sysconfig/ntp + test -e $cvt_tmp && mv $cvt_tmp /etc/sysconfig/ntp + test -e /etc/sysconfig/ntp && rm -f /etc/sysconfig/ntp fi # update from previous permissions if [ -f /etc/ntp.conf ]; then @@ -370,6 +373,13 @@ %doc html/* %changelog +* Tue Jan 22 2008 mskibbe@suse.de +- fix specfile + o check for file before the file is removed + o remove a "cut" error on some systems + o fix provides conflict with openntp +- readd sysconfig varible NTPD_RUN_CHROOTED +- fix ifupdown script * Wed Jan 16 2008 mskibbe@suse.de - Fate #301836: NTP XML Service Description Document * Mon Jan 07 2008 mskibbe@suse.de ++++++ conf.ntp.ifupdown ++++++ --- ntp/conf.ntp.ifupdown 2008-01-18 12:41:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.ifupdown 2008-01-23 08:33:53.339691000 +0100 @@ -55,7 +55,7 @@ case "$0" in *if-up.d*) if rcntp status 2>&1; then - log_msg=$( rcntp readdserver 2>&1 ) + log_msg=$( rcntp readd 2>&1 ) log_dbg "${log_msg}" else if chkconfig -c ntp 2>&1; then ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-01-18 12:41:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-01-23 14:16:48.567023000 +0100 @@ -153,7 +153,7 @@ grep -v "^server" $NTP_CONF > $NTP_CONF.tmp grep "^server.*127\.0\.0\.1" $NTP_CONF >> $NTP_CONF.tmp - startproc $NTPD_BIN -p ${NTPD_PID_NOPREFIX} $NTPD_OPTIONS -c $NTP_CONF~ + startproc $NTPD_BIN -p ${NTPD_PID_NOPREFIX} $NTPD_OPTIONS -c $NTP_CONF.tmp rm $NTP_CONF.tmp @@ -239,7 +239,7 @@ rc_status ;; ntptimeset) - startproc $NTPD_BIN -p ${NTPD_PID_NOPREFIX} $NTPD_OPTIONS -q + grep -v 127.127.1.0 /etc/ntp.conf | grep ^server >/dev/null && startproc $NTPD_BIN -p ${NTPD_PID_NOPREFIX} $NTPD_OPTIONS -c $NTP_CONF -q || echo "no server configured" ;; reload) echo -n "Reload network time protocol daemon (NTPD)" ++++++ conf.sysconfig.ntp ++++++ --- ntp/conf.sysconfig.ntp 2008-01-18 12:41:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/conf.sysconfig.ntp 2008-01-22 14:22:17.546366000 +0100 @@ -22,6 +22,19 @@ # NTPD_OPTIONS="-g -u ntp:ntp" +## Type: yesno +## Default: yes +## ServiceRestart: ntp +# +# Shall the time server ntpd run in the chroot jail /var/lib/ntp? +# +# Each time you start ntpd with the init script, /etc/ntp.conf will be +# copied to /var/lib/ntp/etc/. +# +# The pid file will be in /var/lib/ntp/var/run/ntpd.pid. +# +NTPD_RUN_CHROOTED="yes" + ## Type: string ## Default: "" ## ServiceRestart: ntp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org