From 8261e79c366011d1c0112df83333d76c24e43a33 Mon Sep 17 00:00:00 2001 From: Abby Edwards Date: Tue, 12 Jun 2012 12:21:22 -0500 Subject: added rpm spec files for rhel / centos --- build/rhel/README | 17 + build/rhel/dependencies/czmq.spec | 107 +++++ build/rhel/dependencies/zeromq.spec | 142 ++++++ build/rhel/libee/libee.spec | 90 ++++ build/rhel/libestr/libestr.spec | 56 +++ build/rhel/liblognorm/liblognorm.spec | 70 +++ build/rhel/librelp/librelp.spec | 65 +++ build/rhel/rsyslog/rsyslog.conf | 80 ++++ build/rhel/rsyslog/rsyslog.init | 121 ++++++ build/rhel/rsyslog/rsyslog.log | 8 + build/rhel/rsyslog/rsyslog.spec | 786 ++++++++++++++++++++++++++++++++++ build/rhel/rsyslog/rsyslog.sysconfig | 7 + 12 files changed, 1549 insertions(+) create mode 100644 build/rhel/README create mode 100644 build/rhel/dependencies/czmq.spec create mode 100644 build/rhel/dependencies/zeromq.spec create mode 100644 build/rhel/libee/libee.spec create mode 100644 build/rhel/libestr/libestr.spec create mode 100644 build/rhel/liblognorm/liblognorm.spec create mode 100644 build/rhel/librelp/librelp.spec create mode 100644 build/rhel/rsyslog/rsyslog.conf create mode 100644 build/rhel/rsyslog/rsyslog.init create mode 100644 build/rhel/rsyslog/rsyslog.log create mode 100644 build/rhel/rsyslog/rsyslog.spec create mode 100644 build/rhel/rsyslog/rsyslog.sysconfig diff --git a/build/rhel/README b/build/rhel/README new file mode 100644 index 00000000..4c4ead76 --- /dev/null +++ b/build/rhel/README @@ -0,0 +1,17 @@ +This directory contains a series of spec files to help build rsyslog +and its dependencies on a RHEL 5 or 6 (or compatible variant) system. + +Build order: +(dependencies for rsyslog's mmnormalize) +1. libestr +2. libee +3. liblognorm + +(dependency for rsyslog) +4. librelp + +(external dependencies for zmq modules) +5. zeromq +6. czmq + +7. rsyslog diff --git a/build/rhel/dependencies/czmq.spec b/build/rhel/dependencies/czmq.spec new file mode 100644 index 00000000..9f0ff908 --- /dev/null +++ b/build/rhel/dependencies/czmq.spec @@ -0,0 +1,107 @@ +Name: czmq +Version: 1.2.0 +Release: 1%{?dist} +Summary: High-level C binding for 0MQ (ZeroMQ). + +Group: Development/Libraries +License: LGPL +URL: http://czmq.zeromq.org/ +Source0: %{name}-%{version}.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: zeromq-devel +BuildRequires: xmlto, xmltoman +BuildRequires: asciidoc +Requires: zeromq +Requires(post): /sbin/ldconfig + +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libuuid-devel +Requires: libuuid +%elseif %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: e2fsprogs-devel +Requires: e2fsprogs +%else +BuildRequires: uuid-devel +Requires: uuid +%endif + +%description +%{summary} + +%package devel +Summary: Development bindings for 0MQ (ZeroMQ). +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +Development bindings for 0MQ (ZeroMQ). + +%prep +%setup -q + +%build +export CFLAGS="-Wno-unused-variable" +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644,root,root,0755) +%doc AUTHORS COPYING* INSTALL README NEWS + +%{_mandir}/man7/zloop.7.gz +%{_mandir}/man7/zsockopt.7.gz +%{_mandir}/man7/zhash.7.gz +%{_mandir}/man7/zctx.7.gz +%{_mandir}/man7/zsocket.7.gz +%{_mandir}/man7/zframe.7.gz +%{_mandir}/man7/zfile.7.gz +%{_mandir}/man7/zthread.7.gz +%{_mandir}/man7/czmq.7.gz +%{_mandir}/man7/zstr.7.gz +%{_mandir}/man7/zclock.7.gz +%{_mandir}/man7/zmsg.7.gz +%{_mandir}/man7/zlist.7.gz +%{_libdir}/libczmq.so* +%attr(0755,root,root) %{_bindir}/czmq_selftest + +%files devel +%defattr(0644,root,root,0755) +%{_libdir}/libczmq.la +%{_libdir}/pkgconfig/libczmq.pc +%{_libdir}/libczmq.a +%{_includedir}/zsocket.h +%{_includedir}/czmq.h +%{_includedir}/zstr.h +%{_includedir}/zlist.h +%{_includedir}/zsockopt.h +%{_includedir}/zmsg.h +%{_includedir}/zclock.h +%{_includedir}/zthread.h +%{_includedir}/zloop.h +%{_includedir}/zframe.h +%{_includedir}/czmq_prelude.h +%{_includedir}/zhash.h +%{_includedir}/zctx.h +%{_includedir}/zfile.h + +%changelog + +* Tue Jun 12 2012 Abby Edwards 1.2.0-1 +- updated to 1.2.0, split devel package out +- updated CFLAGS to be compatible with gcc 4+ + +* Thu Sep 29 2011 Lars Kellogg-Stedman - 1.1.0-1 +- initial package build + diff --git a/build/rhel/dependencies/zeromq.spec b/build/rhel/dependencies/zeromq.spec new file mode 100644 index 00000000..d1aa5f4c --- /dev/null +++ b/build/rhel/dependencies/zeromq.spec @@ -0,0 +1,142 @@ +Name: zeromq +Version: 2.2.0 +Release: 1%{?dist} +Summary: The ZeroMQ messaging library +Group: Applications/Internet +License: LGPLv3+ +URL: http://www.zeromq.org/ +Source: http://download.zeromq.org/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: gcc, make, gcc-c++, libstdc++-devel +Requires: libstdc++ + +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libuuid-devel +Requires: libuuid +%elseif %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: e2fsprogs-devel +Requires: e2fsprogs +%else +BuildRequires: uuid-devel +Requires: uuid +%endif + +# Build pgm only on supported archs +%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 +BuildRequires: glib2-devel +Requires: glib2 +%endif + +%description +The 0MQ lightweight messaging kernel is a library which extends the +standard socket interfaces with features traditionally provided by +specialised messaging middleware products. 0MQ sockets provide an +abstraction of asynchronous message queues, multiple messaging +patterns, message filtering (subscriptions), seamless access to +multiple transport protocols and more. + +This package contains the ZeroMQ shared library. + +%package devel +Summary: Development files and static library for the ZeroMQ library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +The 0MQ lightweight messaging kernel is a library which extends the +standard socket interfaces with features traditionally provided by +specialised messaging middleware products. 0MQ sockets provide an +abstraction of asynchronous message queues, multiple messaging +patterns, message filtering (subscriptions), seamless access to +multiple transport protocols and more. + +This package contains ZeroMQ related development libraries and header files. + +%prep +%setup -q + +%build +%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 + %configure --with-pgm +%else + %configure +%endif + +%{__make} %{?_smp_mflags} + +%install +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} + +# Install the package to build area +%{__make} check +%makeinstall + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%clean +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root,-) + +# docs in the main package +%doc AUTHORS ChangeLog COPYING COPYING.LESSER NEWS README + +# libraries +%{_libdir}/libzmq.so.1 +%{_libdir}/libzmq.so.1.0.1 + +%{_mandir}/man7/zmq.7.gz + +%files devel +%defattr(-,root,root,-) +%{_includedir}/zmq.h +%{_includedir}/zmq.hpp +%{_includedir}/zmq_utils.h + +%{_libdir}/libzmq.la +%{_libdir}/libzmq.a +%{_libdir}/pkgconfig/libzmq.pc +%{_libdir}/libzmq.so + +%{_mandir}/man3/zmq_bind.3.gz +%{_mandir}/man3/zmq_close.3.gz +%{_mandir}/man3/zmq_connect.3.gz +%{_mandir}/man3/zmq_errno.3.gz +%{_mandir}/man3/zmq_device.3.gz +%{_mandir}/man3/zmq_getsockopt.3.gz +%{_mandir}/man3/zmq_init.3.gz +%{_mandir}/man3/zmq_msg_close.3.gz +%{_mandir}/man3/zmq_msg_copy.3.gz +%{_mandir}/man3/zmq_msg_data.3.gz +%{_mandir}/man3/zmq_msg_init.3.gz +%{_mandir}/man3/zmq_msg_init_data.3.gz +%{_mandir}/man3/zmq_msg_init_size.3.gz +%{_mandir}/man3/zmq_msg_move.3.gz +%{_mandir}/man3/zmq_msg_size.3.gz +%{_mandir}/man3/zmq_poll.3.gz +%{_mandir}/man3/zmq_recv.3.gz +%{_mandir}/man3/zmq_send.3.gz +%{_mandir}/man3/zmq_setsockopt.3.gz +%{_mandir}/man3/zmq_socket.3.gz +%{_mandir}/man3/zmq_strerror.3.gz +%{_mandir}/man3/zmq_term.3.gz +%{_mandir}/man3/zmq_version.3.gz +%{_mandir}/man7/zmq_cpp.7.gz +%{_mandir}/man7/zmq_epgm.7.gz +%{_mandir}/man7/zmq_inproc.7.gz +%{_mandir}/man7/zmq_ipc.7.gz +%{_mandir}/man7/zmq_pgm.7.gz +%{_mandir}/man7/zmq_tcp.7.gz + +%changelog +* Tue Jun 12 2012 Abby Edwards 2.2.0-1 +- updated version + +* Sat Apr 10 2010 Mikko Koppanen 2.0.7-1 +- Initial packaging diff --git a/build/rhel/libee/libee.spec b/build/rhel/libee/libee.spec new file mode 100644 index 00000000..8bb3a378 --- /dev/null +++ b/build/rhel/libee/libee.spec @@ -0,0 +1,90 @@ +Summary: libee - an event expression library inspired by CEE +Name: libee +Version: 0.4.1 +Release: 1%{?dist} +License: GPL +Group: Networking/Admin +Source: %{name}-%{version}.tar.gz +BuildRoot: /var/tmp/%{name}-build +BuildRequires: libestr-devel +Requires: /sbin/ldconfig + +%description +CEE is an upcoming standard used to describe network events in a number of +normalized formats. It's goal is to unify they currently many different +representations that exist in the industry. + +The core idea of libee is to provide a small but hopefully convenient API layer +above the CEE standard. However, CEE is not finished. At the time of this writing, +CEE is under heavy development and even some of its core data structures (like +the data dictionary and taxonmy) have not been fully specified. + +libee should be thought of as a useful library that helps you get your events +normalized. If you program cleanly to libee, chances are not bad that only +relatively little effort is required to move your app over to be CEE compliant +(once the standard is out). + +%package devel +Summary: include files for libee +Group: Networking/Admin +Requires: %name = %version-%release +Requires: /usr/bin/pkg-config + +%description devel +This package provides include files and pkg-config settings for libee. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%{_libdir}/libee.so +%{_libdir}/libee.so.0 +%{_libdir}/libee.so.0.0.0 + +%files devel +%defattr(644,root,root,755) +%{_libdir}/pkgconfig/libee.pc +%{_includedir}/libee/apache.h +%{_includedir}/libee/ctx.h +%{_includedir}/libee/event.h +%{_includedir}/libee/field.h +%{_includedir}/libee/fieldbucket.h +%{_includedir}/libee/fieldset.h +%{_includedir}/libee/fieldtype.h +%{_includedir}/libee/int.h +%{_includedir}/libee/internal.h +%{_includedir}/libee/libee.h +%{_includedir}/libee/namelist.h +%{_includedir}/libee/obj.h +%{_includedir}/libee/parser.h +%{_includedir}/libee/primitivetype.h +%{_includedir}/libee/tag.h +%{_includedir}/libee/tagbucket.h +%{_includedir}/libee/tagset.h +%{_includedir}/libee/timestamp.h +%{_includedir}/libee/valnode.h +%{_includedir}/libee/value.h +%{_includedir}/libee/valuetype.h +%{_sbindir}/libee-convert +%{_libdir}/libee.a +%{_libdir}/libee.la + +%changelog + +* Tue Jun 12 2012 Abby Edwards 0.4.1-1 +- initial version, used to build latest git master diff --git a/build/rhel/libestr/libestr.spec b/build/rhel/libestr/libestr.spec new file mode 100644 index 00000000..10589d88 --- /dev/null +++ b/build/rhel/libestr/libestr.spec @@ -0,0 +1,56 @@ +Summary: libestr - some essentials for string handling (and a bit more) +Name: libestr +Version: 0.1.2 +Release: 1%{?dist} +License: GPL +Group: Networking/Admin +Source: %{name}-%{version}.tar.gz +BuildRoot: /var/tmp/%{name}-build +Requires: /sbin/ldconfig + +%description +libestr is a string handling library used in rsyslog. + +%package devel +Summary: includes for compilation against libestr +Group: Networking/Admin +Requires: %name = %version-%release +Requires: /usr/bin/pkg-config + +%description devel +This package provides the include files and pkg-config information for +compiling against libestr. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%{_libdir}/libestr.so +%{_libdir}/libestr.so.0 +%{_libdir}/libestr.so.0.0.0 + +%files devel +%defattr(644,root,root,755) +%{_includedir}/libestr.h +%{_libdir}/pkgconfig/libestr.pc +%{_libdir}/libestr.a +%{_libdir}/libestr.la + +%changelog +* Tue Jun 12 2012 Abby Edwards 0.1.2-1 +- initial version, used to build latest git master diff --git a/build/rhel/liblognorm/liblognorm.spec b/build/rhel/liblognorm/liblognorm.spec new file mode 100644 index 00000000..2047525e --- /dev/null +++ b/build/rhel/liblognorm/liblognorm.spec @@ -0,0 +1,70 @@ +Summary: liblognorm - a tool to normalize log data +Name: liblognorm +Version: 0.3.4 +Release: 1%{?dist} +License: GPL +Group: Networking/Admin +Source: %{name}-%{version}.tar.gz +BuildRoot: /var/tmp/%{name}-build +BuildRequires: libestr-devel, libee-devel +Requires: /sbin/ldconfig + +%description +Briefly described, liblognorm is a tool to normalize log data. + +People who need to take a look at logs often have a common problem. Logs from +different machines (from different vendors) usually have different formats for +their logs. Even if it is the same type of log (e.g. from firewalls), the log +entries are so different, that it is pretty hard to read these. This is where +liblognorm comes into the game. With this tool you can normalize all your logs. +All you need is liblognorm and its dependencies and a sample database that fits +the logs you want to normalize. + +%package devel +Summary: includes for compiling against liblognorm +Group: Networking/Admin +Requires: %name = %version-%release +Requires: /usr/bin/pkg-config + +%description devel +This package provides the include and pkg-config files for compiling +against liblognorm. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%{_libdir}/liblognorm.so +%{_libdir}/liblognorm.so.0 +%{_libdir}/liblognorm.so.0.0.0 + +%files devel +%defattr(644,root,root,755) +%{_libdir}/pkgconfig/lognorm.pc +%{_includedir}/annot.h +%{_includedir}/liblognorm.h +%{_includedir}/lognorm.h +%{_includedir}/ptree.h +%{_includedir}/samp.h +%{_bindir}/normalizer +%{_libdir}/liblognorm.a +%{_libdir}/liblognorm.la + +%changelog +* Tue Jun 12 2012 Abby Edwards 0.3.4-1 +- initial version, used to build latest git master diff --git a/build/rhel/librelp/librelp.spec b/build/rhel/librelp/librelp.spec new file mode 100644 index 00000000..04f78dc0 --- /dev/null +++ b/build/rhel/librelp/librelp.spec @@ -0,0 +1,65 @@ +Summary: librelp - a reliable logging library +Name: librelp +Version: 1.0.1 +Release: 1%{?dist} +License: GPL +Group: Networking/Admin +Source: %{name}-%{version}.tar.gz +BuildRoot: /var/tmp/%{name}-build +Requires: /sbin/ldconfig + +%description +librelp is an easy to use library for the RELP protocol. RELP in turn provides reliable +event logging over the network (and consequently RELP stands for Reliable Event Logging +Protocol). RELP was initiated by Rainer Gerhards after he was finally upset by the lossy +nature of plain tcp syslog and wanted a cure for all these dangling issues. + +RELP (and hence) librelp assures that no message is lost, not even when connections +break and a peer becomes unavailable. The current version of RELP has a minimal window +of opportunity for message duplication after a session has been broken due to network +problems. In this case, a few messages may be duplicated (a problem that also exists +with plain tcp syslog). Future versions of RELP will address this shortcoming. + +%package devel +Summary: includes for compilation against librelp +Group: Networking/Admin +Requires: %name = %version-%release +Requires: /usr/bin/pkg-config + +%description devel +This package provides include and pkg-config files for compiling against +librelp. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%{_libdir}/librelp.so.0.0.0 +%{_libdir}/librelp.so.0 +%{_libdir}/librelp.so + +%files devel +%defattr(644,root,root,755) +%{_includedir}/librelp.h +%{_libdir}/pkgconfig/relp.pc +%{_libdir}/librelp.a +%{_libdir}/librelp.la + +%changelog +* Tue Jun 12 2012 Abby Edwards 1.0.1-1 +- initial version, used to build latest git master diff --git a/build/rhel/rsyslog/rsyslog.conf b/build/rhel/rsyslog/rsyslog.conf new file mode 100644 index 00000000..36cea98f --- /dev/null +++ b/build/rhel/rsyslog/rsyslog.conf @@ -0,0 +1,80 @@ +# rsyslog v5 configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imklog # provides kernel logging support (previously done by rklogd) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Use default timestamp format +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + + +#### RULES #### + +# 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 + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$WorkDirectory /var/lib/rsyslog # where to place spool files +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +#*.* @@remote-host:514 +# ### end of the forwarding rule ### diff --git a/build/rhel/rsyslog/rsyslog.init b/build/rhel/rsyslog/rsyslog.init new file mode 100644 index 00000000..ed4b1b1f --- /dev/null +++ b/build/rhel/rsyslog/rsyslog.init @@ -0,0 +1,121 @@ +#!/bin/bash +# +# rsyslog Startup script for rsyslog. +# +# chkconfig: 2345 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. +### BEGIN INIT INFO +# Provides: $syslog +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Enhanced system logging and kernel message trapping daemons +# 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. +### END INIT INFO + +# Source function library. +. /etc/init.d/functions + +RETVAL=0 +PIDFILE=/var/run/syslogd.pid + +prog=rsyslog +exec=/sbin/rsyslogd +lockfile=/var/lock/subsys/$prog + +# Source config +if [ -f /etc/sysconfig/$prog ] ; then + . /etc/sysconfig/$prog +fi + +start() { + [ -x $exec ] || exit 5 + + umask 077 + + syntaxcheck + + RETVAL=$? + if [ $RETVAL -ne 0 ] ; then + echo "Refusing to start system logger due to syntax errors; correct to continue." + return $RETVAL + fi + + echo -n $"Starting rsyslog: " + daemon --pidfile="${PIDFILE}" $exec -i "${PIDFILE}" $SYSLOGD_OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} +stop() { + echo -n $"Shutting down system logger: " + killproc -p "${PIDFILE}" $exec + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} +rhstatus() { + status -p "${PIDFILE}" -l $prog $exec +} +restart() { + stop + start +} + +syntaxcheck() { + [ -x $exec ] || exit 5 + + echo "Checking rsyslog configuration syntax: " + $exec $SYSLOGD_OPTIONS -n -N1 + echo + + RETVAL=$? + + if [ $RETVAL -eq 0 ] ; then + echo "syntax is okay" + else + echo "configuration has syntax errors" + fi + return $RETVAL +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + exit 3 + ;; + force-reload) + restart + ;; + status) + rhstatus + ;; + condrestart|try-restart) + rhstatus >/dev/null 2>&1 || exit 0 + restart + ;; + syntaxcheck) + syntaxcheck + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" + exit 3 +esac + +exit $? diff --git a/build/rhel/rsyslog/rsyslog.log b/build/rhel/rsyslog/rsyslog.log new file mode 100644 index 00000000..0e3fc160 --- /dev/null +++ b/build/rhel/rsyslog/rsyslog.log @@ -0,0 +1,8 @@ +/var/log/cron /var/log/maillog /var/log/messages /var/log/secure /var/log/spooler +{ + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + endscript +} diff --git a/build/rhel/rsyslog/rsyslog.spec b/build/rhel/rsyslog/rsyslog.spec new file mode 100644 index 00000000..4aa91df3 --- /dev/null +++ b/build/rhel/rsyslog/rsyslog.spec @@ -0,0 +1,786 @@ +%global _exec_prefix %{nil} +%global _libdir %{_exec_prefix}/%{_lib} +%define rsyslog_statedir %{_sharedstatedir}/rsyslog +%define rsyslog_pkidir %{_sysconfdir}/pki/rsyslog + +Summary: Enhanced system logging and kernel message trapping daemon +Name: rsyslog +Version: 6.5.0 +Release: 1%{?dist} +License: (GPLv3+ and ASL 2.0) +Group: System Environment/Daemons +URL: http://www.rsyslog.com/ +Source0: %{name}-%{version}.tar.gz +Source1: rsyslog.init +Source2: rsyslog.conf +Source3: rsyslog.sysconfig +Source4: rsyslog.log + +BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: flex +BuildRequires: bison + +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libcurl-devel +Requires: libcurl +%elseif %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: curl-devel +Requires: curl +%endif + +Requires: logrotate >= 3.5.2 +Requires: bash >= 2.0 +Requires(post): /sbin/chkconfig coreutils +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service + +Provides: syslog +Obsoletes: sysklogd < 1.5-11 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%package elasticsearch +Summary: ElasticSearch output module for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release + +%package mmjsonparse +Summary: JSON enhanced logging support +Group: System Environment/Daemons +Requires: %name = %version-%release + +%package mmnormalize +Summary: Log normalization support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: libestr-devel libee-devel liblognorm-devel + +%package imzmq3 +Summary: ZMQ input module support +Group: Systems Environment/Daemons +Requires: %name = %version-%release +BuildRequires: czmq-devel +BuildRequires: zeromq-devel +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libuuid-devel +Requires: libuuid +%elseif %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: e2fsprogs-devel +Requires: e2fsprogs +%else +BuildRequires: uuid-devel +Requires: uuid +%endif + + +%package omzmq3 +Summary: ZMQ output module support +Group: Systems Environment/Daemons +Requires: %name = %version-%release +BuildRequires: czmq-devel +BuildRequires: zeromq-devel +%if %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libuuid-devel +Requires: libuuid +%elseif %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: e2fsprogs-devel +Requires: e2fsprogs +%else +BuildRequires: uuid-devel +Requires: uuid +%endif + + +%package libdbi +Summary: libdbi database support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: libdbi-devel + +%package mysql +Summary: MySQL support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: mysql-devel >= 4.0 + +%package pgsql +Summary: PostgresSQL support for rsyslog +Group: System Environment/Daemons +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 + +%package relp +Summary: RELP protocol support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: librelp-devel + +%package gnutls +Summary: TLS protocol support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: gnutls-devel + +%package snmp +Summary: SNMP protocol support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: net-snmp-devel + +%package udpspoof +Summary: Provides the omudpspoof module +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: libnet-devel + +%description +Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL, +syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part, +and fine grain output format control. It is compatible with stock sysklogd +and can be used as a drop-in replacement. Rsyslog is simple to set up, with +advanced features suitable for enterprise-class, encryption-protected syslog +relay chains. + +%description elasticsearch +This module provides the capability for rsyslog to feed logs directly into +Elasticsearch. + +%description mmjsonparse +This module provides the capability to recognize and parse JSON enhanced +syslog messages. + +%description mmnormalize +This module provides the capability to normalize log messages via liblognorm. + +%description imzmq3 +This module provides the capability to use a zeromq socket for input. + +%description omzmq3 +This module provides the capability to use a zeromq socket for output. + +%description libdbi +This module supports a large number of database systems via +libdbi. Libdbi abstracts the database layer and provides drivers for +many systems. Drivers are available via the libdbi-drivers project. + +%description mysql +The rsyslog-mysql package contains a dynamic shared object that will add +MySQL database support to rsyslog. + +%description pgsql +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. + +%description relp +The rsyslog-relp package contains the rsyslog plugins that provide +the ability to receive syslog messages via the reliable RELP +protocol. + +%description gnutls +The rsyslog-gnutls package contains the rsyslog plugins that provide the +ability to receive syslog messages via upcoming syslog-transport-tls +IETF standard protocol. + +%description snmp +The rsyslog-snmp package contains the rsyslog plugin that provides the +ability to send syslog messages as SNMPv1 and SNMPv2c traps. + +%description udpspoof +This module is similar to the regular UDP forwarder, but permits to +spoof the sender address. Also, it enables to circle through a number +of source ports. + +%prep +%setup -q +#%patch0 -p1 +#%patch1 -p1 +#%patch2 -p1 +#%patch3 -p1 +#%patch4 -p1 +#%patch5 -p1 + +%build +%ifarch sparc64 +#sparc64 need big PIE +export CFLAGS="$RPM_OPT_FLAGS -fPIE -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\"" +export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" +%else +export CFLAGS="$RPM_OPT_FLAGS -fpie -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\"" +export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" +%endif +export PKG_CONFIG=/usr/bin/pkg-config +%configure --disable-static \ + --disable-testbench \ + --enable-elasticsearch \ + --enable-mmjsonparse \ + --enable-mmnormalize \ + --enable-imzmq3 \ + --enable-omzmq3 \ + --enable-gnutls \ + --enable-gssapi-krb5 \ + --enable-imfile \ + --enable-impstats \ + --enable-imptcp \ + --enable-libdbi \ + --enable-mail \ + --enable-mysql \ + --enable-omprog \ + --enable-omudpspoof \ + --enable-omuxsock \ + --enable-pgsql \ + --enable-pmlastmsg \ + --enable-relp \ + --enable-snmp \ + --enable-unlimited-select +make + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +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 -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d +install -d -m 700 $RPM_BUILD_ROOT%{rsyslog_statedir} +install -d -m 700 $RPM_BUILD_ROOT%{rsyslog_pkidir} + +install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/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 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog + +#get rid of *.la +rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +for n in /var/log/{messages,secure,maillog,spooler} +do + [ -f $n ] && continue + umask 066 && touch $n +done +if [ $1 -eq 1 ]; then + # On install (not upgrade), enable (but don't start) + /sbin/chkconfig --add rsyslog + /sbin/chkconfig rsyslog on +fi + +%preun +if [ $1 = 0 ]; then + # On uninstall (not upgrade), disable and stop the units + /sbin/chkconfig --del rsyslog >/dev/null 2>&1 || : + /sbin/service rsyslog stop >/dev/null 2>&1 || : +fi + +%postun +if [ $1 -ge 1 ] ; then + # On upgrade (not uninstall), optionally, restart the daemon + /sbin/service rsyslog restart >/dev/null 2>&1 || : +fi + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING* NEWS README ChangeLog doc/*html +%dir %{_libdir}/rsyslog +%{_libdir}/rsyslog/imfile.so +%{_libdir}/rsyslog/imklog.so +%{_libdir}/rsyslog/immark.so +%{_libdir}/rsyslog/impstats.so +%{_libdir}/rsyslog/imptcp.so +%{_libdir}/rsyslog/imtcp.so +%{_libdir}/rsyslog/imudp.so +%{_libdir}/rsyslog/imuxsock.so +%{_libdir}/rsyslog/lmnet.so +%{_libdir}/rsyslog/lmnetstrms.so +%{_libdir}/rsyslog/lmnsd_ptcp.so +%{_libdir}/rsyslog/lmregexp.so +%{_libdir}/rsyslog/lmstrmsrv.so +%{_libdir}/rsyslog/lmtcpclt.so +%{_libdir}/rsyslog/lmtcpsrv.so +%{_libdir}/rsyslog/lmzlibw.so +%{_libdir}/rsyslog/omtesting.so +%{_libdir}/rsyslog/ommail.so +%{_libdir}/rsyslog/omprog.so +%{_libdir}/rsyslog/omruleset.so +%{_libdir}/rsyslog/omuxsock.so +%{_libdir}/rsyslog/pmlastmsg.so +%{_initrddir}/rsyslog + +%config(noreplace) %{_sysconfdir}/rsyslog.conf +%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog +%config(noreplace) %{_sysconfdir}/logrotate.d/syslog +%dir %{_sysconfdir}/rsyslog.d +%dir %{rsyslog_statedir} +%dir %{rsyslog_pkidir} +%{_sbindir}/rsyslogd +%{_mandir}/*/* + +%attr(0755,root,root) %{_initrddir}/rsyslog + +%files elasticsearch +%defattr(-,root,root) +%{_libdir}/rsyslog/omelasticsearch.so + +%files mmjsonparse +%defattr(-,root,root) +%{_libdir}/rsyslog/mmjsonparse.so + +%files mmnormalize +%defattr(-,root,root) +%{_libdir}/rsyslog/mmnormalize.so + +%files imzmq3 +%defattr(-,root,root) +%{_libdir}/rsyslog/imzmq3.so + +%files omzmq3 +%defattr(-,root,root) +%{_libdir}/rsyslog/omzmq3.so + +%files libdbi +%defattr(-,root,root) +%{_libdir}/rsyslog/omlibdbi.so + +%files mysql +%defattr(-,root,root) +%doc plugins/ommysql/createDB.sql +%{_libdir}/rsyslog/ommysql.so + +%files pgsql +%defattr(-,root,root) +%doc plugins/ompgsql/createDB.sql +%{_libdir}/rsyslog/ompgsql.so + +%files gssapi +%defattr(-,root,root) +%{_libdir}/rsyslog/lmgssutil.so +%{_libdir}/rsyslog/imgssapi.so +%{_libdir}/rsyslog/omgssapi.so + +%files relp +%defattr(-,root,root) +%{_libdir}/rsyslog/imrelp.so +%{_libdir}/rsyslog/omrelp.so + +%files gnutls +%defattr(-,root,root) +%{_libdir}/rsyslog/lmnsd_gtls.so + +%files snmp +%defattr(-,root,root) +%{_libdir}/rsyslog/omsnmp.so + +%files udpspoof +%defattr(-,root,root) +%{_libdir}/rsyslog/omudpspoof.so + +%changelog + +* Wed Jun 06 2012 Abigail Edwards 6.5.0-1 +- convert Fedora spec into RHEL 6 spec, as far as init scripts are concerned +- removed references to all Fedora specific patches, as they were mostly + version specific +- added syntax check option to the init script, made a successful check + a prequisite to starting the daemon +- added several "--enable-*" directives to configure to create as many + subpackages as possible; enduser will need to have requisite dependencies + installed, some of which I had to write separate specs for. + +* Wed May 23 2012 Tomas Heinrich 5.8.11-1 +- upgrade to new upstream stable version 5.8.11 +- add impstats and imptcp modules +- include new license text files +- consider lock file in 'status' action +- add patch to update information on debugging in the man page +- add patch to prevent debug output to stdout after forking +- add patch to support ssl certificates with domain names longer than 128 chars + +* Fri Mar 30 2012 Jon Ciesla 5.8.7-2 +- libnet rebuild. + +* Mon Jan 23 2012 Tomas Heinrich 5.8.7-1 +- upgrade to new upstream version 5.8.7 +- change license from 'GPLv3+' to '(GPLv3+ and ASL 2.0)' + http://blog.gerhards.net/2012/01/rsyslog-licensing-update.html +- use a specific version for obsoleting sysklogd +- add patches for better sysklogd compatibility (taken from upstream) + +* Sat Jan 14 2012 Fedora Release Engineering - 5.8.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Oct 25 2011 Tomas Heinrich 5.8.6-1 +- upgrade to new upstream version 5.8.6 +- obsolete sysklogd + Resolves: #748495 + +* Tue Oct 11 2011 Tomas Heinrich 5.8.5-3 +- modify logrotate configuration to omit boot.log + Resolves: #745093 + +* Mon Sep 06 2011 Tomas Heinrich 5.8.5-2 +- add systemd-units to BuildRequires for the _unitdir macro definition + +* Mon Sep 05 2011 Tomas Heinrich 5.8.5-1 +- upgrade to new upstream version (CVE-2011-3200) + +* Fri Jul 22 2011 Tomas Heinrich 5.8.2-3 +- move the SysV init script into a subpackage +- Resolves: 697533 + +* Mon Jul 11 2011 Tomas Heinrich 5.8.2-2 +- rebuild for net-snmp-5.7 (soname bump in libnetsnmp) + +* Mon Jun 27 2011 Tomas Heinrich 5.8.2-1 +- upgrade to new upstream version 5.8.2 + +* Mon Jun 13 2011 Tomas Heinrich 5.8.1-2 +- scriptlet correction +- use macro in unit file's path + +* Fri May 20 2011 Tomas Heinrich 5.8.1-1 +- upgrade to new upstream version +- correct systemd scriptlets (#705829) + +* Mon May 16 2011 Bill Nottingham - 5.7.9-3 +- combine triggers (as rpm will only execute one) - fixes upgrades (#699198) + +* Tue Apr 05 2011 Tomas Heinrich 5.7.10-1 +- upgrade to new upstream version 5.7.10 + +* Wed Mar 23 2011 Dan Horák - 5.7.9-2 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + +* Fri Mar 18 2011 Tomas Heinrich 5.7.9-1 +- upgrade to new upstream version 5.7.9 +- enable compilation of several new modules, + create new subpackages for some of them +- integrate changes from Lennart Poettering + to add support for systemd + - add rsyslog-5.7.9-systemd.patch to tweak the upstream + service file to honour configuration from /etc/sysconfig/rsyslog + +* Fri Mar 18 2011 Dennis Gilmore - 5.6.2-3 +- sparc64 needs big PIE + +* Wed Feb 09 2011 Fedora Release Engineering - 5.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Tomas Heinrich 5.6.2-1 +- upgrade to new upstream stable version 5.6.2 +- drop rsyslog-5.5.7-remove_include.patch; applied upstream +- provide omsnmp module +- use correct name for lock file (#659398) +- enable specification of the pid file (#579411) +- init script adjustments + +* Wed Oct 06 2010 Tomas Heinrich 5.5.7-1 +- upgrade to upstream version 5.5.7 +- update configuration and init files for the new major version +- add several directories for storing auxiliary data +- add ChangeLog to documentation +- drop unlimited-select.patch; integrated upstream +- add rsyslog-5.5.7-remove_include.patch to fix compilation + +* Tue Sep 07 2010 Tomas Heinrich 4.6.3-2 +- build rsyslog with PIE and RELRO + +* Thu Jul 15 2010 Tomas Heinrich 4.6.3-1 +- upgrade to new upstream stable version 4.6.3 + +* Wed Apr 07 2010 Tomas Heinrich 4.6.2-1 +- upgrade to new upstream stable version 4.6.2 +- correct the default value of the OMFileFlushOnTXEnd directive + +* Thu Feb 11 2010 Tomas Heinrich 4.4.2-6 +- modify rsyslog-4.4.2-unlimited-select.patch so that + running autoreconf is not needed +- remove autoconf, automake, libtool from BuildRequires +- change exec-prefix to nil + +* Wed Feb 10 2010 Tomas Heinrich 4.4.2-5 +- remove '_smp_mflags' make argument as it seems to be + producing corrupted builds + +* Mon Feb 08 2010 Tomas Heinrich 4.4.2-4 +- redefine _libdir as it doesn't use _exec_prefix + +* Thu Dec 17 2009 Tomas Heinrich 4.4.2-3 +- change exec-prefix to / + +* Wed Dec 09 2009 Robert Scheck 4.4.2-2 +- run libtoolize to avoid errors due mismatching libtool version + +* Thu Dec 03 2009 Tomas Heinrich 4.4.2-1 +- upgrade to new upstream stable version 4.4.2 +- add support for arbitrary number of open file descriptors + +* Mon Sep 14 2009 Tomas Heinrich 4.4.1-2 +- adjust init script according to guidelines (#522071) + +* Thu Sep 03 2009 Tomas Heinrich 4.4.1-1 +- upgrade to new upstream stable version + +* Fri Aug 21 2009 Tomas Mraz - 4.2.0-3 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 4.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Tomas Heinrich 4.2.0-1 +- upgrade + +* Mon Apr 13 2009 Tomas Heinrich 3.21.11-1 +- upgrade + +* Tue Mar 31 2009 Lubomir Rintel 3.21.10-4 +- Backport HUPisRestart option + +* Wed Mar 18 2009 Tomas Heinrich 3.21.10-3 +- fix variables' type conversion in expression-based filters (#485937) + +* Wed Feb 25 2009 Fedora Release Engineering - 3.21.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 10 2009 Tomas Heinrich 3.21.10-1 +- upgrade + +* Sat Jan 24 2009 Caolán McNamara 3.21.9-3 +- rebuild for dependencies + +* Tue Jan 07 2009 Tomas Heinrich 3.21.9-2 +- fix several legacy options handling +- fix internal message output (#478612) + +* Mon Dec 15 2008 Peter Vrabec 3.21.9-1 +- update is fixing $AllowedSender security issue + +* Mon Sep 15 2008 Peter Vrabec 3.21.3-4 +- use RPM_OPT_FLAGS +- use same pid file and logrotate file as syslog-ng (#441664) +- mark config files as noreplace (#428155) + +* Mon Sep 01 2008 Tomas Heinrich 3.21.3-3 +- fix a wrong module name in the rsyslog.conf manual page (#455086) +- expand the rsyslog.conf manual page (#456030) + +* Thu Aug 28 2008 Tomas Heinrich 3.21.3-2 +- fix clock rollback issue (#460230) + +* Wed Aug 20 2008 Peter Vrabec 3.21.3-1 +- upgrade to bugfix release + +* Wed Jul 23 2008 Peter Vrabec 3.21.0-1 +- upgrade + +* Mon Jul 14 2008 Peter Vrabec 3.19.9-2 +- adjust default config file + +* Fri Jul 11 2008 Lubomir Rintel 3.19.9-1 +- upgrade + +* Wed Jun 25 2008 Peter Vrabec 3.19.7-3 +- rebuild because of new gnutls + +* Fri Jun 13 2008 Peter Vrabec 3.19.7-2 +- do not translate Oopses (#450329) + +* Fri Jun 13 2008 Peter Vrabec 3.19.7-1 +- upgrade + +* Wed May 28 2008 Peter Vrabec 3.19.4-1 +- upgrade + +* Mon May 26 2008 Peter Vrabec 3.19.3-1 +- upgrade to new upstream release + +* Wed May 14 2008 Tomas Heinrich 3.16.1-1 +- upgrade + +* Tue Apr 08 2008 Peter Vrabec 3.14.1-5 +- prevent undesired error description in legacy + warning messages + +* Tue Apr 08 2008 Peter Vrabec 3.14.1-4 +- adjust symbol lookup method to 2.6 kernel + +* Tue Apr 08 2008 Peter Vrabec 3.14.1-3 +- fix segfault of expression based filters + +* Mon Apr 07 2008 Peter Vrabec 3.14.1-2 +- init script fixes (#441170,#440968) + +* Fri Apr 04 2008 Peter Vrabec 3.14.1-1 +- upgrade + +* Mon Mar 25 2008 Peter Vrabec 3.12.4-1 +- upgrade + +* Wed Mar 19 2008 Peter Vrabec 3.12.3-1 +- upgrade +- fix some significant memory leaks + +* Tue Mar 11 2008 Peter Vrabec 3.12.1-2 +- init script fixes (#436854) +- fix config file parsing (#436722) + +* Thu Mar 06 2008 Peter Vrabec 3.12.1-1 +- upgrade + +* Wed Mar 05 2008 Peter Vrabec 3.12.0-1 +- upgrade + +* Mon Feb 25 2008 Peter Vrabec 3.11.5-1 +- upgrade + +* Fri Feb 01 2008 Peter Vrabec 3.11.0-1 +- upgrade to the latests development release +- provide PostgresSQL support +- provide GSSAPI support + +* Mon Jan 21 2008 Peter Vrabec 2.0.0-7 +- change from requires sysklogd to conflicts sysklogd + +* Fri Jan 18 2008 Peter Vrabec 2.0.0-6 +- change logrotate file +- use rsyslog own pid file + +* Thu Jan 17 2008 Peter Vrabec 2.0.0-5 +- fixing bad descriptor (#428775) + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-4 +- rename logrotate file + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-3 +- fix post script and init file + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-2 +- change pid filename and use logrotata script from sysklogd + +* Tue Jan 15 2008 Peter Vrabec 2.0.0-1 +- upgrade to stable release +- spec file clean up + +* Wed Jan 02 2008 Peter Vrabec 1.21.2-1 +- new upstream release + +* Thu Dec 06 2007 Release Engineering - 1.19.11-2 +- Rebuild for deps + +* Thu Nov 29 2007 Peter Vrabec 1.19.11-1 +- new upstream release +- add conflicts (#400671) + +* Mon Nov 19 2007 Peter Vrabec 1.19.10-1 +- new upstream release + +* Wed Oct 03 2007 Peter Vrabec 1.19.6-3 +- remove NUL character from recieved messages + +* Tue Sep 25 2007 Tomas Heinrich 1.19.6-2 +- fix message suppression (303341) + +* Tue Sep 25 2007 Tomas Heinrich 1.19.6-1 +- upstream bugfix release + +* Tue Aug 28 2007 Peter Vrabec 1.19.2-1 +- upstream bugfix release +- support for negative app selector, patch from + theinric@redhat.com + +* Fri Aug 17 2007 Peter Vrabec 1.19.0-1 +- new upstream release with MySQL support(as plugin) + +* Wed Aug 08 2007 Peter Vrabec 1.18.1-1 +- upstream bugfix release + +* Mon Aug 06 2007 Peter Vrabec 1.18.0-1 +- new upstream release + +* Thu Aug 02 2007 Peter Vrabec 1.17.6-1 +- upstream bugfix release + +* Mon Jul 30 2007 Peter Vrabec 1.17.5-1 +- upstream bugfix release +- fix typo in provides + +* Wed Jul 25 2007 Jeremy Katz - 1.17.2-4 +- rebuild for toolchain bug + +* Tue Jul 24 2007 Peter Vrabec 1.17.2-3 +- take care of sysklogd configuration files in %%post + +* Tue Jul 24 2007 Peter Vrabec 1.17.2-2 +- use EVR in provides/obsoletes sysklogd + +* Mon Jul 23 2007 Peter Vrabec 1.17.2-1 +- upstream bug fix release + +* Fri Jul 20 2007 Peter Vrabec 1.17.1-1 +- upstream bug fix release +- include html docs (#248712) +- make "-r" option compatible with sysklogd config (248982) + +* Tue Jul 17 2007 Peter Vrabec 1.17.0-1 +- feature rich upstream release + +* Thu Jul 12 2007 Peter Vrabec 1.15.1-2 +- use obsoletes and hadle old config files + +* Wed Jul 11 2007 Peter Vrabec 1.15.1-1 +- new upstream bugfix release + +* Tue Jul 10 2007 Peter Vrabec 1.15.0-1 +- new upstream release introduce capability to generate output + file names based on templates + +* Tue Jul 03 2007 Peter Vrabec 1.14.2-1 +- new upstream bugfix release + +* Mon Jul 02 2007 Peter Vrabec 1.14.1-1 +- new upstream release with IPv6 support + +* Tue Jun 26 2007 Peter Vrabec 1.13.5-3 +- add BuildRequires for zlib compression feature + +* Mon Jun 25 2007 Peter Vrabec 1.13.5-2 +- some spec file adjustments. +- fix syslog init script error codes (#245330) + +* Fri Jun 22 2007 Peter Vrabec 1.13.5-1 +- new upstream release + +* Fri Jun 22 2007 Peter Vrabec 1.13.4-2 +- some spec file adjustments. + +* Mon Jun 18 2007 Peter Vrabec 1.13.4-1 +- upgrade to new upstream release + +* Wed Jun 13 2007 Peter Vrabec 1.13.2-2 +- DB support off + +* Tue Jun 12 2007 Peter Vrabec 1.13.2-1 +- new upstream release based on redhat patch + +* Fri Jun 08 2007 Peter Vrabec 1.13.1-2 +- rsyslog package provides its own kernel log. daemon (rklogd) + +* Mon Jun 04 2007 Peter Vrabec 1.13.1-1 +- Initial rpm build diff --git a/build/rhel/rsyslog/rsyslog.sysconfig b/build/rhel/rsyslog/rsyslog.sysconfig new file mode 100644 index 00000000..04c6c533 --- /dev/null +++ b/build/rhel/rsyslog/rsyslog.sysconfig @@ -0,0 +1,7 @@ +# Options for rsyslogd +# Syslogd options are deprecated since rsyslog v3. +# If you want to use them, switch to compatibility mode 2 by "-c 2" +# See rsyslogd(8) for more details +# +# Assume compatibily with version 5 or greater +SYSLOGD_OPTIONS="-c5 -f /etc/rsyslog.conf" -- cgit From 50521ab72bcf302958b007ca77f08ce65a368fb8 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 13 Jun 2012 15:55:49 +0200 Subject: preparing for 6.2.2 release --- ChangeLog | 4 +++- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32cd1060..967ec156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ --------------------------------------------------------------------------- -Version 6.2.2 [v6-stable], 2012-05-?? +Version 6.2.2 [v6-stable], 2012-06-13 +- build system improvements and spec file templates + Thanks to Abby Edwards for providing these enhancements - bugfix: disk queue was not persisted on shutdown, regression of fix to http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and diff --git a/configure.ac b/configure.ac index 5b849551..7d1d98b0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[6.2.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.2.2],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index a7f54541..f2386314 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 6.2.1 (v6-stable branch) of rsyslog. +

This documentation is for version 6.2.2 (v6-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit