Accepting request 142910 from home:mtomaschewski:syslog
forward of rq142533 to Base:System - fix zeromq support - fix hiredis support - enabled elastic search support (build enabled by default): -> new buildrequires curl devel -> new subpackage rsyslog-module-elasticsearch - added --enable-unlimited-select - added --enable-imttcp: -> this module is packaged in the main package as it has no new dependencies - added --enable-imdiag -> this module is packaged in the diag package - prepared adding support for hiredis, hdfs, mongodb and zeromq OBS-URL: https://build.opensuse.org/request/show/142910 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=118
This commit is contained in:
parent
b7ebaf8cc5
commit
d882c5c7c2
@ -1,3 +1,27 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 23 01:28:46 UTC 2012 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- fix zeromq support
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 23 01:01:01 UTC 2012 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- fix hiredis support
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 22 23:44:27 UTC 2012 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- enabled elastic search support (build enabled by default):
|
||||||
|
-> new buildrequires curl devel
|
||||||
|
-> new subpackage rsyslog-module-elasticsearch
|
||||||
|
- added --enable-unlimited-select
|
||||||
|
- added --enable-imttcp:
|
||||||
|
-> this module is packaged in the main package as it has no
|
||||||
|
new dependencies
|
||||||
|
- added --enable-imdiag
|
||||||
|
-> this module is packaged in the diag package
|
||||||
|
- prepared adding support for hiredis, hdfs, mongodb and zeromq
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 22 14:12:36 UTC 2012 - mt@suse.com
|
Thu Nov 22 14:12:36 UTC 2012 - mt@suse.com
|
||||||
|
|
||||||
|
155
rsyslog.spec
155
rsyslog.spec
@ -44,6 +44,12 @@ Release: 0
|
|||||||
%bcond_without snmp
|
%bcond_without snmp
|
||||||
%bcond_without diagtools
|
%bcond_without diagtools
|
||||||
%bcond_without mmnormalize
|
%bcond_without mmnormalize
|
||||||
|
%bcond_without elasticsearch
|
||||||
|
# TODO: ... doesnt have a proper configure check but wants hdfs.h
|
||||||
|
%bcond_with hdfs
|
||||||
|
%bcond_with mongodb
|
||||||
|
%bcond_with hiredis
|
||||||
|
%bcond_with zeromq
|
||||||
%define upstream_version %{version}
|
%define upstream_version %{version}
|
||||||
%define rsyslogdocdir %{_docdir}/%{name}
|
%define rsyslogdocdir %{_docdir}/%{name}
|
||||||
%define rsyslog_rundir %{_localstatedir}/run/rsyslog
|
%define rsyslog_rundir %{_localstatedir}/run/rsyslog
|
||||||
@ -74,6 +80,18 @@ BuildRequires: openssl-devel
|
|||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
%if %{with elasticsearch}
|
||||||
|
BuildRequires: curl-devel
|
||||||
|
%endif
|
||||||
|
%if %{with hiredis}
|
||||||
|
BuildRequires: hiredis-devel >= 0.10.1
|
||||||
|
%endif
|
||||||
|
%if %{with mongodb}
|
||||||
|
# TODO: PKG_CHECK_MODULES(LIBMONGO_CLIENT, libmongo-client >= 0.1.4)
|
||||||
|
%endif
|
||||||
|
%if %{with zeromq}
|
||||||
|
BuildRequires: czmq-devel >= 1.1.0
|
||||||
|
%endif
|
||||||
%if %{with gssapi}
|
%if %{with gssapi}
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
%endif
|
%endif
|
||||||
@ -309,6 +327,83 @@ This module provides a UDP forwarder that allows changing the sender address.
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with elasticsearch}
|
||||||
|
|
||||||
|
%package module-elasticsearch
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Summary: ElasticSearch output module for syslog
|
||||||
|
Group: System/Daemons
|
||||||
|
|
||||||
|
%description module-elasticsearch
|
||||||
|
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
|
||||||
|
package.
|
||||||
|
|
||||||
|
This module provides support to output to an ElasticSearch database.
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with hdfs}
|
||||||
|
|
||||||
|
%package module-hdfs
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Summary: HDFS output module for syslog
|
||||||
|
Group: System/Daemons
|
||||||
|
|
||||||
|
%description module-hdfs
|
||||||
|
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
|
||||||
|
package.
|
||||||
|
|
||||||
|
This module provides support to output to an HDFS database.
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%if %{with mongodb}
|
||||||
|
|
||||||
|
%package module-mongodb
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Summary: MongoDB output module for syslog
|
||||||
|
Group: System/Daemons
|
||||||
|
|
||||||
|
%description module-mongodb
|
||||||
|
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
|
||||||
|
package.
|
||||||
|
|
||||||
|
This module provides support to output to a MongoDB database.
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%if %{with hiredis}
|
||||||
|
|
||||||
|
%package module-hiredis
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Summary: Redis output module for syslog
|
||||||
|
Group: System/Daemons
|
||||||
|
|
||||||
|
%description module-hiredis
|
||||||
|
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
|
||||||
|
package.
|
||||||
|
|
||||||
|
This module provides support to output to a Redis database.
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with zeromq}
|
||||||
|
|
||||||
|
%package module-zeromq
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Summary: ZeroMQ support module for syslog
|
||||||
|
Group: System/Daemons
|
||||||
|
|
||||||
|
%description module-zeromq
|
||||||
|
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
|
||||||
|
package.
|
||||||
|
|
||||||
|
This module provides support for ZeroMQ.
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{upstream_version}
|
%setup -q -n %{name}-%{upstream_version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
@ -339,7 +434,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
|
|||||||
--enable-klog \
|
--enable-klog \
|
||||||
--enable-kmsg \
|
--enable-kmsg \
|
||||||
--enable-inet \
|
--enable-inet \
|
||||||
|
--enable-unlimited-select \
|
||||||
--enable-rsyslogd \
|
--enable-rsyslogd \
|
||||||
|
%if %{with elasticsearch}
|
||||||
|
--enable-elasticsearch \
|
||||||
|
%endif
|
||||||
%if %{with gnutls}
|
%if %{with gnutls}
|
||||||
--enable-gnutls \
|
--enable-gnutls \
|
||||||
%endif
|
%endif
|
||||||
@ -365,6 +464,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
|
|||||||
--enable-mail \
|
--enable-mail \
|
||||||
--enable-imfile \
|
--enable-imfile \
|
||||||
--enable-imptcp \
|
--enable-imptcp \
|
||||||
|
--enable-imttcp \
|
||||||
--enable-impstats \
|
--enable-impstats \
|
||||||
--enable-omprog \
|
--enable-omprog \
|
||||||
--enable-omuxsock \
|
--enable-omuxsock \
|
||||||
@ -383,7 +483,21 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
|
|||||||
--enable-mmjsonparse \
|
--enable-mmjsonparse \
|
||||||
--enable-mmaudit \
|
--enable-mmaudit \
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with hdfs}
|
||||||
|
--enable-omhdfs \
|
||||||
|
%endif
|
||||||
|
%if %{with mongodb}
|
||||||
|
--enable-ommongodb \
|
||||||
|
%endif
|
||||||
|
%if %{with hiredis}
|
||||||
|
--enable-omhiredis \
|
||||||
|
%endif
|
||||||
|
%if %{with zeromq}
|
||||||
|
--enable-imzmq3 \
|
||||||
|
--enable-omzmq3 \
|
||||||
|
%endif
|
||||||
%if %{with diagtools}
|
%if %{with diagtools}
|
||||||
|
--enable-imdiag \
|
||||||
--enable-diagtools \
|
--enable-diagtools \
|
||||||
%endif
|
%endif
|
||||||
--disable-static
|
--disable-static
|
||||||
@ -425,6 +539,9 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the
|
|||||||
mmnormalize.so \
|
mmnormalize.so \
|
||||||
mmjsonparse.so \
|
mmjsonparse.so \
|
||||||
mmaudit.so \
|
mmaudit.so \
|
||||||
|
%endif
|
||||||
|
%if %{with elasticsearch}
|
||||||
|
omelasticsearch.so \
|
||||||
%endif
|
%endif
|
||||||
; do
|
; do
|
||||||
mv -f %{buildroot}%{rsyslog_module_dir_nodeps}/$mod \
|
mv -f %{buildroot}%{rsyslog_module_dir_nodeps}/$mod \
|
||||||
@ -626,6 +743,7 @@ fi
|
|||||||
%{rsyslog_module_dir_nodeps}/imkmsg.so
|
%{rsyslog_module_dir_nodeps}/imkmsg.so
|
||||||
%{rsyslog_module_dir_nodeps}/immark.so
|
%{rsyslog_module_dir_nodeps}/immark.so
|
||||||
%{rsyslog_module_dir_nodeps}/imtcp.so
|
%{rsyslog_module_dir_nodeps}/imtcp.so
|
||||||
|
%{rsyslog_module_dir_nodeps}/imttcp.so
|
||||||
%{rsyslog_module_dir_nodeps}/imudp.so
|
%{rsyslog_module_dir_nodeps}/imudp.so
|
||||||
%{rsyslog_module_dir_nodeps}/imuxsock.so
|
%{rsyslog_module_dir_nodeps}/imuxsock.so
|
||||||
%{rsyslog_module_dir_nodeps}/lmnet.so
|
%{rsyslog_module_dir_nodeps}/lmnet.so
|
||||||
@ -680,6 +798,7 @@ fi
|
|||||||
%{_sbindir}/msggen
|
%{_sbindir}/msggen
|
||||||
%{_sbindir}/rsyslog_diag_hostname
|
%{_sbindir}/rsyslog_diag_hostname
|
||||||
%{_sbindir}/zpipe
|
%{_sbindir}/zpipe
|
||||||
|
%{rsyslog_module_dir_nodeps}/imdiag.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with gssapi}
|
%if %{with gssapi}
|
||||||
@ -753,4 +872,40 @@ fi
|
|||||||
%{rsyslog_module_dir_nodeps}/omudpspoof.so
|
%{rsyslog_module_dir_nodeps}/omudpspoof.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with elasticsearch}
|
||||||
|
|
||||||
|
%files module-elasticsearch
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{rsyslog_module_dir_withdeps}/omelasticsearch.so
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with hdfs}
|
||||||
|
|
||||||
|
%files module-hdfs
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{rsyslog_module_dir_withdeps}/omhdfs.so
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with mongodb}
|
||||||
|
|
||||||
|
%files module-mongodb
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{rsyslog_module_dir_withdeps}/ommongodb.so
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with hiredis}
|
||||||
|
|
||||||
|
%files module-hiredis
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{rsyslog_module_dir_withdeps}/omhiredis.so
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with zeromq}
|
||||||
|
|
||||||
|
%files module-zeromq
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{rsyslog_module_dir_withdeps}/imzmq3.so
|
||||||
|
%{rsyslog_module_dir_withdeps}/omzmq3.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user