rpms
/
syslog-ng
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 3.19.1

This commit is contained in:
My Karlsson 2019-02-02 15:34:33 +01:00
parent f5c6b00b93
commit 513fb54613
5 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ syslog-ng_3.1.1.tar.gz
/syslog-ng-3.17.1.tar.gz
/syslog-ng-3.17.2.tar.gz
/syslog-ng-3.18.1.tar.gz
/syslog-ng-3.19.1.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (syslog-ng-3.18.1.tar.gz) = 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
SHA512 (syslog-ng-3.19.1.tar.gz) = f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57

29
syslog-ng-3.18.1-1663936-use-after-free.patch
View File

@ -1,29 +0,0 @@
diff -ur syslog-ng-3.18.1.orig/modules/affile/affile-dest.c syslog-ng-3.18.1/modules/affile/affile-dest.c
--- syslog-ng-3.18.1.orig/modules/affile/affile-dest.c 2018-10-17 12:06:08.000000000 +0200
+++ syslog-ng-3.18.1/modules/affile/affile-dest.c 2019-01-07 20:56:23.946756461 +0100
@@ -127,21 +127,22 @@
affile_dw_reap(gpointer s)
{
AFFileDestWriter *self = (AFFileDestWriter *) s;
+ AFFileDestDriver *owner = self->owner;
main_loop_assert_main_thread();
- g_static_mutex_lock(&self->owner->lock);
+ g_static_mutex_lock(&owner->lock);
if (!log_writer_has_pending_writes((LogWriter *) self->writer) && !self->queue_pending)
{
msg_verbose("Destination timed out, reaping",
evt_tag_str("template", self->owner->filename_template->template),
evt_tag_str("filename", self->filename));
affile_dd_reap_writer(self->owner, self);
- g_static_mutex_unlock(&self->owner->lock);
+ g_static_mutex_unlock(&owner->lock);
}
else
{
- g_static_mutex_unlock(&self->owner->lock);
+ g_static_mutex_unlock(&owner->lock);
affile_dw_arm_reaper(self);
}
}

2
syslog-ng.conf
View File

@ -1,4 +1,4 @@
@version:3.18
@version: 3.19
@include "scl.conf"
# syslog-ng configuration file.

118
syslog-ng.spec
View File

