Hello community, here is the log from the commit of package syslogd checked in at Thu May 17 11:59:09 CEST 2007. -------- --- syslogd/syslogd.changes 2007-01-09 13:43:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2007-05-14 13:36:45.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 14 13:36:34 CEST 2007 - mt@suse.de + +- Bug #256671: Changed default value of SYSLOG_DAEMON variable in + /etc/sysconfig/syslog to "" (autodetect), adopted description. + Added check to init scripts, that sets SYSLOG_DAEMON variable + to one of the currently installed daemons in case it is empty + or not up-to-date. Added reset of the variable in rpm postun. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.ZSd559/_old 2007-05-17 11:58:43.000000000 +0200 +++ /var/tmp/diff_new_pack.ZSd559/_new 2007-05-17 11:58:43.000000000 +0200 @@ -19,7 +19,7 @@ Provides: syslog Autoreqprov: on Version: 1.4.1 -Release: 591 +Release: 605 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -182,6 +182,14 @@ %postun %restart_on_update syslog %{insserv_cleanup} +# reset SYSLOG_DAEMON variable +if test -f etc/sysconfig/syslog ; then + source etc/sysconfig/syslog + if test "$SYSLOG_DAEMON" == "syslogd" ; then + sed -i -e 's/^SYSLOG_DAEMON=.*/SYSLOG_DAEMON=""/g' \ + etc/sysconfig/syslog + fi +fi %preun -n klogd %stop_on_removal syslog @@ -211,7 +219,13 @@ %dir %{omc_svcdir}/ %{omc_svcdir}/syslog.xml -%changelog -n syslogd +%changelog +* Mon May 14 2007 - mt@suse.de +- Bug #256671: Changed default value of SYSLOG_DAEMON variable in + /etc/sysconfig/syslog to "" (autodetect), adopted description. + Added check to init scripts, that sets SYSLOG_DAEMON variable + to one of the currently installed daemons in case it is empty + or not up-to-date. Added reset of the variable in rpm postun. * Tue Jan 09 2007 - mt@suse.de - Changed to install syslog.xml to /usr/share/omc/svcinfo.d, fate #301833. ++++++ rc.earlysyslog ++++++ --- syslogd/rc.earlysyslog 2006-07-11 16:45:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslogd/rc.earlysyslog 2007-04-26 16:34:28.000000000 +0200 @@ -21,6 +21,15 @@ BINDIR=/sbin +# update $SYSLOG_DAEMON if not up-to-date +test -n "$SYSLOG_DAEMON" && \ +test -x "${BINDIR}/$SYSLOG_DAEMON" || { + for SYSLOG_DAEMON in syslog-ng syslogd ; do + test -x "${BINDIR}/$SYSLOG_DAEMON" && break + done +} + +# set daemon dependent variables case "$SYSLOG_DAEMON" in syslog-ng) syslog=syslog-ng ++++++ rc.syslog ++++++ --- syslogd/rc.syslog 2007-01-04 18:02:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslogd/rc.syslog 2007-04-26 16:34:32.000000000 +0200 @@ -22,6 +22,15 @@ BINDIR=/sbin +# update $SYSLOG_DAEMON if not up-to-date +test -n "$SYSLOG_DAEMON" && \ +test -x "${BINDIR}/$SYSLOG_DAEMON" || { + for SYSLOG_DAEMON in syslog-ng syslogd ; do + test -x "${BINDIR}/$SYSLOG_DAEMON" && break + done +} + +# set daemon dependent variables case "$SYSLOG_DAEMON" in syslog-ng) syslog=syslog-ng ++++++ sysconfig.syslog ++++++ --- syslogd/sysconfig.syslog 2005-01-25 01:56:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslogd/sysconfig.syslog 2007-04-27 13:03:28.000000000 +0200 @@ -29,13 +29,12 @@ # KLOGD_PARAMS="-x" -## Type: list(syslogd,syslog-ng) -## Default: syslogd -## Config: syslog-ng -## Command: /sbin/rcsyslog restart -## PreSaveCommand: /sbin/rcsyslog status && /sbin/rcsyslog stop +## Type: list(syslogd,syslog-ng,"") +## Default: "" +## Config: "" +## ServiceRestart: syslog # -# The name of the syslog daemon used as -# syslog service: "syslogd", "syslog-ng" +# The name of the syslog daemon to use as syslog service: +# "syslogd", "syslog-ng" or "" for autodetect. # -SYSLOG_DAEMON="syslogd" +SYSLOG_DAEMON="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org