Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2014-05-20 14:24:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng" Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2014-01-30 11:37:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new/syslog-ng.changes 2014-05-20 14:25:19.000000000 +0200 @@ -1,0 +2,21 @@ +Mon May 19 08:07:32 UTC 2014 - m...@suse.de + +- rpm: use _rundir rpm macro if defined (bnc#873857) + +------------------------------------------------------------------- +Thu May 15 10:20:50 CEST 2014 - cza...@balabit.hu + +- update to 3.5.4.1 + For a full list of syslog-ng 3.5 related changes, please check + the upstream changelog at: + http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.5.4.1/changelog-en.txt +- updated config version to 3.5 +- added new modules (redis, stomp, etc.) +- use system(); for local logs, which fixes bnc#846762 + https://bugzilla.novell.com/show_bug.cgi?id=846762 +- add /etc/syslog-ng/conf.d/ as include dir to config +- added devel package, so external modules can be built + (like those from the syslog-ng incubator project) + + +------------------------------------------------------------------- Old: ---- syslog-ng_3.4.5.tar.gz New: ---- syslog-ng_3.5.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.0FjOGm/_old 2014-05-20 14:25:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0FjOGm/_new 2014-05-20 14:25:22.000000000 +0200 @@ -17,9 +17,13 @@ Name: syslog-ng +%if %{defined _rundir} +%define syslog_ng_rundir %{_rundir}/syslog-ng +%else %define syslog_ng_rundir %{_localstatedir}/run/syslog-ng +%endif %define syslog_ng_sockets_cfg %{syslog_ng_rundir}/additional-log-sockets.conf -Version: 3.4.5 +Version: 3.5.4.1 Release: 0 Summary: The new-generation syslog-daemon License: GPL-2.0 @@ -45,6 +49,8 @@ %endif %define with_smtp %suse_version >= 1210 %define with_geoip %suse_version >= 1210 +# redis only available in openSUSE 13.1+ +%bcond_without redis %if %{with systemd} Provides: syslog Provides: sysvinit(syslog) @@ -73,6 +79,10 @@ %if 0%{?with_geoip} BuildRequires: libGeoIP-devel %endif +%if %{with redis} +BuildRequires: hiredis-devel +BuildRequires: libhiredis0_10 +%endif BuildRequires: libevtlog-devel BuildRequires: libjson-devel BuildRequires: libopenssl-devel @@ -90,19 +100,29 @@ BuildRequires: libcap BuildRequires: libnet %endif + +# BuildRequires: libxslt-tools + # uncomment, if you want to run "make check" (local builds only) -# BuildRequires: timezone +#BuildRequires: timezone BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -syslog-ng is a "new-generation" syslogd (replacement) for Unix and -Unix-like systems. It tries to fill the gaps in the original syslogd: - -* powerful configurability -* filtering based on message content -* portability -* better network forwarding +syslog-ng is an enhanced log daemon, supporting a wide range of input and +output methods: syslog, unstructured text, message queues, databases (SQL +and NoSQL alike) and more. + +Key features: + + * receive and send RFC3164 and RFC5424 style syslog messages + * work with any kind of unstructured data + * receive and send JSON formatted messages + * classify and structure logs with builtin parsers (csv-parser(), + db-parser(), ...) + * normalize, crunch and process logs as they flow through the system + * hand on messages for further processing using message queues (like + AMQP), files or databases (like PostgreSQL or MongoDB). The official home page of syslog-ng is: http://www.balabit.com/network-security/syslog-ng/ @@ -166,6 +186,24 @@ %endif +%if %{with redis} + +%package redis +Summary: Redis destination support +Group: System/Daemons +Requires: %{name} = %{version} + +%description redis +This package provides the libredis module providing support for +logging to a redis destination. + +Authors: +-------- + Balázs Scheidler <ba...@balabit.hu> + BalaBit IT Ltd. <i...@balabit.hu> + +%endif + %package json Summary: JSON output support Group: System/Daemons @@ -180,6 +218,19 @@ Balázs Scheidler <ba...@balabit.hu> BalaBit IT Ltd. <i...@balabit.hu> +%package devel +Summary: Development files for syslog-ng +Group: System/Daemons +Requires: %{name} = %{version} + +%description devel +This package provides files necessary for syslog-ng development. + +Authors: +-------- + Balázs Scheidler <ba...@balabit.hu> + BalaBit IT Ltd. <i...@balabit.hu> + %prep %setup -q -n syslog-ng-%{version} # fill out placeholders in the config, @@ -237,6 +288,9 @@ --enable-geoip \ %endif --enable-mongodb \ +%if %{with redis} + --enable-redis \ +%endif --enable-dynamic-linking # # - build syslog-ng @@ -276,6 +330,8 @@ $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf install -m644 $RPM_SOURCE_DIR/syslog-ng.sysconfig \ $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ng +# create empty /etc/syslog-ng/conf.d/ +install -d -m755 %{buildroot}%{_sysconfdir}/syslog-ng/conf.d/ # create a compatibility link in /sbin ln -sf %{_sbindir}/syslog-ng %{buildroot}/sbin/ @@ -283,13 +339,6 @@ # don't package update-patterndb now rm %{buildroot}/usr/bin/update-patterndb -# remove devel files -rm %{buildroot}/%{_libdir}/libsyslog-ng.{la,so} -rm %{buildroot}/%{_libdir}/syslog-ng/*.la -rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng.pc -rm -fr %{buildroot}%{_includedir}/syslog-ng -rm -fr %{buildroot}%{_datadir}/syslog-ng/tools - # decide which to keep rm %{buildroot}/%{_libdir}/syslog-ng/libafsocket.so rm %{buildroot}/%{_libdir}/syslog-ng/libafsocket-notls.so @@ -301,6 +350,9 @@ touch %{buildroot}%{syslog_ng_sockets_cfg} chmod 644 %{buildroot}%{syslog_ng_sockets_cfg} +# install ivykis includes +install -m 644 lib/ivykis/src/include/iv* %{buildroot}%{_includedir}/syslog-ng/ + %clean ## ## clean build root ######################################### @@ -460,10 +512,12 @@ %dir %{_datadir}/syslog-ng/include %dir %{_datadir}/syslog-ng/include/scl %dir %{_datadir}/syslog-ng/include/scl/pacct +%dir %{_datadir}/syslog-ng/include/scl/rewrite %dir %{_datadir}/syslog-ng/include/scl/syslogconf %dir %{_datadir}/syslog-ng/include/scl/system %dir %{_datadir}/syslog-ng/xsd %dir %{_sysconfdir}/syslog-ng +%dir %{_sysconfdir}/syslog-ng/conf.d %config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf %config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf %if %{with systemd} && ! %{with systemv} @@ -479,16 +533,19 @@ %attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so %attr(755,root,root) %{_libdir}/syslog-ng/libafmongodb.so %attr(755,root,root) %{_libdir}/syslog-ng/libafsocket.so +%attr(755,root,root) %{_libdir}/syslog-ng/libafstomp.so %attr(755,root,root) %{_libdir}/syslog-ng/libafuser.so %attr(755,root,root) %{_libdir}/syslog-ng/libbasicfuncs.so %attr(755,root,root) %{_libdir}/syslog-ng/libconfgen.so %attr(755,root,root) %{_libdir}/syslog-ng/libcsvparser.so %attr(755,root,root) %{_libdir}/syslog-ng/libcryptofuncs.so %attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so +%attr(755,root,root) %{_libdir}/syslog-ng/liblinux-kmsg-format.so %attr(755,root,root) %{_libdir}/syslog-ng/libsyslog-ng-crypto.so %attr(755,root,root) %{_libdir}/syslog-ng/libsyslogformat.so %attr(755,root,root) %{_libdir}/syslog-ng/libsystem-source.so %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/pacct/plugin.conf +%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/rewrite/cc-mask.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/system/plugin.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/README %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk @@ -509,6 +566,18 @@ %dir %{_libdir}/syslog-ng %attr(755,root,root) %{_libdir}/syslog-ng/libjson-plugin.so +%files devel +%defattr(-,root,root) +%attr(644,root,root) %{_libdir}/libsyslog-ng.la +%attr(644,root,root) %{_libdir}/syslog-ng/*.la +%attr(644,root,root) %{_libdir}/pkgconfig/syslog-ng.pc +%dir %{_includedir}/syslog-ng +%attr(-,root,root) %{_includedir}/syslog-ng/* +%dir %{_datadir}/syslog-ng/tools +%attr(755,root,root) %{_datadir}/syslog-ng/tools/merge-grammar.pl +%attr(644,root,root) %{_datadir}/syslog-ng/tools/cfg-grammar.y +%attr(644,root,root) %{_datadir}/syslog-ng/tools/lex-rules.am + %if 0%{?with_smtp} %files smtp @@ -527,4 +596,13 @@ %endif +%if %{with redis} + +%files redis +%defattr(-,root,root) +%dir %{_libdir}/syslog-ng +%attr(755,root,root) %{_libdir}/syslog-ng/libredis.so + +%endif + %changelog ++++++ syslog-ng.conf.default ++++++ --- /var/tmp/diff_new_pack.0FjOGm/_old 2014-05-20 14:25:23.000000000 +0200 +++ /var/tmp/diff_new_pack.0FjOGm/_new 2014-05-20 14:25:23.000000000 +0200 @@ -1,4 +1,4 @@ -@version:3.4 +@version:3.5 @include "scl.conf" # @@ -27,21 +27,13 @@ # source src { # - # include internal syslog-ng messages - # note: the internal() soure is required! + # use system() for local logs # - internal(); - - # - # read kernel messages directly (12.x) or - # does klogd forward them via /dev/log? + system(); # - file ("/proc/kmsg" program_override("kernel")); - - # - # the default log socket for local logging: + # syslog-ng's internal messages # - unix-dgram("/dev/log"); + internal(); # # uncomment to process log messages from network: # @@ -219,3 +211,7 @@ log { source(src); source(chroots); filter(f_warn); destination(warn); }; +### +# Include all config files in /etc/syslog-ng/conf.d/ +### +@include "/etc/syslog-ng/conf.d/" ++++++ syslog-ng_3.4.5.tar.gz -> syslog-ng_3.5.4.1.tar.gz ++++++ ++++ 192440 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
