[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng.conf)

[Antonio Rojas]

    Date: Friday, February 24, 2017 @ 21:36:10
  Author: arojas
Revision: 289497

Update conf version, remove bad configuration snippet, fix datadir (FS#53077)

Modified:
  syslog-ng/trunk/PKGBUILD
  syslog-ng/trunk/syslog-ng.conf

----------------+
 PKGBUILD       |    9 ++++++---
 syslog-ng.conf |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-24 21:17:37 UTC (rev 289496)
+++ PKGBUILD	2017-02-24 21:36:10 UTC (rev 289497)
@@ -3,7 +3,7 @@
 
 pkgname=syslog-ng
 pkgver=3.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 url="http://www.balabit.com/network-security/syslog-ng/"
@@ -20,7 +20,7 @@
 source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
         syslog-ng.conf syslog-ng.logrotate)
 sha1sums=('1ca437393d8895654452bef8ac0b996fe73284f8'
-          '3e7ec4f3f68265aaa98f37338f801c5c22b85c17'
+          '273990d01e1f044dc090bba8098161dc12dd24ea'
           '949128fe3d7f77a7aab99048061f885bc758000c')
 
 prepare() {
@@ -31,7 +31,7 @@
 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 \
+    --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share \
     --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 --enable-sql \
     --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --enable-manpages --with-jsonc=system --with-mongoc=system
@@ -48,4 +48,7 @@
   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"
+
+# See http://lists.balabit.hu/pipermail/syslog-ng/2016-February/022667.html
+  rm -r "$pkgdir"/usr/share/syslog-ng/include/scl/cim
 }

Modified: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2017-02-24 21:17:37 UTC (rev 289496)
+++ syslog-ng.conf	2017-02-24 21:36:10 UTC (rev 289497)
@@ -1,4 +1,4 @@
- at version: 3.6
+ at version: 3.9
 @include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf