version 3.13.2-1

3 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 780497aaa465..61ee4c8a694f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Nov 14 13:13:59 UTC 2017
+# Fri Jan  5 06:42:16 UTC 2018
 pkgbase = syslog-ng-nosystemd
 	pkgdesc = Next-generation syslogd with advanced networking and filtering capabilities
-	pkgver = 3.12.1
+	pkgver = 3.13.2
 	pkgrel = 1
 	url = http://www.balabit.com/network-security/syslog-ng/
 	arch = i686
@@ -29,8 +29,9 @@ pkgbase = syslog-ng-nosystemd
 	optdepends = curl: for the HTTP module
 	optdepends = librabbitmq-c: for the AMQP plugin
 	optdepends = libmongoc: for the MongoDB plugin
+	optdepends = python: for the Python plugin
 	optdepends = syslog-ng-openrc: syslog-ng openrc initscript
-	provides = syslog-ng=3.12.1
+	provides = syslog-ng=3.13.2
 	conflicts = syslog-ng
 	conflicts = syslog-ng-eudev
 	conflicts = eventlog
@@ -41,16 +42,18 @@ pkgbase = syslog-ng-nosystemd
 	backup = etc/syslog-ng/syslog-ng.conf
 	backup = etc/conf.d/initscripts/syslog-ng
 	backup = etc/logrotate.d/syslog-ng
-	source = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.12.1/syslog-ng-3.12.1.tar.gz
+	source = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
 	source = syslog-ng.conf
 	source = syslog-ng.conf.d
 	source = syslog-ng.logrotate
 	source = syslog-ng.rc
-	sha1sums = cc96df76ef2dd9b59a752463eca2a5370c9b3a23
-	sha1sums = fd276dd470edb16a10d96f3188e1f9c93c0d8271
-	sha1sums = eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd
-	sha1sums = 949128fe3d7f77a7aab99048061f885bc758000c
-	sha1sums = 38bf100961fb1858b1c42d3851ffdf92afb74db6
+	source = syslog-ng-json-c-0.13.patch::https://github.com/balabit/syslog-ng/commit/1b824dd6.patch
+	sha256sums = 9a3d31df93698080180057ca9bd57b59d06b74fc426c602ce102a2a5437ad3e8
+	sha256sums = 887e4d0e0a0e8d31b639215c36892d90cd32123465d685ae95bbeb0793363544
+	sha256sums = fe6ebe5c281b34bad201d9206e607857db9a5a78f03bb4dc4440584dca610f61
+	sha256sums = 93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317
+	sha256sums = c55c1d78d81f7cda543b8391aa5aaa786224071707b924d43b80749678daf452
+	sha256sums = 6c1b29e18e502ca670b8f6e519fc6f5525fc384632ea3a036167d68b7f69ccc5
 
 pkgname = syslog-ng-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f77c5b7362e..d17241a2526f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng-nosystemd
-pkgver=3.12.1
+pkgver=3.13.2
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -18,6 +18,7 @@ optdepends=('logrotate: for rotating log files'
             'curl: for the HTTP module'
             'librabbitmq-c: for the AMQP plugin'
             'libmongoc: for the MongoDB plugin'
+            'python: for the Python plugin'
             'syslog-ng-openrc: syslog-ng openrc initscript')
 provides=("syslog-ng=${pkgver}")
 replaces=('syslog-ng' 'syslog-ng-eudev' 'eventlog')
@@ -30,12 +31,20 @@ source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver
         syslog-ng.conf
         syslog-ng.conf.d
         syslog-ng.logrotate
-        syslog-ng.rc)
-sha1sums=('cc96df76ef2dd9b59a752463eca2a5370c9b3a23'
-          'fd276dd470edb16a10d96f3188e1f9c93c0d8271'
-          'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          '38bf100961fb1858b1c42d3851ffdf92afb74db6')
+        syslog-ng.rc
+        syslog-ng-json-c-0.13.patch::"https://github.com/balabit/syslog-ng/commit/1b824dd6.patch")
+sha256sums=('9a3d31df93698080180057ca9bd57b59d06b74fc426c602ce102a2a5437ad3e8'
+            '887e4d0e0a0e8d31b639215c36892d90cd32123465d685ae95bbeb0793363544'
+            'fe6ebe5c281b34bad201d9206e607857db9a5a78f03bb4dc4440584dca610f61'
+            '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317'
+            'c55c1d78d81f7cda543b8391aa5aaa786224071707b924d43b80749678daf452'
+            '6c1b29e18e502ca670b8f6e519fc6f5525fc384632ea3a036167d68b7f69ccc5')
+
+prepare() {
+  cd "syslog-ng-$pkgver"
+
+  patch -p1 -i ../syslog-ng-json-c-0.13.patch # Fix build with json-c 0.13
+}
 
 build() {
   cd "syslog-ng-$pkgver"
diff --git a/syslog-ng.conf b/syslog-ng.conf
index ed92098b3018..43140ac707bd 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.12
+@version: 3.13
 @include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf