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

[Allan McRae]

    Date: Friday, December 3, 2010 @ 08:15:48
  Author: allan
Revision: 101990

upgpkg: syslog-ng 3.2.1-1
upstream update, re-enable capabilities as fixed upstream

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

-------------------+
 PKGBUILD          |   26 ++++++++++----------------
 syslog-ng.conf    |    2 +-
 syslog-ng.install |   10 ----------
 3 files changed, 11 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-03 13:12:07 UTC (rev 101989)
+++ PKGBUILD	2010-12-03 13:15:48 UTC (rev 101990)
@@ -3,44 +3,37 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=syslog-ng
-pkgver=3.1.2
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl')
+depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap')
 makedepends=('flex' 'pkgconfig')
 optdepends=('logrotate')
 provides=('logger')
-backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+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
         syslog-ng.conf
         syslog-ng.logrotate
         syslog-ng.rc)
-install=syslog-ng.install
-md5sums=('b9f45d9783a4ebeb84ec5acd158502fb'
-         'e02be6637d0c3b5484d4597ce049ae39'
+md5sums=('c0160053e24a0408d08bbfd454b110df'
+         '08662e1ebb848f25e336c2588dc81261'
          '735636090be4582885974542d2a75855'
          '9bd98250cfa49e13fa3fa731b6040549')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
 
-    # NOTE - re-assess this with later releases
-    # FS#15787: syslog-ng does not write to files not owned by root
-    # Upstream: https://bugzilla.balabit.com/show_bug.cgi?id=52
-    # Solution: --disable-linux-caps
-
-    LDFLAGS="$LDFLAGS -Wl,--no-undefined" ./configure \
-                --prefix=/usr \
+    ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --localstatedir=/var/lib/syslog-ng \
                 --enable-tcp-wrapper \
                 --with-pidfile-dir=/var/run \
-                --disable-spoof-source \
-                --disable-linux-caps
+                --disable-spoof-source
     make
 }
 
@@ -51,6 +44,7 @@
     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
-    rm -rf $pkgdir/usr/libexec
+    rmdir $pkgdir/usr/libexec
 }

Modified: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2010-12-03 13:12:07 UTC (rev 101989)
+++ syslog-ng.conf	2010-12-03 13:15:48 UTC (rev 101990)
@@ -1,4 +1,4 @@
- at version: 3.0
+ at version: 3.2
 #
 # /etc/syslog-ng.conf
 #

Deleted: syslog-ng.install
===================================================================
--- syslog-ng.install	2010-12-03 13:12:07 UTC (rev 101989)
+++ syslog-ng.install	2010-12-03 13:15:48 UTC (rev 101990)
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 2.1.3-3)" -lt 0 -a -e /etc/syslog-ng.conf.pacnew ]; then
-    echo "Attention syslog-ng update:"
-    echo "Configuration file syntax has changed. Make sure to update /etc/syslog-ng.conf"
-
-  fi
-}