Hello community,
here is the log from the commit of package syslogd
checked in at Sat Sep 13 12:19:17 CEST 2008.
--------
--- syslogd/syslogd.changes 2008-08-22 15:24:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2008-09-03 14:41:00.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 3 14:29:46 CEST 2008 - mt@suse.de
+
+- Added log files used by syslog-ng (and rsyslog) daemons to the
+ /etc/logrotate.d/syslog file. Added logrotate to klogd requires.
+- Added rsyslog support to the /etc/init.d/syslog and earlysyslog
+ init scripts.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslogd.spec ++++++
--- /var/tmp/diff_new_pack.yM5261/_old 2008-09-13 12:18:56.000000000 +0200
+++ /var/tmp/diff_new_pack.yM5261/_new 2008-09-13 12:18:56.000000000 +0200
@@ -27,7 +27,7 @@
Provides: syslog
AutoReqProv: on
Version: 1.4.1
-Release: 696
+Release: 704
Summary: The Syslog daemon
Source: sysklogd-1.4.1.tar.bz2
Source1: logrotate.syslog
@@ -81,7 +81,7 @@
PreReq: %insserv_prereq %fillup_prereq
Provides: sysklogd
Provides: syslogd:/sbin/klogd
-Requires: /etc/init.d/network
+Requires: /etc/init.d/network logrotate
Summary: The kernel log daemon
Group: System/Daemons
@@ -238,6 +238,11 @@
%{omc_svcdir}/syslog.xml
%changelog
+* Wed Sep 03 2008 mt@suse.de
+- Added log files used by syslog-ng (and rsyslog) daemons to the
+ /etc/logrotate.d/syslog file. Added logrotate to klogd requires.
+- Added rsyslog support to the /etc/init.d/syslog and earlysyslog
+ init scripts.
* Fri Aug 22 2008 ro@suse.de
- remove deprecated options from fillup_and_insserv call
* Wed Aug 13 2008 werner@suse.de
++++++ logrotate.syslog ++++++
--- syslogd/logrotate.syslog 2006-02-15 13:58:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/syslogd/logrotate.syslog 2008-09-03 14:27:42.000000000 +0200
@@ -1,11 +1,15 @@
#
# Please note, that changing of log file permissions in this
# file is not sufficient if syslog-ng is used as log daemon.
+#
# It is required to specify the permissions in the syslog-ng
-# configuration /etc/syslog-ng/syslog-ng.conf.in as well.
+# configuration file /etc/syslog-ng/syslog-ng.conf as well.
#
-/var/log/warn /var/log/messages /var/log/allmessages /var/log/localmessages /var/log/firewall {
+# the firewall,acpid,NetworkManager log files
+# are used by syslog-ng and rsyslog only, the
+# other by all syslog daemons.
+/var/log/warn /var/log/messages /var/log/allmessages /var/log/localmessages /var/log/firewall /var/log/acpid /var/log/NetworkManager {
compress
dateext
maxage 365
@@ -20,6 +24,7 @@
endscript
}
+# used by all syslog daemons
/var/log/mail /var/log/mail.info /var/log/mail.warn /var/log/mail.err {
compress
dateext
@@ -35,6 +40,7 @@
endscript
}
+# used by all syslog daemons
/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
compress
dateext
++++++ rc.earlysyslog ++++++
--- syslogd/rc.earlysyslog 2007-04-26 16:34:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslogd/rc.earlysyslog 2008-09-03 14:51:36.000000000 +0200
@@ -2,9 +2,12 @@
#
# Copyright (c) 1996-2001 SuSE GmbH Nuernberg, Germany.
# Copyright (c) 2002-2003 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2004-2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# Author: Florian La Roche , 1996
-# Werner Fink , 1998-2001
+# Werner Fink , 1998-2008
+# Stephan Kulow , 2005-2008
+# Marius Tomaschewski , 2001-2008
#
# /etc/init.d/syslog
#
@@ -24,13 +27,17 @@
# 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
+ for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
test -x "${BINDIR}/$SYSLOG_DAEMON" && break
done
}
# set daemon dependent variables
case "$SYSLOG_DAEMON" in
+ rsyslogd)
+ syslog=rsyslogd
+ config=/etc/rsyslog.early.conf
+ ;;
syslog-ng)
syslog=syslog-ng
config=/etc/syslog-ng/syslog-ng.conf
@@ -68,6 +75,9 @@
done < ${config}
;;
*)
+ # in hope this works with the rsyslog.early.conf file
+ # (hard to implement for rsyslog with its includes/if
+ # statements)...
while read select action ; do
case "$select" in \#*|"") continue ;; esac
case "$action" in *@*) exit 0 ;; esac
++++++ rc.syslog ++++++
--- syslogd/rc.syslog 2008-08-13 11:05:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslogd/rc.syslog 2008-09-04 14:23:23.000000000 +0200
@@ -2,9 +2,12 @@
#
# Copyright (c) 1996-2001 SuSE GmbH Nuernberg, Germany.
# Copyright (c) 2002-2003 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2004-2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# Author: Florian La Roche , 1996
-# Werner Fink , 1998-2001,2008
+# Werner Fink , 1998-2008
+# Stephan Kulow , 2005-2008
+# Marius Tomaschewski , 2001-2008
#
# /etc/init.d/syslog
#
@@ -26,13 +29,33 @@
# 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
+ for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
test -x "${BINDIR}/$SYSLOG_DAEMON" && break
done
}
# set daemon dependent variables
+rsocks=""
+start_klogd=yes
case "$SYSLOG_DAEMON" in
+ rsyslogd)
+ syslog=rsyslogd
+ if test "$2" = "early" ; then
+ config=/etc/rsyslog.early.conf
+ else
+ config=/etc/rsyslog.conf
+ fi
+ params="-c ${RSYSLOGD_COMPAT_VERSION:=3} -f $config $RSYSLOGD_PARAMS"
+ rsocks="/var/run/rsyslog/additional-log-sockets.conf"
+ test -r "$config" && \
+ while read one two rest ; do
+ test "x$one" = 'x$ModLoad' && \
+ test "x$two" = 'ximklog.so' && {
+ start_klogd=no
+ break
+ }
+ done < $config
+ ;;
syslog-ng)
syslog=syslog-ng
config=/etc/syslog-ng/syslog-ng.conf
@@ -44,12 +67,6 @@
params="$SYSLOGD_PARAMS"
;;
esac
-# add additional sockets to params
-for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
- eval value=\$$variable
- test -n "${value}" && test -d ${value%/*} && \
- params="$params -a $value"
-done
syslog_pid="/var/run/${syslog}.pid"
syslog_bin=${BINDIR}/$syslog
@@ -116,6 +133,30 @@
echo -n "Starting syslog services"
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
+ case $syslog in
+ (rsyslogd)
+ if [ "x$rsocks" != x ] ; then
+ rm -f "$rsocks"
+ touch "$rsocks"
+ fi
+ ;;
+ esac
+ # add additional sockets to params or similar
+ for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
+ eval value=\$$variable
+ test -n "${value}" && test -d ${value%/*} && {
+ case $syslog in
+ rsyslogd)
+ if [ "x$rsocks" != x ] ; then
+ echo "\$AddUnixListenSocket $value" >> "$rsocks"
+ fi
+ ;;
+ *)
+ params="$params -a $value"
+ ;;
+ esac
+ }
+ done
startproc -p ${syslog_pid} ${syslog_bin} ${params}
rc_status
@@ -123,8 +164,10 @@
echo ${syslog_bin} > /var/lock/subsys/syslogd
if test $? -eq 0 ; then
- startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
- rc_status
+ if test "$start_klogd" = yes ; then
+ startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
+ rc_status
+ fi
fi
rc_status -v
;;
@@ -133,7 +176,11 @@
test "$2" = "early" && exit 0
echo -n "Shutting down syslog services"
- killproc -TERM ${klog_bin} ; rc_status
+ if test "$start_klogd" = yes ; then
+ killproc -TERM ${klog_bin} ; rc_status
+ else
+ killproc -TERM ${klog_bin}
+ fi
killproc -p ${syslog_use_pid} -TERM ${syslog_use} ; rc_status -v
rm -f /var/lock/subsys/syslogd
;;
@@ -156,20 +203,27 @@
;;
reload|force-reload)
echo -n "Reload syslog service"
- killproc -TSTP ${klog_bin} ; rc_status
- killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status
- killproc -CONT ${klog_bin} ; rc_status
- killproc -USR2 ${klog_bin} ; rc_status -v
+ if test "$start_klogd" = yes ; then
+ killproc -TSTP ${klog_bin} ; rc_status
+ killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status
+ killproc -CONT ${klog_bin} ; rc_status
+ killproc -USR2 ${klog_bin} ; rc_status -v
+ else
+ killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status -v
+ fi
;;
status)
echo -n "Checking for service syslog:"
- checkproc ${klog_bin} ; rc_status
+ if test "$start_klogd" = yes ; then
+ checkproc ${klog_bin} ; rc_status
+ fi
checkproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v
;;
probe)
if test "${syslog_use_pid}" != "${syslog_pid}" ; then
echo restart
else
+ # Note: does not work when an included rsyslog config changed
test ${config} -nt ${syslog_pid} && echo reload
fi
;;
++++++ syslog.8 ++++++
--- syslogd/syslog.8 2008-05-20 17:10:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslog.8 2008-09-04 15:19:33.000000000 +0200
@@ -7,8 +7,9 @@
.SH DESCRIPTION
There are different syslog daemon implementations
supported as the system's syslog service, currently
-.IR syslogd \ and
-.IR syslog-ng .
+.IR syslogd ,
+.IR syslog-ng \ and
+.IR rsyslogd
By default
.IR syslog-ng
is installed and enabled.
@@ -36,3 +37,5 @@
.BR syslog.conf (5)
.BR syslog-ng (8)
.BR syslog-ng.conf (5)
+.BR rsyslogd (8)
+.BR rsyslog.conf (5)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org