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

[Eric Bélanger]

    Date: Wednesday, February 9, 2011 @ 12:44:22
  Author: eric
Revision: 109435

upgpkg: syslog-ng 3.2.2-1
Upstream update, Updated backup array, Added optdepends reason, Fixed incorrect and duplicate entries in syslog-ng.conf (close FS#22269), Created /dev/log as a unix-dgram socket instead of stream (close FS#22153), Moved config files to /etc/syslog-ng/ (close FS#22089)

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

----------------+
 PKGBUILD       |   41 ++++++++++++++++++-----------------------
 syslog-ng.conf |    7 +++----
 2 files changed, 21 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-09 17:11:00 UTC (rev 109434)
+++ PKGBUILD	2011-02-09 17:44:22 UTC (rev 109435)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=syslog-ng
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -11,26 +11,24 @@
 groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
 depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap')
-makedepends=('flex' 'pkgconfig')
-optdepends=('logrotate')
+makedepends=('flex' 'pkg-config')
+optdepends=('logrotate: for rotating log files')
 provides=('logger')
 options=('!libtool')
-backup=('etc/modules.conf' 'etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz
         syslog-ng.conf
         syslog-ng.logrotate
         syslog-ng.rc)
-md5sums=('c0160053e24a0408d08bbfd454b110df'
-         '08662e1ebb848f25e336c2588dc81261'
-         '735636090be4582885974542d2a75855'
-         '9bd98250cfa49e13fa3fa731b6040549')
+md5sums=('ed8ebe559d52a63fb61e3e2db566643f' '344dddfff946300f5576b13a7e8ea19f'\
+         '735636090be4582885974542d2a75855' '9bd98250cfa49e13fa3fa731b6040549')
+sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6' 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'\
+         'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' '65ba6f0b92b8acc8ec97bb381762f5fbef4d1beb')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var/lib/syslog-ng \
+    cd "$srcdir/$pkgname-$pkgver"
+    ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
+                --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
                 --enable-tcp-wrapper \
                 --with-pidfile-dir=/var/run \
                 --disable-spoof-source
@@ -38,13 +36,10 @@
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
-    install -dm755 $pkgdir/var/lib/syslog-ng
-    install -Dm644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf
-    install -Dm644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng
-    install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
-
-    # remove libexec
-    rmdir $pkgdir/usr/libexec
+    cd "$srcdir/$pkgname-$pkgver"
+    make 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"
+    install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
 }

Modified: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2011-02-09 17:11:00 UTC (rev 109434)
+++ syslog-ng.conf	2011-02-09 17:44:22 UTC (rev 109435)
@@ -1,6 +1,6 @@
 @version: 3.2
 #
-# /etc/syslog-ng.conf
+# /etc/syslog-ng/syslog-ng.conf
 #
 
 options {
@@ -18,7 +18,7 @@
 };
 
 source src {
-  unix-stream("/dev/log");
+  unix-dgram("/dev/log");
   internal();
   file("/proc/kmsg");
 };
@@ -55,8 +55,7 @@
 filter f_mail { facility(mail); };
 filter f_news { facility(news); };
 filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-filter f_news { facility(news); };
+filter f_uucp { facility(uucp); };
 filter f_ppp { facility(local2); };
 filter f_debug { not facility(auth, authpriv, news, mail); };
 filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };