Hello community, here is the log from the commit of package ntp checked in at Wed Mar 26 00:59:45 CET 2008. -------- --- ntp/ntp.changes 2008-03-14 09:04:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-03-25 17:44:49.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Mar 25 17:44:11 CET 2008 - anschneider@suse.de + +- Fix IPv6 support in chroot jail; [bnc#333525]. + +------------------------------------------------------------------- +Tue Mar 25 10:52:19 CET 2008 - anschneider@suse.de + +- Fix broken init script; [bnc#365515]; + +------------------------------------------------------------------- +Tue Mar 25 10:22:52 CET 2008 - anschneider@suse.de + +- Install SuSEfirewall2 service file into the right directory; [bnc#370482]. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.C32269/_old 2008-03-26 00:59:18.000000000 +0100 +++ /var/tmp/diff_new_pack.C32269/_new 2008-03-26 00:59:18.000000000 +0100 @@ -20,7 +20,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p4 -Release: 17 +Release: 22 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz2 @@ -234,65 +234,65 @@ make %install -make DESTDIR="%{buildroot}" install +%makeinstall # Change permissions chmod 644 html/pic/neoclock4x.gif %fdupes -s html # # default configuration # -install -d %{buildroot}/var/lib/ntp/{drift,etc,var/{lib,run/ntp},dev} -install -d %{buildroot}/var/run +%__install -d %{buildroot}/var/lib/ntp/{drift,etc,var/{lib,run/ntp},dev} +%__install -d %{buildroot}/var/run ln -s ../.. %{buildroot}/var/lib/ntp/var/lib/ntp ln -s ../lib/ntp/var/run/ntp %{buildroot}/var/run -install -m 644 -D %{S:1} %{buildroot}/etc/logrotate.d/ntp -install -m 600 -D %{S:2} %{buildroot}/etc/ntp.conf -install -m 600 -D %{S:2} %{buildroot}/var/lib/ntp/etc/ntp.conf.iburst +%__install -m 644 -D %{S:1} %{buildroot}/etc/logrotate.d/ntp +%__install -m 600 -D %{S:2} %{buildroot}/etc/ntp.conf +%__install -m 600 -D %{S:2} %{buildroot}/var/lib/ntp/etc/ntp.conf.iburst # # boot scripts # -install -D %{S:3} %{buildroot}/etc/init.d/ntp -install -d %{buildroot}/usr/sbin +%__install -D %{S:3} %{buildroot}/etc/init.d/ntp +%__install -d %{buildroot}/usr/sbin ln -s ../../etc/init.d/ntp %{buildroot}/usr/sbin/rcntp # # fillup sysconfig.ntp # -install -m 644 -D %{S:4} %{buildroot}/var/adm/fillup-templates/sysconfig.ntp -install -m 644 -D %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-ntp +%__install -m 644 -D %{S:4} %{buildroot}/var/adm/fillup-templates/sysconfig.ntp +%__install -m 644 -D %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-ntp # # install SLP reg file # -install -m 644 -D %{S:6} $RPM_BUILD_ROOT/etc/slp.reg.d/ntp.reg +%__install -m 644 -D %{S:6} %{buildroot}/etc/slp.reg.d/ntp.reg # # man pages # -install -d %{buildroot}/%{_mandir}/man1 -install -m 644 man/* %{buildroot}/%{_mandir}/man1 +%__install -d %{buildroot}/%{_mandir}/man1 +%__install -m 644 man/* %{buildroot}/%{_mandir}/man1 # # firewall # -install -d $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/ -install -m 644 %{S:7} $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/%{name} +%__install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ +%__install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} # # Logfile # -install -d $RPM_BUILD_ROOT/var/log/ -touch $RPM_BUILD_ROOT/var/log/ntp +%__install -d %{buildroot}/var/log/ +touch %{buildroot}/var/log/ntp # # NetworkManagerDispatcher and ifup/down scripts # -install -d %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/ -install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/ -install -m 755 %{S:8} %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/50-ntp +%__install -d %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/ +%__install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/ +%__install -m 755 %{S:8} %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/50-ntp touch %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/50-ntp # # service xml # -install -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ -install -m 644 %{S:14} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ +%__install -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ +%__install -m 644 %{S:14} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf %{buildroot} %pre /usr/sbin/groupadd -r ntp 2> /dev/null || : @@ -357,9 +357,7 @@ %{_sysconfdir}/logrotate.d/ntp %{_sbindir}/* /var/lib/ntp -%dir %{_sysconfdir}/SuSEfirewall2.d/services -%dir %{_sysconfdir}/SuSEfirewall2.d -%{_sysconfdir}/SuSEfirewall2.d/services/ntp +%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp %attr(0640,root,ntp) %config(noreplace) /var/lib/ntp/etc/ntp.conf.iburst %attr(0755,ntp,ntp) %dir /var/lib/ntp/drift %{_mandir}/man1/* @@ -377,6 +375,12 @@ %doc html/* %changelog +* Tue Mar 25 2008 anschneider@suse.de +- Fix IPv6 support in chroot jail; [bnc#333525]. +* Tue Mar 25 2008 anschneider@suse.de +- Fix broken init script; [bnc#365515]; +* Tue Mar 25 2008 anschneider@suse.de +- Install SuSEfirewall2 service file into the right directory; [bnc#370482]. * Fri Mar 14 2008 aj@suse.de - Make ntp.init LSB compliant. - Fix permissions of image file. ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-03-14 07:23:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-03-25 17:16:04.000000000 +0100 @@ -3,13 +3,15 @@ # All rights reserved. # # Author: Michael Andres +# Author: Michael Skibbe +# Author: Andreas Schneider # # /etc/init.d/ntp # and its symbolic link # /usr/sbin/rcntp # ### BEGIN INIT INFO -# Provides: ntp ntpd xntpd +# Provides: ntp ntpd xntpd # Required-Start: $remote_fs $syslog $named # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 5 @@ -35,17 +37,17 @@ # set default options NTP_CONF="/etc/ntp.conf" if [ ! -f ${NTP_CONF} ]; then - echo -n "Time server configuration file, ${NTP_CONF} does not exist." - # Tell the user this has skipped - rc_status -s - exit 6 + echo -n "Time server configuration file, ${NTP_CONF} does not exist." + # Tell the user this has skipped + rc_status -s + exit 6 fi NTPD_BIN="/usr/sbin/ntpd" if [ ! -x ${NTPD_BIN} ]; then - echo -n "Time server, ${NTPD_BIN} not installed!" - rc_status -s - exit 5 + echo -n "Time server, ${NTPD_BIN} not installed!" + rc_status -s + exit 5 fi NTPD_OPTIONS="-g -u ntp:ntp" @@ -55,21 +57,19 @@ NTPDC_BIN="/usr/sbin/ntpdc" NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF) -if test -z "$NTP_KEYS"; then - echo -n "NTP key file does not exist" - rc_status -s - exit 5 -fi NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF) -if test -z "$NTP_KEYS"; then - echo -n "NTP key id not defined" - rc_status -s - exit 5 -fi NTP_PASSWD=$(awk '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS) -if test -z "$NTP_KEYS"; then - echo -n "No password for requestkey set" - return 1 + +if [ -n "$NTP_KEYS" ]; then + if test -z "$NTP_KEYID"; then + echo -n "NTP key id not defined" + rc_status -s + exit 5 + fi + if test -z "$NTP_PASSWD"; then + echo -n "No password for requestkey set" + return 1 + fi fi # Override defaults, if we have the sysconfig file @@ -77,191 +77,158 @@ # set Default CHROOT path if not set but wanted test "${NTPD_RUN_CHROOTED}" = "yes" && \ - CHROOT_PREFIX="/var/lib/ntp" || \ - CHROOT_PREFIX="" + CHROOT_PREFIX="/var/lib/ntp" || \ + CHROOT_PREFIX="" # set default PID variables NTPD_PID="${CHROOT_PREFIX}/var/run/ntp/ntpd.pid" NTPD_PID_NOPREFIX="/var/run/ntp/ntpd.pid" -function ntpd_is_running() { - $0 status >/dev/null -} - -function parse_symlink -{ - if [ -c "$NTP_PARSE_DEVICE" ]; then - if [ -n "$NTP_PARSE_LINK" ]; then - ln -sf $NTP_PARSE_DEVICE $NTP_PARSE_LINK - fi - fi -} - -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%/*} - done - NTPD_OPTIONS="${NTPD_OPTIONS} -i ${CHROOT_PREFIX}" -} - -function runtime_configuration -{ - NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\n" - for ntpserver in "$@"; do - NTPC_CMD="${NTPC_CMD}addserver $ntpserver\n" - done - NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) - logger -t $0 "runtime configuration: $NTPDC_LOG" +function ntpd_is_running() { + $0 status >/dev/null } -function add_runtime_server -{ - NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n" - NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) - logger -t $0 "runtime configuration: $NTPDC_LOG" +function parse_symlink() { + if [ -c "$NTP_PARSE_DEVICE" ]; then + if [ -n "$NTP_PARSE_LINK" ]; then + ln -sf $NTP_PARSE_DEVICE $NTP_PARSE_LINK + fi + fi +} + +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%/*} + mkdir -p ${CHROOT_PREFIX}/proc + mount -t proc -o ro proc ${CHROOT_PREFIX}/proc 2>/dev/null + done + NTPD_OPTIONS="${NTPD_OPTIONS} -i ${CHROOT_PREFIX}" +} + +function runtime_configuration() { + for f in /var/run/ntp/servers*; do + if [ -r ${f} ]; then + . ${f} + ntp_server = "${ntp_server} ${RUNTIME_SERVERS}" + fi + done + if [ -n "${ntp_server}"]; then + for s in ${ntp_server}; do + add_runtime_server ${s} + done + fi } -function reloaddevices -{ - NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\nifreload\n" - NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) - logger -t $0 "runtime configuration: $NTPDC_LOG" +function add_runtime_server() { + NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n" + NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) + logger -t $0 "runtime configuration: $NTPDC_LOG" } -function adddhcpserver -{ - if( test -r /var/run/ntp/servers ) - then - . /var/run/ntp/servers - runtime_configuration $RUNTIME_SERVERS - return 0 - else - return 1 - fi +function reloaddevices { + NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\nifreload\n" + NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN) + logger -t $0 "runtime configuration: $NTPDC_LOG" } case "$1" in - start) - # 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? - parse_symlink - # do we run chrooted? - test "${NTPD_RUN_CHROOTED}" = "yes" && prepare_chroot - - 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.tmp - - rm $NTP_CONF.tmp - - $0 readd $2 - rc_status -v - ;; - stop) - echo -n "Shutting down network time protocol daemon (NTPD)" - killproc -p ${NTPD_PID} -TERM $NTPD_BIN - rc_status -v - rm -f ${NTPD_PID} - ;; - try-restart) - $0 status - if test $? = 0; then - $0 restart $2 - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - $0 stop - $0 start $2 - rc_status - ;; - try-restart-iburst) - $0 status - if test $? = 0; then - $0 stop - $0 start iburst - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - addserver) - if test "${#@}" -lt "2"; then - echo -n "No servers to add specified" - rc_failed 3 - fi - shift - - $0 status 2>&1 >/dev/null - if test $? = 0; - then - add_runtime_server $@ - fi - - mv $NTP_CONF $NTP_CONF~ - grep -vi "^server.*$1" < $NTP_CONF~ > $NTP_CONF - echo "server $@" >> $NTP_CONF - ;; - force-reload) - # Does not support signalling to reload - $0 try-restart - rc_status - ;; - readd) - reloaddevices - adddhcpserver - # manage adding server at runtime - grep "^server" $NTP_CONF | grep -v "127\.0\.0\.1" | sed -e "s/\n//" | sed -e "s/^server//" | sed -e "s/#.*$//" | while read SERV - do - # do we get the option iburst? - if [ -z $2 ]; then - true - else - case $2 in - iburst) - SERV="$SERV iburst" - ;; - *) echo "Unknown option $2" - echo "options: {iburst}" - exit 1 ;; - esac - fi - - add_runtime_server $SERV - done - rc_status - ;; - ntptimeset) - 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)" - # Does not support signalling to reload - rc_failed 3 - rc_status -v - ;; - status) - checkproc -p ${NTPD_PID} $NTPD_BIN - if( test $? -eq 0 ) - then - ntpq -p - echo "" - fi - echo -n "Checking for network time protocol daemon (NTPD): " - checkproc -p ${NTPD_PID} $NTPD_BIN - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|try-restart-iburst|force-reload|reload|addserver|ntptimeset|readd}" - exit 1 - ;; + start) + 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? + parse_symlink + # do we run chrooted? + test "${NTPD_RUN_CHROOTED}" = "yes" && prepare_chroot + + startproc $NTPD_BIN -p ${NTPD_PID_NOPREFIX} $NTPD_OPTIONS -c $NTP_CONF + + if [ -n "${NTP_KEYS}" ]; then + runtime_configuration + fi + + rc_status -v + ;; + stop) + echo -n "Shutting down network time protocol daemon (NTPD)" + killproc -p ${NTPD_PID} -TERM $NTPD_BIN + umount ${CHROOT_PREFIX}/proc 2>/dev/null + rc_status -v + rm -f ${NTPD_PID} + ;; + try-restart) + $0 status + if test $? = 0; then + $0 restart $2 + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + restart) + $0 stop + $0 start $2 + rc_status + ;; + try-restart-iburst) + $0 status + if test $? = 0; then + $0 stop + $0 start iburst + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + addserver) + if [ -n "${NTP_KEYS}" ]; then + echo -n "Runtime configuration disabled, no key file specified." + rc_failed 3 + exit 1 + fi + + if test "${#@}" -lt "2"; then + echo -n "No servers to add specified" + rc_failed 3 + fi + shift + + $0 status 2>&1 >/dev/null + if test $? = 0; + then + add_runtime_server $@ + fi + ;; + force-reload) + # Does not support signalling to reload + $0 try-restart + rc_status + ;; + ntptimeset) + 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)" + # Does not support signalling to reload + rc_failed 3 + rc_status -v + ;; + status) + checkproc -p ${NTPD_PID} $NTPD_BIN + if test $? -eq 0; then + ntpq -p + echo "" + fi + echo -n "Checking for network time protocol daemon (NTPD): " + checkproc -p ${NTPD_PID} $NTPD_BIN + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|try-restart-iburst|force-reload|reload|addserver|ntptimeset}" + exit 1 + ;; esac rc_exit ++++++ conf.sysconfig.ntp ++++++ --- ntp/conf.sysconfig.ntp 2008-01-22 14:22:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/conf.sysconfig.ntp 2008-03-25 11:04:49.000000000 +0100 @@ -12,7 +12,6 @@ # NTPD_ADJUST_CMOS_CLOCK="no" - ## Type: string ## Default: "-g -u ntp:ntp" # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org