diff --git a/.gitignore b/.gitignore index 5deda40..c0ceb06 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ syslog-ng_3.1.1.tar.gz /syslog-ng-3.9.1.tar.gz /syslog-ng-3.10.1.tar.gz /syslog-ng-3.11.1.tar.gz +/syslog-ng-3.14.1.tar.gz diff --git a/sources b/sources index 66c397a..aa06d34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syslog-ng-3.11.1.tar.gz) = 780fa81daaf4cf327e2b8203e89dca6a8dcf51bf01a16eab672c536eae9e28bac6d5e19c46630806b6c7ea6f3fdcfb625e733be092a360897b234f46f9ae8c51 +SHA512 (syslog-ng-3.14.1.tar.gz) = 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7 diff --git a/syslog-ng-3.11.1_json-c_013.patch b/syslog-ng-3.11.1_json-c_013.patch deleted file mode 100644 index 9e2c855..0000000 --- a/syslog-ng-3.11.1_json-c_013.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 1b824dd6389e209eab752d5a698c6093f311e3e3 -Author: Björn Esser -Date: Mon Dec 11 15:46:06 2017 +0100 - - modules/json: Adaptions for json-c v0.13 - -diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c -index 0368ed8f..356df48b 100644 ---- a/modules/json/json-parser.c -+++ b/modules/json/json-parser.c -@@ -20,6 +20,8 @@ - * COPYING for details. - */ - -+#define JSON_C_VER_013 (13 << 8) -+ - #include "json-parser.h" - #include "dot-notation.h" - #include "scratch-buffers.h" -@@ -28,7 +30,10 @@ - #include - - #include -+ -+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013) - #include -+#endif - - typedef struct _JSONParser - { diff --git a/syslog-ng.conf b/syslog-ng.conf index c1ca19c..992151d 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:3.11 +@version:3.14 @include "scl.conf" # syslog-ng configuration file. diff --git a/syslog-ng.spec b/syslog-ng.spec index 8defb63..784dfe5 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,8 +1,8 @@ -%global ivykis_ver 0.36.1 +%global ivykis_ver 0.42.2 Name: syslog-ng -Version: 3.11.1 -Release: 7%{?dist} +Version: 3.14.1 +Release: 1%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons @@ -13,9 +13,6 @@ Source1: syslog-ng.conf Source2: syslog-ng.logrotate Source3: syslog-ng.service -# Upstreamed: https://github.com/balabit/syslog-ng/pull/1810 -Patch0: syslog-ng-3.11.1_json-c_013.patch - BuildRequires: perl-generators BuildRequires: systemd-units BuildRequires: pkgconfig @@ -323,6 +320,7 @@ fi %{_bindir}/update-patterndb %{_libdir}/lib%{name}-*.so.* %{_libdir}/libevtlog-*.so.* +%{_libdir}/libsecret-storage.so.* %{_libdir}/%{name}/*.so %exclude %{_libdir}/%{name}/libafsql.so %exclude %{_libdir}/%{name}/libafmongodb.so @@ -383,6 +381,7 @@ fi %{_libdir}/libsyslog-ng.so %{_libdir}/libsyslog-ng-native-connector.a %{_libdir}/libevtlog.so +%{_libdir}/libsecret-storage.so %{_includedir}/%{name}/ %{_libdir}/pkgconfig/syslog-ng.pc %{_libdir}/pkgconfig/syslog-ng-native-connector.pc @@ -391,6 +390,9 @@ fi %changelog +* Wed Feb 28 2018 My Karlsson - 3.14.1-1 +- Update to upstream release 3.14.1 + * Wed Feb 21 2018 Iryna Shcherbina - 3.11.1-7 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)