@ -1,14 +1,14 @@
%global ivykis_ver 0.42.3
%global syslog_ng_major_ver 3
%global syslog_ng_minor_ver 18
%global syslog_ng_minor_ver 19
%global syslog_ng_patch_ver 1
%global syslog_ng_major_minor_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver}
%global syslog_ng_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver}.%{syslog_ng_patch_ver}
Name: syslog-ng
Version: %{syslog_ng_ver}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Next-generation syslog server
License: GPLv2+
@ -18,47 +18,35 @@ Source1: syslog-ng.conf
Source2: syslog-ng.logrotate
Source3: syslog-ng.service
# https://github.com/balabit/syslog-ng/issues/2454
Patch1: syslog-ng-3.18.1-1663936-use-after-free.patch
BuildRequires: perl-generators
BuildRequires: systemd-units
BuildRequires: pkgconfig
BuildRequires: libtool
BuildRequires: bison, flex
BuildRequires: libxslt
BuildRequires: glib2-devel
BuildRequires: bison
BuildRequires: cyrus-sasl-devel
BuildRequires: flex
BuildRequires: GeoIP-devel
BuildRequires: glib2-devel >= 2.10.1
BuildRequires: hiredis-devel
BuildRequires: ivykis-devel >= %{ivykis_ver}
BuildRequires: java-devel
BuildRequires: json-c-devel
BuildRequires: libcap-devel
BuildRequires: libdbi-devel
BuildRequires: libnet-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: libuuid-devel
BuildRequires: libesmtp-devel
BuildRequires: mongo-c-driver-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: GeoIP-devel
BuildRequires: systemd-devel
BuildRequires: hiredis-devel
BuildRequires: riemann-c-client-devel
BuildRequires: java-devel
BuildRequires: libcurl-devel
BuildRequires: snappy-devel
BuildRequires: libdbi-devel
BuildRequires: libesmtp-devel
BuildRequires: libmaxminddb-devel
BuildRequires: libnet-devel
BuildRequires: librabbitmq-devel
# Test suite
BuildRequires: python2-devel
BuildRequires: python2-unittest2
BuildRequires: python2-nose
BuildRequires: python2-ply
BuildRequires: python2-pep8
BuildRequires: pylint
BuildRequires: python2-six
# Test suite: the SQL tests
BuildRequires: libdbi-dbd-sqlite
BuildRequires: libtool
BuildRequires: libuuid-devel
BuildRequires: libxslt
BuildRequires: mongo-c-driver-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 6.1
BuildRequires: perl-generators
BuildRequires: pkgconfig
BuildRequires: python3-devel
BuildRequires: riemann-c-client-devel
BuildRequires: snappy-devel
BuildRequires: systemd-devel
BuildRequires: systemd-units
BuildRequires: /usr/bin/pathfix.py
@ -78,6 +66,7 @@ Conflicts: filesystem < 3
Obsoletes: syslog-ng-json < 3.8
%description
syslog-ng is an enhanced log daemon, supporting a wide range of input and
output methods: syslog, unstructured text, message queues, databases (SQL
@ -118,13 +107,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description smtp
This module supports sending e-mail alerts through an smtp server.
%package java
Summary: Java destination support for syslog-ng
Requires: %{name} = %{version}
Summary: Java destination support for syslog-ng
Requires: %{name}%{?_isa} = %{version}-%{release}
%description java
This package provides java destination support for syslog-ng.
%package geoip
Summary: geoip support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -141,6 +132,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description redis
This module supports the redis key-value store via hiredis.
%package riemann
Summary: riemann support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -148,6 +140,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description riemann
This module supports the riemann monitoring server.
%package http
Summary: http support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -156,6 +149,7 @@ Obsoletes: %{name}-curl < 3.10
%description http
This module supports the http destination.
%package amqp
Summary: AMQP support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -163,6 +157,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description amqp
This module supports the AMQP destination.
%package python
Summary: Python support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description python
This module supports the Python destination.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -191,12 +194,12 @@ rm -rf modules/afmongodb/mongo-c-driver
%{__mv} -f AUTHORS.conv AUTHORS
# Fix python shebang
pathfix.py -pni "%{__python2} %{py2_shbang_opts}" lib/merge-grammar.py
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" lib/merge-grammar.py
%build
export GEOIP_LIBS=-lGeoIP
export PYTHON=%{__python2}
export PYTHON=%{__python3}
%configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}/%{name} \
@ -222,16 +225,11 @@ export PYTHON=%{__python2}
--enable-systemd \
--enable-redis \
--enable-amqp \
--disable-python \
--enable-python=3 \
--enable-java \
--disable-java-modules \
--enable-riemann
# remove rpath
#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{_smp_mflags}
@ -270,16 +268,16 @@ find %{buildroot} -name "*.la" -exec rm -f {} \;
# remove some extra testing related files
rm %{buildroot}%{_unitdir}/%{name}@.service
# %check
# LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
%post
ldconfig
%systemd_post syslog-ng.service
%preun
%systemd_preun syslog-ng.service
%postun
ldconfig
%systemd_postun_with_restart syslog-ng.service
@ -297,10 +295,12 @@ VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 |
cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
ln -sf ../../../%{name}/syslog-ng.vim . || :
%triggerun -- vim-common
VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
[ $2 = 0 ] && rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
%triggerpostun -- vim-common
VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@ -362,6 +362,7 @@ fi
%exclude %{_libdir}/syslog-ng/libgeoip-plugin.so
%exclude %{_libdir}/syslog-ng/libhttp.so
%exclude %{_libdir}/syslog-ng/libmod-java.so
%exclude %{_libdir}/syslog-ng/libmod-python.so
%exclude %{_libdir}/syslog-ng/libredis.so
%exclude %{_libdir}/syslog-ng/libriemann.so
@ -383,36 +384,52 @@ fi
%{_mandir}/man5/syslog-ng.conf.5*
%{_mandir}/man8/syslog-ng.8*
%files libdbi
%{_libdir}/syslog-ng/libafsql.so
%files mongodb
%{_libdir}/syslog-ng/libafmongodb.so
%files redis
%{_libdir}/syslog-ng/libredis.so
%files smtp
%{_libdir}/syslog-ng/libafsmtp.so
%files java
%attr(755,root,root) %{_libdir}/syslog-ng/libmod-java.so
%dir %{_libdir}/syslog-ng/java-modules/
%{_libdir}/syslog-ng/java-modules/*
%files geoip
%{_libdir}/syslog-ng/libgeoip-plugin.so
%{_libdir}/syslog-ng/libgeoip2-plugin.so
%files riemann
%{_libdir}/syslog-ng/libriemann.so
%files http
%{_libdir}/syslog-ng/libhttp.so
%files amqp
%{_libdir}/syslog-ng/libafamqp.so
%files python
%{_libdir}/syslog-ng/libmod-python.so
%{python3_sitelib}/syslogng/
%{python3_sitelib}/syslogng-*.egg-info
%files devel
%{_datadir}/syslog-ng/tools/
%{_includedir}/syslog-ng/
@ -427,6 +444,9 @@ fi
%changelog
* Sat Feb 02 2019 My Karlsson <mk@acc.umu.se> - 3.19.1-1
- Update to version 3.19.1
* Mon Jan 07 2019 My Karlsson <mk@acc.umu.se> - 3.18.1-2
- Backport fix for use after free in affile_dw_reap (rhbz#1663936)