Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/frogatto/PKGBUILD
	community/python-psycopg2/PKGBUILD
	core/libtirpc/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gperf/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kismet/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mutt/PKGBUILD
	extra/obconf/PKGBUILD
	extra/opensp/PKGBUILD
	extra/qt3/PKGBUILD
	extra/re2c/PKGBUILD
	extra/samba/PKGBUILD
	extra/sharutils/PKGBUILD
	extra/wireshark/PKGBUILD

2 files changed, 60 insertions, 42 deletions

diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD
index 19ec03d1c..164496502 100644
--- a/core/syslog-ng/PKGBUILD
+++ b/core/syslog-ng/PKGBUILD
@@ -1,58 +1,52 @@
-# $Id: PKGBUILD 114715 2011-03-15 15:44:12Z tpowa $
+# $Id: PKGBUILD 123085 2011-05-08 03:28:44Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=syslog-ng
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap')
+depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk')
 makedepends=('flex' 'pkg-config')
 optdepends=('logrotate: for rotating log files')
 provides=('logger')
 options=('!libtool')
-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
-        cap_syslog.patch)
-md5sums=('ed8ebe559d52a63fb61e3e2db566643f' '344dddfff946300f5576b13a7e8ea19f'\
-         '735636090be4582885974542d2a75855' 'b90f8f1ba0433e5a1518ac30f882560a')
-sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6' 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'\
-         'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' '253e59f4182fba46aea56bebc4b79a199fae32bc')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    # fix #22555 for kernels >=2.6.38
-    patch -Np1 -i ../cap_syslog.patch 
-    ./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
-    make
-}
-
-package() {
-    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"
-}
-md5sums=('ed8ebe559d52a63fb61e3e2db566643f'
+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 cap_syslog.patch)
+md5sums=('5995f7dad0053a478b60a63f6f754203'
          '344dddfff946300f5576b13a7e8ea19f'
          '735636090be4582885974542d2a75855'
-         'b90f8f1ba0433e5a1518ac30f882560a'
+         '8b4441343d859c2f01c2cf799a7e6f98'
          '46e5dcff71f820d497898331a3f608fe')
-sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6'
+sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
           'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'
           'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-          '253e59f4182fba46aea56bebc4b79a199fae32bc'
+          '4481819762fd1b6f25903016a8878e63c0058fcb'
           'f093a09626a528d23f0f2aeece018cab15a735a9')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+# fix #22555 for kernels >=2.6.38
+  patch -p1 -i ../cap_syslog.patch 
+  ./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
+  make
+}
+
+package() {
+  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"
+}
diff --git a/core/syslog-ng/syslog-ng.rc b/core/syslog-ng/syslog-ng.rc
index fbd41fc7b..bb5320b2c 100755
--- a/core/syslog-ng/syslog-ng.rc
+++ b/core/syslog-ng/syslog-ng.rc
@@ -3,10 +3,20 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+checkconfig() {
+    syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
+    if [ $? -gt 0 ]; then
+	stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)."
+	stat_fail
+        exit 0
+    fi
+}
+
 PID=`pidof -o %PPID /usr/sbin/syslog-ng`
 case "$1" in
   start)
     stat_busy "Starting Syslog-NG"
+    checkconfig
     [ -z "$PID" ] && /usr/sbin/syslog-ng
     if [ $? -gt 0 ]; then
       stat_fail
@@ -17,7 +27,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Syslog-NG"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -28,12 +38,26 @@ case "$1" in
       stat_done
     fi
     ;;
+  reload)
+    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
+    if [ -z "$PID" ]; then
+      stat_fail
+    else
+      checkconfig
+      kill -HUP $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        stat_done
+      fi
+    fi
+    ;;
   restart)
     $0 stop
     sleep 1
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart|reload}"  
 esac
 exit 0