Hello community,
here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2015-09-11 09:04:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-03-27 09:41:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.syslog-ng.new/syslog-ng.changes 2015-09-11 09:04:26.000000000 +0200
@@ -1,0 +2,20 @@
+Mon Sep 7 15:40:13 CEST 2015 - czanik@balabit.hu
+- update to syslog-ng 3.7.1
+- for a detailed changelog, see upstream at:
+ https://github.com/balabit/syslog-ng/releases/tag/syslog-ng-3.7.1
+ and
+ https://github.com/balabit/syslog-ng/releases/tag/syslog-ng-3.6.1
+- FYI: no java support due to lack of gradle
+- follow geoip modul name change (tfgeoip -> geoip-plugin)
+- add libkvformat.so
+- remove notls workaround (openssl is now a hard dependency)
+- add python support
+- update version in syslog-ng.conf
+- move json support to core
+
+- tmp patch to fix compilation on SLES11:
+ e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch
+- SLES notes: some core dependencies are missing, so you need to
+ build in your home repo and have json, libevtlog from Factory
+
+-------------------------------------------------------------------
Old:
----
syslog-ng_3.5.6.tar.gz
New:
----
e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch
syslog-ng-3.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.TwMHrd/_old 2015-09-11 09:04:27.000000000 +0200
+++ /var/tmp/diff_new_pack.TwMHrd/_new 2015-09-11 09:04:27.000000000 +0200
@@ -23,34 +23,40 @@
%define syslog_ng_rundir %{_localstatedir}/run/syslog-ng
%endif
%define syslog_ng_sockets_cfg %{syslog_ng_rundir}/additional-log-sockets.conf
-Version: 3.5.6
+Version: 3.7.1
Release: 0
Summary: The new-generation syslog-daemon
License: GPL-2.0
Group: System/Daemons
-Url: http://www.balabit.com/products/syslog_ng/
-#Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/%%{version}/source/syslog-ng_%%{version}.tar.gz
-Source0: syslog-ng_%{version}.tar.gz
+Url: http://syslog-ng.org/
+#Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
+Source0: syslog-ng-%{version}.tar.gz
Source1: syslog-ng.sysconfig
Source2: syslog-ng.conf.default
Source3: syslog-ng.service
Source4: syslog-ng-service-prepare
+Patch0: e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch
+
%if 0%{?suse_version} >= 1210
%bcond_without systemd
%bcond_without dbi
+%bcond_without python
+%bcond_without redis
%else
%bcond_with systemd
%bcond_with dbi
+%bcond_with python
%endif
+
%if 0%{?suse_version} >= 1230
%bcond_with systemv
%else
%bcond_without systemv
%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)
@@ -64,27 +70,32 @@
Requires(pre): syslog-service >= 2.0
%endif
%{?systemd_requires}
-BuildRequires: pkgconfig(systemd)
+BuildRequires: systemd-devel
%else
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
+
%if %{with redis}
BuildRequires: hiredis-devel
-%if 0%{?suse_version} < 1321
+%if 0%{?suse_version} == 1320
BuildRequires: libhiredis0_10
%endif
%endif
+
BuildRequires: libevtlog-devel
BuildRequires: libjson-devel
BuildRequires: libopenssl-devel
@@ -92,9 +103,15 @@
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: tcpd-devel
+
%if %{with dbi}
BuildRequires: libdbi-devel
%endif
+
+%if %{with python}
+BuildRequires: python-devel
+%endif
+
%if 0%{?suse_version} >= 1210
BuildRequires: libcap-devel
BuildRequires: libnet-devel
@@ -103,10 +120,7 @@
BuildRequires: libnet
%endif
-# BuildRequires: libxslt-tools
-
-# uncomment, if you want to run "make check" (local builds only)
-#BuildRequires: timezone
+#!BuildIgnore: rsyslog
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -206,19 +220,17 @@
%endif
-%package json
-Summary: JSON output support
-Group: System/Daemons
+%if %{with python}
+
+%package python
+Summary: Python destination support for syslog-ng
+Group: System/Libraries
Requires: %{name} = %{version}
-%description json
-This package provides the tfjson module providing support for
-logging in JSON format.
+%description python
+This package provides python destination support for syslog-ng.
-Authors:
---------
- Balázs Scheidler
- BalaBit IT Ltd.
+%endif
%package devel
Summary: Development files for syslog-ng
@@ -235,6 +247,7 @@
%prep
%setup -q -n syslog-ng-%{version}
+%patch0 -p1
# fill out placeholders in the config,
# systemd service and prepare script.
for file in \
@@ -260,8 +273,10 @@
%if 0%{?with_geoip}
export GEOIP_LIBS="-lGeoIP"
%endif
+export AM_YFLAGS=-d
%configure \
--enable-ipv6 \
+ --enable-manpages \
--enable-tcp-wrapper \
--enable-spoof-source \
--sysconfdir=/etc/syslog-ng \
@@ -273,7 +288,6 @@
--datadir="%{_datadir}/syslog-ng" \
--without-compile-date \
--enable-ssl \
- --enable-pcre \
%if 0%{?with_smtp}
--with-libesmtp=/usr/lib \
%endif
@@ -293,18 +307,17 @@
%if %{with redis}
--enable-redis \
%endif
+%if %{with python}
+ --enable-python \
+%else
+ --disable-python \
+%endif
--enable-dynamic-linking
#
# - build syslog-ng
#
make %_smp_mflags
-#%check
-##
-## check ####################################################
-##
-#make check
-
%install
##
## install ##################################################
@@ -341,12 +354,6 @@
# don't package update-patterndb now
rm %{buildroot}/usr/bin/update-patterndb
-# decide which to keep
-rm %{buildroot}/%{_libdir}/syslog-ng/libafsocket.so
-rm %{buildroot}/%{_libdir}/syslog-ng/libafsocket-notls.so
-mv %{buildroot}/%{_libdir}/syslog-ng/libafsocket-tls.so \
- %{buildroot}/%{_libdir}/syslog-ng/libafsocket.so
-
# create ghosts
install -d -m755 %{buildroot}%{syslog_ng_rundir}
touch %{buildroot}%{syslog_ng_sockets_cfg}
@@ -496,9 +503,9 @@
## file list ################################################
##
%defattr(-,root,root)
-%doc COPYING AUTHORS NEWS
+%doc COPYING AUTHORS NEWS.md
%doc syslog-ng.conf.default
-%attr(755,root,root) /sbin/syslog-ng
+/sbin/syslog-ng
%attr(755,root,root) %{_sbindir}/syslog-ng
%attr(755,root,root) %{_sbindir}/syslog-ng-ctl
%if %{with systemd} && ! %{with systemv}
@@ -515,10 +522,14 @@
%dir %{_datadir}/syslog-ng
%dir %{_datadir}/syslog-ng/include
%dir %{_datadir}/syslog-ng/include/scl
+%dir %{_datadir}/syslog-ng/include/scl/graphite
+%dir %{_datadir}/syslog-ng/include/scl/nodejs
%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/include/scl/cim
+%dir %{_datadir}/syslog-ng/include/scl/solaris
%dir %{_datadir}/syslog-ng/xsd
%dir %{_sysconfdir}/syslog-ng
%dir %{_sysconfdir}/syslog-ng/conf.d
@@ -531,7 +542,7 @@
%attr(0755,root,root) %dir %ghost %{syslog_ng_rundir}
%attr(0644,root,root) %ghost %{syslog_ng_sockets_cfg}
%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ng
-%attr(755,root,root) %{_libdir}/libsyslog-ng*.so*
+%{_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
@@ -544,16 +555,27 @@
%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/libgraphite.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libjson-plugin.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libkvformat.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/libpseudofile.so
+%if %{with systemd} && ! %{with systemv}
+%attr(755,root,root) %{_libdir}/syslog-ng/libsdjournal.so
+%endif
%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/graphite/README
+%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/graphite/plugin.conf
+%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/nodejs/plugin.conf
%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
%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/plugin.conf
+%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/cim/template.conf
+%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/solaris/plugin.conf
%attr(644,root,root) %{_datadir}/syslog-ng/xsd/*
%if %{with dbi}
@@ -565,15 +587,11 @@
%endif
-%files json
-%defattr(-,root,root)
-%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
+%{_libdir}/libsyslog-ng.so
%attr(644,root,root) %{_libdir}/pkgconfig/syslog-ng.pc
%dir %{_includedir}/syslog-ng
%attr(-,root,root) %{_includedir}/syslog-ng/*
@@ -581,6 +599,20 @@
%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
+%attr(755,root,root) %{_datadir}/syslog-ng/tools/system-expand
+
+%if %{with python}
+
+%files python
+%attr(755,root,root) %{_libdir}/syslog-ng/libmod-python.so
+%defattr(-,root,root)
+/usr/lib/python2.7/site-packages/syslogng-1.0-py2.7.egg-info
+%dir /usr/lib/python2.7/site-packages/syslogng
+%dir /usr/lib/python2.7/site-packages/syslogng/debuggercli
+/usr/lib/python2.7/site-packages/syslogng/*
+/usr/lib/python2.7/site-packages/syslogng/debuggercli/*
+
+%endif
%if 0%{?with_smtp}
@@ -596,7 +628,7 @@
%files geoip
%defattr(-,root,root)
%dir %{_libdir}/syslog-ng
-%attr(755,root,root) %{_libdir}/syslog-ng/libtfgeoip.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libgeoip-plugin.so
%endif
++++++ e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch ++++++
From e30fe7c3717a7bda4036448c7777747df1a4e0f9 Mon Sep 17 00:00:00 2001
From: Tibor Benke
Date: Mon, 24 Aug 2015 12:19:13 +0200
Subject: [PATCH] transport-mapper-unix: remove the second typedef of
_TransportMapperUnix
Signed-off-by: Tibor Benke
---
modules/afsocket/transport-mapper-unix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/afsocket/transport-mapper-unix.c b/modules/afsocket/transport-mapper-unix.c
index 3cb53f9..60d94e9 100644
--- a/modules/afsocket/transport-mapper-unix.c
+++ b/modules/afsocket/transport-mapper-unix.c
@@ -30,12 +30,12 @@
#include
-typedef struct _TransportMapperUnix
+struct _TransportMapperUnix
{
TransportMapper super;
gchar *filename;
gboolean pass_unix_credentials;
-} TransportMapperUnix;
+};
static LogTransport*
_create_log_transport(TransportMapper *s, gint fd)
++++++ syslog-ng.conf.default ++++++
--- /var/tmp/diff_new_pack.TwMHrd/_old 2015-09-11 09:04:27.000000000 +0200
+++ /var/tmp/diff_new_pack.TwMHrd/_new 2015-09-11 09:04:27.000000000 +0200
@@ -1,4 +1,4 @@
-@version:3.5
+@version:3.7
@include "scl.conf"
#
++++++ syslog-ng.service ++++++
--- /var/tmp/diff_new_pack.TwMHrd/_old 2015-09-11 09:04:27.000000000 +0200
+++ /var/tmp/diff_new_pack.TwMHrd/_new 2015-09-11 09:04:27.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=System Logging Service
Requires=var-run.mount
-Requires=syslog.socket
+# Requires=syslog.socket
After=var-run.mount
Conflicts=rsyslog.service syslogd.service
@@ -16,4 +16,4 @@
[Install]
WantedBy=multi-user.target
-Alias=syslog.service
+# Alias=syslog.service