version 3.10.1-1

3 files changed, 12 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58ef12591d9c..4bf0d8461eda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun May 14 05:50:53 UTC 2017
+# Wed Jul  5 12:46:14 UTC 2017
 pkgbase = syslog-ng-nosystemd
 	pkgdesc = Next-generation syslogd with advanced networking and filtering capabilities
-	pkgver = 3.9.1
-	pkgrel = 3
+	pkgver = 3.10.1
+	pkgrel = 1
 	url = http://www.balabit.com/network-security/syslog-ng/
 	arch = i686
 	arch = x86_64
@@ -28,7 +28,7 @@ pkgbase = syslog-ng-nosystemd
 	optdepends = curl: for the HTTP module
 	optdepends = libmongoc: for the MongoDB plugin
 	optdepends = syslog-ng-openrc: syslog-ng openrc initscript
-	provides = syslog-ng=3.9.1
+	provides = syslog-ng=3.10.1
 	conflicts = syslog-ng
 	conflicts = syslog-ng-eudev
 	replaces = syslog-ng
@@ -37,15 +37,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.9.1/syslog-ng-3.9.1.tar.gz
-	source = https://github.com/balabit/syslog-ng/commit/2251fa7a.patch
+	source = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.10.1/syslog-ng-3.10.1.tar.gz
 	source = syslog-ng.conf
 	source = syslog-ng.conf.d
 	source = syslog-ng.logrotate
 	source = syslog-ng.rc
-	sha1sums = 1ca437393d8895654452bef8ac0b996fe73284f8
-	sha1sums = 0959825af29e21e60c11ef21823dd166353c7491
-	sha1sums = 273990d01e1f044dc090bba8098161dc12dd24ea
+	sha1sums = 2325da17d9b6837aae8484ef3b8d5a25ee992ee9
+	sha1sums = 09b4ae56d083fdae3f8310f0a374dfe7f339a5bf
 	sha1sums = eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd
 	sha1sums = 949128fe3d7f77a7aab99048061f885bc758000c
 	sha1sums = 38bf100961fb1858b1c42d3851ffdf92afb74db6
diff --git a/PKGBUILD b/PKGBUILD
index 62e54ec84523..09c4041f181e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng-nosystemd
-pkgver=3.9.1
-pkgrel=3
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -26,29 +26,16 @@ backup=('etc/syslog-ng/scl.conf'
         'etc/conf.d/initscripts/syslog-ng'
         'etc/logrotate.d/syslog-ng')
 source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/syslog-ng-$pkgver.tar.gz
-        https://github.com/balabit/syslog-ng/commit/2251fa7a.patch
         syslog-ng.conf
         syslog-ng.conf.d
         syslog-ng.logrotate
         syslog-ng.rc)
-sha1sums=('1ca437393d8895654452bef8ac0b996fe73284f8'
-          '0959825af29e21e60c11ef21823dd166353c7491'
-          '273990d01e1f044dc090bba8098161dc12dd24ea'
+sha1sums=('2325da17d9b6837aae8484ef3b8d5a25ee992ee9'
+          '09b4ae56d083fdae3f8310f0a374dfe7f339a5bf'
           'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
           '949128fe3d7f77a7aab99048061f885bc758000c'
           '38bf100961fb1858b1c42d3851ffdf92afb74db6')
 
-prepare() {
-  cd "syslog-ng-$pkgver"
-
-  # Fix segfault in X509_STORE_CTX_get_app_data(ctx) https://github.com/balabit/syslog-ng/issues/1310
-  patch -p1 -i ../2251fa7a.patch
-
-  # Fix test failure
-  sed -e "s|'invalid_length_specification'|\“invalid_length_specification\”|" \
-    -i modules/cryptofuncs/tests/test_cryptofuncs.c
-}
-
 build() {
   cd "syslog-ng-$pkgver"
 
diff --git a/syslog-ng.conf b/syslog-ng.conf
index e8d6978ab158..93bb4fef61ae 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.9
+@version: 3.10
 @include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf