version 3.5.2-1

3 files changed, 21 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37c06b2ad898..fadc5b6a6b04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = syslog-ng-nosystemd
 	pkgdesc = Next-generation syslogd with advanced networking and filtering capabilities
-	pkgver = 3.6.2
+	pkgver = 3.5.2
 	pkgrel = 1
 	url = http://www.balabit.com/network-security/syslog-ng/
 	arch = i686
 	arch = x86_64
-	groups = eudev-base
 	license = GPL2
 	license = LGPL2.1
 	makedepends = flex
@@ -16,27 +15,23 @@ pkgbase = syslog-ng-nosystemd
 	depends = eventlog
 	depends = glib2
 	depends = libcap
-	depends = libdbi
-	depends = pcre
+	depends = openssl
 	depends = udev
 	optdepends = logrotate: for rotating log files
-	optdepends = syslog-ng-openrc: syslog-ng openrc initscript
-	provides = syslog-ng=3.6.2
+	provides = syslog-ng=3.5.2
 	conflicts = syslog-ng
-	conflicts = syslog-ng-eudev
 	replaces = syslog-ng
-	replaces = syslog-ng-eudev
 	backup = etc/syslog-ng/scl.conf
 	backup = etc/syslog-ng/syslog-ng.conf
 	backup = etc/conf.d/syslog-ng
 	backup = etc/logrotate.d/syslog-ng
-	source = http://www.balabit.com/downloads/files/syslog-ng/sources/3.6.2/source/syslog-ng_3.6.2.tar.gz
+	source = http://www.balabit.com/downloads/files/syslog-ng/sources/3.5.2/source/syslog-ng_3.5.2.tar.gz
 	source = syslog-ng.conf
 	source = syslog-ng.conf.d
 	source = syslog-ng.logrotate
 	source = syslog-ng.rc
-	sha1sums = 36eeaf920383ee8cb1c17d945205b7562f9fbbb2
-	sha1sums = 3e7ec4f3f68265aaa98f37338f801c5c22b85c17
+	sha1sums = f0c91e14ee1f691cf680daf942d84ed87e5469c0
+	sha1sums = d270d6fbe7338d4ecb4d0f27c40882078116d95b
 	sha1sums = eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd
 	sha1sums = 949128fe3d7f77a7aab99048061f885bc758000c
 	sha1sums = 94af81a84e3add6653755122cdd5080694de059d
diff --git a/PKGBUILD b/PKGBUILD
index 0ccc1549fc8f..b43528dffdb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,37 +4,36 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng-nosystemd
-pkgver=3.6.2
+_realname=syslog-ng
+pkgver=3.5.2
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
-groups=('eudev-base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('awk' 'eventlog' 'glib2' 'libcap' 'libdbi' 'pcre' 'udev')
+depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'udev')
 makedepends=('flex' 'pkg-config' 'python2' 'libxslt')
-optdepends=('logrotate: for rotating log files'
-            'syslog-ng-openrc: syslog-ng openrc initscript')
+optdepends=('logrotate: for rotating log files')
 provides=("syslog-ng=${pkgver}")
-replaces=('syslog-ng' 'syslog-ng-eudev')
-conflicts=('syslog-ng' 'syslog-ng-eudev')
+replaces=('syslog-ng')
+conflicts=('syslog-ng')
 backup=('etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
         'etc/conf.d/syslog-ng'
         'etc/logrotate.d/syslog-ng')
-source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/syslog-ng_$pkgver.tar.gz"
+source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${_realname}_$pkgver.tar.gz"
         syslog-ng.conf
         syslog-ng.conf.d
         syslog-ng.logrotate
-        syslog-ng.rc)
-sha1sums=('36eeaf920383ee8cb1c17d945205b7562f9fbbb2'
-          '3e7ec4f3f68265aaa98f37338f801c5c22b85c17'
+	syslog-ng.rc)
+sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0'
+          'd270d6fbe7338d4ecb4d0f27c40882078116d95b'
           'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
           '949128fe3d7f77a7aab99048061f885bc758000c'
           '94af81a84e3add6653755122cdd5080694de059d')
 
 build() {
-  cd "syslog-ng-$pkgver"
+  cd "$_realname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -46,14 +45,13 @@ build() {
     --with-pidfile-dir=/run \
     --disable-spoof-source \
     --enable-ipv6 \
-    --enable-sql \
     --disable-systemd
 
   make
 }
 
 package() {
-  make -C "syslog-ng-$pkgver" DESTDIR="$pkgdir" install
+  make -C "$_realname-$pkgver" DESTDIR="$pkgdir" install
 
   install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
   install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
diff --git a/syslog-ng.conf b/syslog-ng.conf
index f2bc6a7352bb..e62134d9928c 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,5 +1,4 @@
-@version: 3.6
-@include "scl.conf"
+@version: 3.5
 #
 # /etc/syslog-ng/syslog-ng.conf
 #
@@ -19,8 +18,9 @@ options {
 };
 
 source src {
-  system();
+  unix-dgram("/dev/log");
   internal();
+  file("/proc/kmsg");
 };
 
 destination d_authlog { file("/var/log/auth.log"); };