version 3.22.1-1

3 files changed, 28 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 234d450575d0..27a4e780d5af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jun 15 06:46:49 UTC 2019
+# Sun Jun 30 05:58:03 UTC 2019
 pkgbase = syslog-ng-nosystemd
 	pkgdesc = Next-generation syslogd with advanced networking and filtering capabilities
-	pkgver = 3.21.1
+	pkgver = 3.22.1
 	pkgrel = 1
 	url = https://www.syslog-ng.com/products/open-source-log-management/
 	arch = i686
@@ -13,7 +13,7 @@ pkgbase = syslog-ng-nosystemd
 	makedepends = flex
 	makedepends = pkg-config
 	makedepends = libxslt
-	makedepends = mongo-c-driver
+	makedepends = mongo-c-driver>=1.14.0-3
 	makedepends = librabbitmq-c
 	makedepends = python
 	makedepends = libesmtp
@@ -21,6 +21,7 @@ pkgbase = syslog-ng-nosystemd
 	makedepends = libdbi
 	makedepends = geoip
 	makedepends = libmaxminddb
+	makedepends = net-snmp
 	depends = awk
 	depends = glib2
 	depends = libcap
@@ -39,8 +40,9 @@ pkgbase = syslog-ng-nosystemd
 	optdepends = geoip: for the GeoIP plugin
 	optdepends = libmaxminddb: for the GeoIP2 plugin
 	optdepends = python: for Python-based plugins
+	optdepends = net-snmp: for the SNMP plugin
 	optdepends = syslog-ng-openrc: syslog-ng openrc initscript
-	provides = syslog-ng=3.21.1
+	provides = syslog-ng=3.22.1
 	conflicts = syslog-ng
 	conflicts = syslog-ng-eudev
 	conflicts = eventlog
@@ -51,13 +53,13 @@ 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.21.1/syslog-ng-3.21.1.tar.gz
+	source = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.22.1/syslog-ng-3.22.1.tar.gz
 	source = syslog-ng.conf
 	source = syslog-ng.conf.d
 	source = syslog-ng.logrotate
 	source = syslog-ng.rc
-	sha256sums = 8d163da5ad79cf3a5f043b2ed0fe18a4888d0d740542703bf2508f0b9996cd25
-	sha256sums = 9175deae0b16c0c8a501919c533695254afefd52daf1dae229077cd8f71d0cd9
+	sha256sums = 0656443776fa554320cb81bbebeac72bdf871298dd2ebef7413c393aec4d74c8
+	sha256sums = 9c5209303e4783e698b7afea0ae46095a427b091b60d398764043fc35a88cc7a
 	sha256sums = fe6ebe5c281b34bad201d9206e607857db9a5a78f03bb4dc4440584dca610f61
 	sha256sums = 93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317
 	sha256sums = db643d69e840dfd5d7849e857291f15fd60913527402fde806ce3911e3523063
diff --git a/PKGBUILD b/PKGBUILD
index ab8d26828cd1..653e5163d923 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng-nosystemd
-pkgver=3.21.1
+pkgver=3.22.1
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -12,8 +12,10 @@ license=('GPL2' 'LGPL2.1')
 groups=('eudev-base')
 url="https://www.syslog-ng.com/products/open-source-log-management/"
 depends=('awk' 'glib2' 'libcap' 'libnsl' 'udev' 'json-c' 'curl' 'libnet')
-makedepends=('flex' 'pkg-config' 'libxslt' 'mongo-c-driver' 'librabbitmq-c'
-             'python' 'libesmtp' 'hiredis' 'libdbi' 'geoip' 'libmaxminddb')
+# we need latest mongo-c-driver build to make configure version check work correctly
+makedepends=('flex' 'pkg-config' 'libxslt' 'mongo-c-driver>=1.14.0-3' 'librabbitmq-c'
+             'python' 'libesmtp' 'hiredis' 'libdbi' 'geoip' 'libmaxminddb'
+             'net-snmp')
 optdepends=('logrotate: for rotating log files'
             'libdbi: for the SQL plugin'
             'librabbitmq-c: for the AMQP plugin'
@@ -24,6 +26,7 @@ optdepends=('logrotate: for rotating log files'
             'geoip: for the GeoIP plugin'
             'libmaxminddb: for the GeoIP2 plugin'
             'python: for Python-based plugins'
+            'net-snmp: for the SNMP plugin'
             'syslog-ng-openrc: syslog-ng openrc initscript')
 provides=("syslog-ng=${pkgver}")
 replaces=('syslog-ng' 'syslog-ng-eudev' 'eventlog')
@@ -37,21 +40,21 @@ source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver
         syslog-ng.conf.d
         syslog-ng.logrotate
         syslog-ng.rc)
-sha256sums=('8d163da5ad79cf3a5f043b2ed0fe18a4888d0d740542703bf2508f0b9996cd25'
-            '9175deae0b16c0c8a501919c533695254afefd52daf1dae229077cd8f71d0cd9'
+sha256sums=('0656443776fa554320cb81bbebeac72bdf871298dd2ebef7413c393aec4d74c8'
+            '9c5209303e4783e698b7afea0ae46095a427b091b60d398764043fc35a88cc7a'
             'fe6ebe5c281b34bad201d9206e607857db9a5a78f03bb4dc4440584dca610f61'
             '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317'
             'db643d69e840dfd5d7849e857291f15fd60913527402fde806ce3911e3523063')
 
-prepare() {
-  cd "syslog-ng-$pkgver"
-
-  # the version in pkg-config is 0.0.0 and so it won't detect the flags without
-  # this. since your version is newer this is an easy fix for now, but should
-  # eventually be removed when this bug is fixed:
-  # https://bugs.archlinux.org/task/61888
-  sed -i -e 's|^LMC_MIN_VERSION="1.0.0"|LMC_MIN_VERSION="0.0.0"|' configure.ac configure
-}
+#prepare() {
+#  cd "syslog-ng-$pkgver"
+#
+#  # the version in pkg-config is 0.0.0 and so it won't detect the flags without
+#  # this. since your version is newer this is an easy fix for now, but should
+#  # eventually be removed when this bug is fixed:
+#  # https://bugs.archlinux.org/task/61888
+#  sed -i -e 's|^LMC_MIN_VERSION="1.0.0"|LMC_MIN_VERSION="0.0.0"|' configure.ac configure
+#}
 
 build() {
   cd "syslog-ng-$pkgver"
@@ -72,6 +75,7 @@ build() {
     --disable-java \
     --disable-java-modules \
     --disable-riemann \
+    --disable-kafka \
     --with-python=3 \
     --with-jsonc=system \
     --disable-systemd
diff --git a/syslog-ng.conf b/syslog-ng.conf
index f764684a804e..be35cb3013ea 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.21
+@version: 3.22
 @include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf