Fri Dec 27 23:54:04 UTC 2013

1 files changed, 24 insertions, 31 deletions

diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 585357deb..3bf81bf20 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,54 +1,47 @@
-# $Id: PKGBUILD 198445 2013-10-30 14:55:06Z allan $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.4.3
+pkgver=3.5.2
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd')
-makedepends=('flex' 'pkg-config' 'python2')
+license=('GPL2' 'LGPL2.1')
+depends=('awk' 'eventlog' 'openssl' 'systemd')
+makedepends=('python2' 'libxslt')
 optdepends=('logrotate: for rotating log files')
 backup=('etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
         'etc/logrotate.d/syslog-ng')
-install=$pkgname.install
-source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
-        syslog-ng.conf
-        syslog-ng.logrotate)
-sha1sums=('70433d041b2e48c598ee7595d89ddb2e1f6450b4'
-          '0aaf695ea6756b59198ff2e4af237b4a6186525d'
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz
+        syslog-ng.conf syslog-ng.logrotate)
+sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0'
+          'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e'
           '949128fe3d7f77a7aab99048061f885bc758000c')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
+  sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service
+}
 
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc/syslog-ng \
-    --libexecdir=/usr/lib \
-    --sbindir=/usr/bin \
-    --localstatedir=/var/lib/syslog-ng \
-    --datadir=/usr/share/syslog-ng \
-    --with-pidfile-dir=/run \
-    --disable-spoof-source \
-    --enable-ipv6 \
-    --enable-systemd \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
-
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \
+    --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \
+    --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 \
+    --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }
 
+check() {
+  cd "$pkgname-$pkgver"
+  make check
+}
+
 package() {
   make -C "$pkgname-$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"
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-
-  sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
 }