packages: rsyslog5/rsyslog.conf, rsyslog5/rsyslog.init, rsyslog5/rsyslog.lo...
amateja
amateja at pld-linux.org
Fri Sep 25 08:21:39 CEST 2009
Author: amateja Date: Fri Sep 25 06:21:39 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- reverted
---- Files affected:
packages/rsyslog5:
rsyslog.conf (1.2 -> 1.3) , rsyslog.init (1.2 -> 1.3) , rsyslog.logrotate (1.2 -> 1.3) , rsyslog.sysconfig (1.2 -> 1.3) , rsyslog5.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/rsyslog5/rsyslog.conf
diff -u /dev/null packages/rsyslog5/rsyslog.conf:1.3
--- /dev/null Fri Sep 25 08:21:39 2009
+++ packages/rsyslog5/rsyslog.conf Fri Sep 25 08:21:33 2009
@@ -0,0 +1,41 @@
+#rsyslog v3 config file
+
+# provides support for local system logging (e.g. via logger command)
+$ModLoad imuxsock.so
+# provides kernel logging support (previously done by rklogd)
+$ModLoad imklog.so
+
+# provides --MARK-- message capability
+#$ModLoad immark.so
+# provides UDP syslog reception
+#$ModLoad imudp.so
+# provides TCP syslog reception and GSS-API (if compiled to support it)
+#$ModLoad imtcp.so
+
+
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.* /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none /var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.* /var/log/secure
+
+# Log all the mail messages in one place.
+mail.* -/var/log/maillog
+
+
+# Log cron stuff
+cron.* /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg *
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit /var/log/spooler
+
+# Save boot messages also to boot.log
+local7.* /var/log/boot.log
================================================================
Index: packages/rsyslog5/rsyslog.init
diff -u /dev/null packages/rsyslog5/rsyslog.init:1.3
--- /dev/null Fri Sep 25 08:21:39 2009
+++ packages/rsyslog5/rsyslog.init Fri Sep 25 08:21:33 2009
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# rsyslog Starts rsyslogd/rklogd.
+#
+#
+# chkconfig: - 12 88
+# description: Syslog is the facility by which many daemons use to log \
+# messages to various system log files. It is a good idea to always \
+# run rsyslog.
+# processname: rsyslogd
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+SYSLOGD_OPTIONS=
+
+# Source config
+if [ -f /etc/sysconfig/rsyslog ] ; then
+ . /etc/sysconfig/rsyslog
+fi
+
+start() {
+ if [ ! -f /var/lock/subsys/rsyslog ]; then
+ umask 077
+ msg_starting rsyslogd
+ daemon rsyslogd $SYSLOGD_OPTIONS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog
+ else
+ msg_already_running rsyslogd
+ fi
+}
+
+stop() {
+ if [ -f /var/lock/subsys/rsyslog ]; then
+ msg_stopping rsyslogd
+ killproc rsyslogd
+ rm -f /var/lock/subsys/rsyslog
+ else
+ msg_not_running rsyslogd
+ fi
+}
+
+reload() {
+ if [ -f /var/lock/subsys/rsyslog ]; then
+ msg_reloading rsyslogd
+ killproc --pidfile /var/run/syslogd.pid rsyslogd -HUP
+ RETVAL=$?
+ else
+ msg_not_running rsyslogd
+ RETVAL=7
+ fi
+}
+
+condrestart() {
+ if [ -f /var/lock/subsys/rsyslog ]; then
+ stop
+ start
+ else
+ msg_not_running rsyslogd
+ RETVAL=$1
+ fi
+}
+
+RETVAL=0
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ try-restart)
+ condrestart 0
+ ;;
+ reload|force-reload)
+ reload
+ ;;
+ status)
+ status rsyslogd
+ ;;
+ *)
+ msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
+ exit 3
+esac
+
+exit $RETVAL
================================================================
Index: packages/rsyslog5/rsyslog.logrotate
diff -u /dev/null packages/rsyslog5/rsyslog.logrotate:1.3
--- /dev/null Fri Sep 25 08:21:39 2009
+++ packages/rsyslog5/rsyslog.logrotate Fri Sep 25 08:21:33 2009
@@ -0,0 +1,12 @@
+/var/log/messages
+/var/log/secure
+/var/log/maillog
+/var/log/spooler
+/var/log/boot.log
+/var/log/cron
+{
+ sharedscripts
+ postrotate
+ /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+ endscript
+}
================================================================
Index: packages/rsyslog5/rsyslog.sysconfig
diff -u /dev/null packages/rsyslog5/rsyslog.sysconfig:1.3
--- /dev/null Fri Sep 25 08:21:39 2009
+++ packages/rsyslog5/rsyslog.sysconfig Fri Sep 25 08:21:33 2009
@@ -0,0 +1,5 @@
+# Options to syslogd
+# syslogd options are deprecated in rsyslog v3
+# if you want to use them, switch to compatibility mode 2 by "-c 2"
+SYSLOGD_OPTIONS="-c3 -f/etc/rsyslog.d/rsyslog.conf"
+
================================================================
Index: packages/rsyslog5/rsyslog5.spec
diff -u /dev/null packages/rsyslog5/rsyslog5.spec:1.6
--- /dev/null Fri Sep 25 08:21:39 2009
+++ packages/rsyslog5/rsyslog5.spec Fri Sep 25 08:21:33 2009
@@ -0,0 +1,324 @@
+# Conditional build:
+%bcond_without gssapi # GSSAPI Kerberos 5 support
+%bcond_without mysql # MySQL database support
+%bcond_without pgsql # PostgreSQL database support
+%bcond_without snmp # SNMP support
+#
+%define _nm rsyslog
+Summary: Linux system and kernel logger
+Summary(de.UTF-8): Linux-System- und Kerner-Logger
+Summary(es.UTF-8): Registrador de log del sistema linux
+Summary(fr.UTF-8): Le système Linux et le logger du noyau
+Summary(pl.UTF-8): Programy logujące zdarzenia w systemie i jądrze Linuksa
+Summary(pt_BR.UTF-8): Registrador de log do sistema linux
+Summary(tr.UTF-8): Linux sistem ve çekirdek kayıt süreci
+Name: rsyslog5
+Version: 5.3.0
+Release: 1
+License: GPL v3
+Group: Daemons
+Source0: http://download.rsyslog.com/rsyslog/%{_nm}-%{version}.tar.gz
+# Source0-md5: b7e2014886d2af8622bd87b95627c551
+Source1: %{_nm}.init
+Source2: %{_nm}.conf
+Source3: %{_nm}.sysconfig
+Source4: %{_nm}.logrotate
+URL: http://www.rsyslog.com/
+%{?with_gssapi:BuildRequires: heimdal-devel}
+%{?with_mysql:BuildRequires: mysql-devel}
+%{?with_snmp:BuildRequires: net-snmp-devel}
+%{?with_pgsql:BuildRequires: postgresql-devel}
+Requires(post): fileutils
+Requires(post,preun): /sbin/chkconfig
+Requires(post,preun): rc-scripts >= 0.2.0
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/lib/rpm/user_group.sh
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/usermod
+Requires(triggerpostun): sed >= 4.0
+# for vservers we don't need klogd and syslog works without klogd
+# (just it doesn't log kernel buffer into syslog)
+# Requires: klogd
+Requires: logrotate >= 3.2-3
+Requires: psmisc >= 20.1
+Provides: group(syslog)
+Provides: syslogdaemon
+Provides: user(syslog)
+Obsoletes: msyslog
+Obsoletes: sysklogd
+Obsoletes: syslog-ng
+Obsoletes: rsyslog
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Rsyslog is an enhanced multi-threaded syslogd supporting, among
+others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering
+on any message part, and fine grain output format control. It is quite
+compatible to stock sysklogd and can be used as a drop-in replacement.
+Its advanced features make it suitable for enterprise-class,
+encryption protected syslog relay chains while at the same time being
+very easy to setup for the novice user.
+
+%description -l pl.UTF-8
+rsyslog to zaawansowany, wielowątkowy syslogd obsługujący m.in.
+MySQL-a, syslog/tcp, RFC 3195, listy dopuszczalnych nadawców,
+filtrowanie po częściach komunikatów i szczegółową kontrolę formatu
+wyjściowego. Jest w miarę kompatybilny ze zwykłym sysklogd i może być
+używany jako jego zamiennik. Jego zaawansowane możliwości czynią go
+odpowiednim do produkcyjnych, szyfrowanych łańcuchów przekazywania
+logów, a jednocześnie jest przy tym łatwy do skonfigurowania dla
+początkującego użytkownika.
+
+%package klogd
+Summary: Linux kernel logger
+Summary(de.UTF-8): Linux-Kerner-Logger
+Summary(pl.UTF-8): Program logujący zdarzenia w jądrze Linuksa
+Group: Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires(post,preun): rc-scripts >= 0.2.0
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/lib/rpm/user_group.sh
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/usermod
+Provides: group(syslog)
+Provides: user(syslog)
+Obsoletes: sysklogd
+
+%description klogd
+This is the Linux kernel logging program. It is run as a daemon
+(background process) to log messages from kernel.
+
+%description klogd -l pl.UTF-8
+Pakiet ten zawiera program, który jest uruchamiany jako demon i służy
+do logowania komunikatów jądra Linuksa.
+
+%package mysql
+Summary: MySQL support for rsyslog
+Summary(pl.UTF-8): Obsługa MySQL-a do rsysloga
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description mysql
+The rsyslog-mysql package contains a dynamic shared object that will
+add MySQL database support to rsyslog.
+
+%description mysql -l pl.UTF-8
+Pakiet rsyslog-mysql zawiera moduł dynamiczny dodający obsługę bazy
+danych MySQL do rsysloga.
+
+%package pgsql
+Summary: PostgresSQL support for rsyslog
+Summary(pl.UTF-8): Obsługa PostgreSQL-a dla rsysloga
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description pgsql
+The rsyslog-pgsql package contains a dynamic shared object that will
+add PostgreSQL database support to rsyslog.
+
+%description pgsql -l pl.UTF-8
+Pakiet rsyslog-pgsql zawiera moduł dynamiczny dodający obsługę bazy
+danych PostgreSQL do rsysloga.
+
+%package gssapi
+Summary: GSSAPI authentication and encryption support for rsyslog
+Summary(pl.UTF-8): Obsługa uwierzytelniania GSSAPI i szyfrowania dla rsysloga
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description gssapi
+The rsyslog-gssapi package contains the rsyslog plugins which support
+GSSAPI authentication and secure connections. GSSAPI is commonly used
+for Kerberos authentication.
+
+%description gssapi -l pl.UTF-8
+Pakiet rsyslog-gssapi zawiera wtyczki rsysloga obsługujące
+uwierzytelnianie GSSAPI i bezpieczne połączenia. GSSAPI jest
+powszechnie używane do uwierzytelniania Kerberos.
+
+%prep
+%setup -q -n %{_nm}-%{version}
+
+%build
+%configure \
+ %{?with_gssapi:--enable-gssapi-krb5} \
+ %{?with_mysql:--enable-mysql} \
+ %{?with_pgsql:--enable-pgsql} \
+ %{?with_snmp:--enable-snmp}
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d,rsyslog.d} \
+ $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_bindir}} \
+ $RPM_BUILD_ROOT/{dev,var/log}
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyslog
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d/rsyslog.conf
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
+
+for n in debug kernel maillog messages secure syslog user spooler lpr daemon
+do
+ > $RPM_BUILD_ROOT/var/log/$n
+done
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/rsyslog/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre
+%groupadd -P syslog -g 18 syslog
+%useradd -P syslog -u 18 -g syslog -c "Syslog User" syslog
+%addusertogroup syslog logs
+
+%post
+for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,secure,spooler,syslog,user}; do
+ if [ -f $n ]; then
+ chown syslog:syslog $n
+ continue
+ else
+ touch $n
+ chmod 000 $n
+ chown syslog:syslog $n
+ chmod 640 $n
+ fi
+done
+
+/sbin/chkconfig --add %{_nm}
+%service rsyslog restart "%{_nm} daemon"
+%service -q %{_nm}-klogd restart
+
+%preun
+if [ "$1" = "0" ]; then
+ %service %{_nm} stop
+ /sbin/chkconfig --del %{_nm}
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+ %userremove syslog
+ %groupremove syslog
+fi
+
+%pre klogd
+%groupadd -P klogd -g 18 syslog
+%useradd -P klogd -u 18 -g syslog -c "Syslog User" syslog
+%addusertogroup syslog logs
+
+%post klogd
+/sbin/chkconfig --add %{_nm}-klogd
+%service %{_nm}-klogd restart "kernel logger daemon"
+
+%preun klogd
+if [ "$1" = "0" ]; then
+ %service %{_nm}-klogd stop
+ /sbin/chkconfig --del %{_nm}-klogd
+fi
+
+%postun klogd
+if [ "$1" = "0" ]; then
+ %userremove syslog
+ %groupremove syslog
+fi
+
+%triggerpostun -- inetutils-syslogd
+/sbin/chkconfig --del syslog
+/sbin/chkconfig --add syslog
+if [ -f /etc/syslog.conf.rpmsave ]; then
+ mv -f /etc/syslog.conf{,.rpmnew}
+ mv -f /etc/syslog.conf{.rpmsave,}
+ echo "Moved /etc/syslog.conf.rpmsave to /etc/syslog.conf"
+ echo "Original file from package is available as /etc/syslog.conf.rpmnew"
+fi
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
+%dir %{_sysconfdir}/rsyslog.d
+%attr(640,root,syslog) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyslog.d/rsyslog.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rsyslog
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyslog
+%attr(754,root,root) /etc/rc.d/init.d/rsyslog
+%attr(640,root,root) %ghost /var/log/*
+%attr(755,root,root) %{_sbindir}/rsyslogd
+%dir %{_libdir}/rsyslog
+%attr(755,root,root) %{_libdir}/rsyslog/omsnmp.so
+%attr(755,root,root) %{_libdir}/rsyslog/imklog.so
+%attr(755,root,root) %{_libdir}/rsyslog/immark.so
+%attr(755,root,root) %{_libdir}/rsyslog/imtcp.so
+%attr(755,root,root) %{_libdir}/rsyslog/imudp.so
+%attr(755,root,root) %{_libdir}/rsyslog/imuxsock.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmgssutil.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmnet.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmnetstrms.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmnsd_ptcp.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmregexp.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmstrmsrv.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmtcpclt.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmtcpsrv.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmzlibw.so
+%attr(755,root,root) %{_libdir}/rsyslog/omtesting.so
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+
+#%files klogd
+#%defattr(644,root,root,755)
+#%attr(754,root,root) /etc/rc.d/init.d/klogd
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/klogd
+#%attr(755,root,root) %{_sbindir}/klogd
+
+%if %{with mysql}
+%files mysql
+%defattr(644,root,root,755)
+%doc plugins/ommysql/createDB.sql
+%attr(755,root,root) %{_libdir}/rsyslog/ommysql.so
+%endif
+
+%if %{with pgsql}
+%files pgsql
+%defattr(644,root,root,755)
+%doc plugins/ompgsql/createDB.sql
+%attr(755,root,root) %{_libdir}/rsyslog/ompgsql.so
+%endif
+
+%if %{with gssapi}
+%files gssapi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/rsyslog/imgssapi.so
+%attr(755,root,root) %{_libdir}/rsyslog/omgssapi.so
+%endif
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.6 2009/09/25 06:21:33 amateja
+- reverted
+
+Revision 1.4 2009/09/24 11:45:18 amateja
+- updated to 5.3.0
+
+Revision 1.3 2009/09/14 06:22:45 amateja
+- updated to 5.1.5
+
+Revision 1.2 2009/08/24 06:35:23 amateja
+- truncated changelog, thx glen
+
+Revision 1.1 2009/08/22 09:17:55 amateja
+- initial
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog5/rsyslog.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog5/rsyslog.init?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog5/rsyslog.logrotate?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog5/rsyslog.sysconfig?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog5/rsyslog5.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list