rpms/rsyslog/devel rsyslog-3.11.4-undef.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 rsyslog.spec, 1.27, 1.28 sources, 1.17, 1.18
Peter Vrabec (pvrabec)
fedora-extras-commits at redhat.com
Fri Mar 7 11:13:17 UTC 2008
Author: pvrabec
Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19527
Modified Files:
.cvsignore rsyslog.spec sources
Added Files:
rsyslog-3.11.4-undef.patch
Log Message:
move to rsyslog v3
rsyslog-3.11.4-undef.patch:
--- NEW FILE rsyslog-3.11.4-undef.patch ---
diff -up rsyslog-3.11.0/plugins/imklog/imklog.h.undef rsyslog-3.11.0/plugins/imklog/imklog.h
--- rsyslog-3.11.0/plugins/imklog/imklog.h.undef 2008-02-01 12:42:18.000000000 +0100
+++ rsyslog-3.11.0/plugins/imklog/imklog.h 2008-02-01 12:43:33.000000000 +0100
@@ -28,6 +28,9 @@
#include "rsyslog.h"
#include "syslogd.h"
+#undef syslog
+#undef vsyslog
+
/* global variables */
extern int dbgPrintSymbols;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 13 Feb 2008 16:56:20 -0000 1.17
+++ .cvsignore 7 Mar 2008 11:12:39 -0000 1.18
@@ -1,3 +1,4 @@
-rsyslog-2.0.2.tar.gz
+rsyslog-3.12.1.tar.gz
+rsyslog.conf
rsyslog.init
rsyslog.sysconfig
Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rsyslog.spec 18 Feb 2008 12:31:54 -0000 1.27
+++ rsyslog.spec 7 Mar 2008 11:12:39 -0000 1.28
@@ -2,27 +2,28 @@
Summary: Enhanced system logging and kernel message trapping daemons
Name: rsyslog
-Version: 2.0.2
-Release: 2%{?dist}
-License: GPLv2+
+Version: 3.12.1
+Release: 1%{?dist}
+License: GPLv3+
Group: System Environment/Daemons
URL: http://www.rsyslog.com/
Source0: http://download.rsyslog.com/rsyslog/%{name}-%{version}.tar.gz
Source1: rsyslog.init
-Source2: rsyslog.sysconfig
+Source2: rsyslog.conf
+Source3: rsyslog.sysconfig
+Patch1: rsyslog-3.11.4-undef.patch
BuildRequires: zlib-devel
-BuildRequires: autoconf automake libtool
+BuildRequires: autoconf automake
Requires: logrotate >= 3.5.2
Requires: bash >= 2.0
Requires(post): /sbin/chkconfig coreutils
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): /sbin/service
Provides: syslog
-Provides: sysklogd = 1.4.3-1
-Obsoletes: sysklogd < 1.4.3-1
-Conflicts: syslog-ng
+Conflicts: sysklogd < 1.4.1-43
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
%package mysql
Summary: MySQL support for rsyslog
Group: System Environment/Daemons
@@ -35,6 +36,12 @@
Requires: %name = %version-%release
BuildRequires: postgresql-devel
+%package gssapi
+Summary: GSSAPI authentication and encryption support for rsyslog
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: krb5-devel
+
%description
Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL,
syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part,
@@ -52,11 +59,17 @@
The rsyslog-pgsql package contains a dynamic shared object that will add
PostgreSQL database support to rsyslog.
+%description gssapi
+The rsyslog-gssapi package contains the rsyslog plugins which support GSSAPI
+authentication and secure connections. GSSAPI is commonly used for Kerberos
+authentication.
+
%prep
%setup -q
+%patch1 -p1 -b .undef
%build
-%configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql
+%configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql --enable-gssapi-krb5
make %{?_smp_mflags}
%install
@@ -67,10 +80,11 @@
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog
-install -p -m 644 redhat/rsyslog.conf $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
-install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rsyslog
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyslog
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rsyslog
+install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
#get rid of *.la
rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la
@@ -79,23 +93,12 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ $1 = 1 ]; then
- /sbin/chkconfig --add rsyslog
-fi
+/sbin/chkconfig --add rsyslog
for n in /var/log/{messages,secure,maillog,spooler}
do
[ -f $n ] && continue
umask 066 && touch $n
done
-#use sysklogd configuration files
-if [ -f /etc/syslog.conf ]; then
- mv -f /etc/rsyslog.conf /etc/rsyslog.conf.rpmnew
- mv -f /etc/syslog.conf /etc/rsyslog.conf
-fi
-if [ -f /etc/sysconfig/syslog ]; then
- mv -f /etc/sysconfig/rsyslog /etc/sysconfig/rsyslog.rpmnew
- mv -f /etc/sysconfig/syslog /etc/sysconfig/rsyslog
-fi
%preun
if [ $1 = 0 ]; then
@@ -108,15 +111,25 @@
service rsyslog condrestart > /dev/null 2>&1 ||:
fi
+%triggerun -- rsyslog < 3.0.0
+/bin/kill `cat /var/run/rklogd.pid 2> /dev/null` > /dev/null 2>&1 ||:
+
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README doc/*html
-%config(noreplace) %{_sysconfdir}/rsyslog.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
-%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
+%doc AUTHORS COPYING NEWS README doc/*html
+%dir %{_libdir}/rsyslog
+%{_libdir}/rsyslog/imklog.so
+%{_libdir}/rsyslog/immark.so
+%{_libdir}/rsyslog/imtcp.so
+%{_libdir}/rsyslog/tcpsrv.so
+%{_libdir}/rsyslog/imudp.so
+%{_libdir}/rsyslog/imuxsock.so
+%{_libdir}/rsyslog/omtesting.so
+%config %{_sysconfdir}/rsyslog.conf
+%config %{_sysconfdir}/sysconfig/rsyslog
+%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_initrddir}/rsyslog
%{sbindir}/rsyslogd
-%{sbindir}/rklogd
%{sbindir}/rfc3195d
%{_mandir}/*/*
@@ -130,23 +143,49 @@
%doc plugins/ompgsql/createDB.sql
%{_libdir}/rsyslog/ompgsql.so
+%files gssapi
+%defattr(-,root,root)
+%{_libdir}/rsyslog/gssutil.so
+%{_libdir}/rsyslog/imgssapi.so
+%{_libdir}/rsyslog/omgssapi.so
+
%changelog
-* Mon Feb 18 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.2-2
-- include createDB.sql in PostgresSQL plugin
+* Thu Mar 06 2008 Peter Vrabec <pvrabec at redhat.com> 3.12.1-1
+- upgrade
-* Wed Feb 13 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.2-1
-- new upstream release
+* Wed Mar 05 2008 Peter Vrabec <pvrabec at redhat.com> 3.12.0-1
+- upgrade
+
+* Mon Feb 25 2008 Peter Vrabec <pvrabec at redhat.com> 3.11.5-1
+- upgrade
+
+* Fri Feb 01 2008 Peter Vrabec <pvrabec at redhat.com> 3.11.0-1
+- upgrade to the latests development release
- provide PostgresSQL support
+- provide GSSAPI support
-* Mon Feb 11 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-3
-- fix documentation problems
+* Mon Jan 21 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-7
+- change from requires sysklogd to conflicts sysklogd
-* Tue Jan 22 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-2
-- strerror fix (#428775)
+* Fri Jan 18 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-6
+- change logrotate file
+- use rsyslog own pid file
-* Thu Jan 17 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-1
-- upgrade
-- fixing bad file descriptor (#428775)
+* Thu Jan 17 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-5
+- fixing bad descriptor (#428775)
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-4
+- rename logrotate file
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-3
+- fix post script and init file
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-2
+- change pid filename and use logrotata script from sysklogd
+
+* Tue Jan 15 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-1
+- upgrade to stable release
+- spec file clean up
* Wed Jan 02 2008 Peter Vrabec <pvrabec at redhat.com> 1.21.2-1
- new upstream release
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 13 Feb 2008 16:56:20 -0000 1.17
+++ sources 7 Mar 2008 11:12:39 -0000 1.18
@@ -1,3 +1,4 @@
-7e214ddb80544e99dac643f1d93c81fb rsyslog-2.0.2.tar.gz
-fe8fcd90c672701fa198dd1206df64ae rsyslog.init
-e10d2dc3238c2cf2a54933f10b19b9bf rsyslog.sysconfig
+12c743b21a0984467bc4c05b6ee887e2 rsyslog-3.12.1.tar.gz
+9730674162e08bcc88503a19e21ac2d4 rsyslog.conf
+04ea4165e7289f009b189968e49b9c81 rsyslog.init
+04f3868aa518d33809f5943d7bc2fc0b rsyslog.sysconfig
More information about the fedora-extras-commits
mailing list