From c1e95177ce1e6e871c9782b526cf375fa0de5221 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 18:17:56 +0100 Subject: [PATCH] update to 3.5.4.1 rebuilt with libjson-c-devel 0.12 [release 3.5.4.1-1mamba;Sat Jun 28 2014] --- syslog-ng-3.5.4.1-libjson-c-0.12.patch | 11 +++++++++++ syslog-ng.spec | 17 ++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 syslog-ng-3.5.4.1-libjson-c-0.12.patch diff --git a/syslog-ng-3.5.4.1-libjson-c-0.12.patch b/syslog-ng-3.5.4.1-libjson-c-0.12.patch new file mode 100644 index 0000000..5d0ab62 --- /dev/null +++ b/syslog-ng-3.5.4.1-libjson-c-0.12.patch @@ -0,0 +1,11 @@ +--- syslog-ng-3.5.4.1/modules/json/jsonparser.c.orig 2014-06-28 17:49:52.233198882 +0000 ++++ syslog-ng-3.5.4.1/modules/json/jsonparser.c 2014-06-28 17:39:58.023360106 +0000 +@@ -187,7 +187,7 @@ + if (tok->err != json_tokener_success) + { + msg_error ("Unparsable JSON stream encountered", +- evt_tag_str ("error", json_tokener_errors[tok->err]), NULL); ++ evt_tag_str ("error", json_tokener_error_desc(tok->err)), NULL); + json_tokener_free (tok); + return FALSE; + } diff --git a/syslog-ng.spec b/syslog-ng.spec index b3d8f43..7d1dae3 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,7 +1,7 @@ %define majorminor %(echo %version | cut -d. -f 1-2) Name: syslog-ng -Version: 3.5.3 +Version: 3.5.4.1 Release: 1mamba Summary: A syslogd replacement with new functionality Group: System/Servers @@ -16,24 +16,30 @@ Source3: syslog-ng.logrotate Source4: syslog-ng.sysconfig Patch0: %{name}-3.2.4-Use_CAP_SYSLOG_instead_of_CAP_SYS_ADMIN_if_available.patch Patch1: syslog-ng-3.4.1-systemd-service-fix-path.patch +Patch2: syslog-ng-3.5.4.1-libjson-c-0.12.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libGeoIP-devel BuildRequires: libcap-devel BuildRequires: libdbi-devel BuildRequires: libesmtp-devel BuildRequires: libeventlog-devel -BuildRequires: libGeoIP-devel +BuildRequires: libgcrypt-devel BuildRequires: libglib-devel +BuildRequires: libgpg-error-devel BuildRequires: libjson-c-devel +BuildRequires: liblzma-devel BuildRequires: libnet-devel BuildRequires: libopenssl-devel BuildRequires: libpcre-devel +BuildRequires: libsystemd-devel BuildRequires: libuuid-devel BuildRequires: libwrap-devel -BuildRequires: systemd-devel +BuildRequires: perl-devel ## AUTOBUILDREQ-END BuildRequires: libol-devel >= 0.3.17 +BuildRequires: libjson-c-devel >= 0.12 Obsoletes: sysklogd Provides: sysklogd = %{version} Requires: libsyslog-ng = %{?epoch:%epoch:}%{version}-%{release} @@ -75,6 +81,7 @@ This package contains static libraries and header files need for development. %setup -q #%patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ @@ -219,6 +226,10 @@ exit 0 %doc NEWS %changelog +* Sat Jun 28 2014 Silvan Calarco 3.5.4.1-1mamba +- update to 3.5.4.1 +- rebuilt with libjson-c-devel 0.12 + * Tue Jan 21 2014 Automatic Build System 3.5.3-1mamba - automatic version update by autodist