Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2013-01-11 09:43:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2012-11-22 17:23:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new/syslog-ng.changes 2013-01-11 09:43:31.000000000 +0100 @@ -1,0 +2,47 @@ +Wed Jan 9 12:29:29 UTC 2013 - [email protected] + +- Enable syslog-ng.service and create the syslog.service alias link + in post install -- regardless of a preset config (bnc#790805). +- Check the existence of /etc/init.d/syslog script before calling + the restart_on_update and stop_on_removal macros to avoid errors + on update. Since openSUSE 12.3, no syslog init script is shipped + (bnc#790298,bnc#750478). + +------------------------------------------------------------------- +Mon Jan 7 16:20:48 CET 2013 - [email protected] + +- update to 3.4 RC1 (only bugfixes) +- removed temporary syslog-ng-systemd.patch + +------------------------------------------------------------------- +Mon Dec 17 11:54:15 CET 2012 - [email protected] + +- update to 3.4 beta1 (only bugfixes) +- added smtp support +- enable features explicitely (add --enable-XXX for + mongodb and amqp) +- add syslog-ng-systemd.patch temporarilty to fix bug when starting + from systemd +- enable GeoIP support into separate subpackage + +------------------------------------------------------------------- +Fri Dec 7 11:13:40 CET 2012 - [email protected] + +- update to 3.4 git HEAD +- many new features, including: + - junctions and more complicated log processing paths + - amqp destination + - smtp destination + - json output and parser plugins + - key rewriting in destination drivers (add, remove prefixes) + - a number of new template functions (uuid, hash functions, etc) + - a number of new parsers in db-parser (set, pcre, ...) + - allow 32 bit message and nvpair sizes + - improved systemd support + - demand loaded plugins + - plugin support for log transport protocols and the network + driver to be able to use them easily +- add/remove files from pkglist +- added python needed by SLES + +------------------------------------------------------------------- Old: ---- syslog-ng_3.3.7.tar.gz New: ---- syslog-ng_3.4.0rc1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.n8RD5q/_old 2013-01-11 09:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.n8RD5q/_new 2013-01-11 09:43:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package syslog-ng # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: syslog-ng %define syslog_ng_rundir %{_localstatedir}/run/syslog-ng %define syslog_ng_sockets_cfg %{syslog_ng_rundir}/additional-log-sockets.conf -Version: 3.3.7 +Version: 3.4.0rc1 Release: 0 Summary: The new-generation syslog-daemon License: GPL-2.0 @@ -43,6 +43,8 @@ %else %bcond_without systemv %endif +%define with_smtp %suse_version >= 1210 +%define with_geoip %suse_version >= 1210 %if %{with systemd} Provides: syslog Provides: sysvinit(syslog) @@ -61,15 +63,22 @@ Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog BuildRequires: klogd %endif +%if 0%{with_smtp} +BuildRequires: libesmtp-devel +%endif BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: glib2-devel +%if 0%{?with_geoip} +BuildRequires: libGeoIP-devel +%endif BuildRequires: libevtlog-devel BuildRequires: libjson-devel BuildRequires: libopenssl-devel BuildRequires: pcre-devel BuildRequires: pkgconfig +BuildRequires: python BuildRequires: tcpd-devel %if %{with dbi} BuildRequires: libdbi-devel @@ -109,8 +118,43 @@ %description sql This package provides the libafsql module providing support for -logging into a SQL database using DBI. To enable it, comment -out the library in %_sysconfdir/syslog-ng/modules.conf +logging into a SQL database using DBI. + +Authors: +-------- + Balázs Scheidler <[email protected]> + BalaBit IT Ltd. <[email protected]> + +%endif + +%if 0%{?with_smtp} + +%package smtp +Summary: SMTP output support +Group: System/Daemons +Requires: %{name} = %{version} + +%description smtp +This package provides the afsmtp module providing support for +logging into SMTP. + +Authors: +-------- + Balázs Scheidler <[email protected]> + BalaBit IT Ltd. <[email protected]> + +%endif + +%if 0%{?with_geoip} + +%package geoip +Summary: GeoIP support +Group: System/Daemons +Requires: %{name} = %{version} + +%description geoip +This package provides the tfgeoip module providing support for +logging country information. Authors: -------- @@ -126,8 +170,7 @@ %description json This package provides the tfjson module providing support for -logging in JSON format. To enable it, comment out the library -in %_sysconfdir/syslog-ng/modules.conf +logging in JSON format. Authors: -------- @@ -158,6 +201,9 @@ ## build #################################################### ## export CFLAGS="$RPM_OPT_FLAGS" +%if 0%{?with_geoip} +export GEOIP_LIBS="-lGeoIP" +%endif %configure \ --enable-ipv6 \ --enable-tcp-wrapper \ @@ -172,6 +218,9 @@ --without-compile-date \ --enable-ssl \ --enable-pcre \ +%if 0%{?with_smtp} + --with-libesmtp=/usr/lib \ +%endif %if %{with systemd} --enable-systemd \ %endif @@ -180,6 +229,11 @@ %endif --enable-json \ --enable-capabilities \ + --enable-amqp \ +%if 0%{?with_geoip} + --enable-geoip \ +%endif + --enable-mongodb \ --enable-dynamic-linking # # - build syslog-ng @@ -321,8 +375,15 @@ chmod 640 "${additional_sockets#/}" # # Enable the syslog-ng systemd service +# %if %{with systemd} && ! %{with systemv} +# This macro enables based on a systemctl preset config file only %{service_add_post syslog-ng.service} +# But we want to enable a syslog-daemon regardless of the preset; +# force the creation of a syslog.service alias link (bnc#790805). +# We do not check the obsolete SYSLOG_DAEMON variable as we want +# to switch when installing it and there is a provider conflict. +/usr/bin/systemctl -f enable syslog-ng.service >/dev/null 2>&1 || : %endif %preun @@ -332,7 +393,9 @@ %if %{with systemd} && ! %{with systemv} %{service_del_preun syslog-ng.service} %else -%{stop_on_removal syslog} +if test -x /etc/init.d/syslog ; then + %{stop_on_removal syslog} +fi # # reset SYSLOG_DAEMON variable on removal # @@ -360,7 +423,9 @@ # # stop the rsyslogd daemon when it is running # -%{restart_on_update syslog} +if test -x /etc/init.d/syslog ; then + %{restart_on_update syslog} +fi # # cleanup init scripts # @@ -397,7 +462,6 @@ %dir %{_datadir}/syslog-ng/xsd %dir %{_sysconfdir}/syslog-ng %config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf -%config(noreplace) %{_sysconfdir}/syslog-ng/modules.conf %config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf %if %{with systemd} && ! %{with systemv} %{_unitdir}/syslog-ng.service @@ -407,6 +471,7 @@ %attr(0644,root,root) %ghost %{syslog_ng_sockets_cfg} %{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ng %attr(755,root,root) %{_libdir}/libsyslog-ng*.so* +%attr(755,root,root) %{_libdir}/syslog-ng/libafamqp.so %attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so %attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so %attr(755,root,root) %{_libdir}/syslog-ng/libafmongodb.so @@ -414,14 +479,13 @@ %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/libconvertfuncs.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/libdummy.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(755,root,root) %{_datadir}/syslog-ng/include/scl/system/generate-system-source.sh %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 @@ -439,7 +503,25 @@ %files json %defattr(-,root,root) -%dir /usr/%_lib/syslog-ng -%attr(755,root,root) %{_libdir}/syslog-ng/libtfjson.so +%dir %{_libdir}/syslog-ng +%attr(755,root,root) %{_libdir}/syslog-ng/libjson-plugin.so + +%if 0%{?with_smtp} + +%files smtp +%defattr(-,root,root) +%dir %{_libdir}/syslog-ng +%attr(755,root,root) %{_libdir}/syslog-ng/libafsmtp.so + +%endif + +%if 0%{?with_geoip} + +%files geoip +%defattr(-,root,root) +%dir %{_libdir}/syslog-ng +%attr(755,root,root) %{_libdir}/syslog-ng/libtfgeoip.so + +%endif %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
