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

[Aaron Griffin]

    Date: Friday, December 12, 2008 @ 00:24:52
  Author: aaron
Revision: 21354

upgpkg: syslog-ng 2.1.3-1

Added:
  syslog-ng/trunk/syslog-ng.rc
    (from rev 21353, syslog-ng/trunk/syslog-ng)
Modified:
  syslog-ng/trunk/PKGBUILD
Deleted:
  syslog-ng/trunk/syslog-ng

--------------+
 PKGBUILD     |   47 +++++++++++++++++++++++++++++------------------
 syslog-ng    |   39 ---------------------------------------
 syslog-ng.rc |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-12 04:19:16 UTC (rev 21353)
+++ PKGBUILD	2008-12-12 05:24:52 UTC (rev 21354)
@@ -1,31 +1,42 @@
 # $Id$
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=syslog-ng
-pkgver=2.0.9
+pkgver=2.1.3
+_shortver="${pkgver%.*}"
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=(i686 x86_64)
 license=('GPL')
 groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('logrotate' 'glibc')
-makedepends=('flex' 'glib2' 'eventlog' 'pkgconfig' 'tcp_wrappers')
+depends=('glibc')
+makedepends=('flex' 'pkgconfig' 'glib2' 'eventlog' 'tcp_wrappers')
+optdepends=('logrotate')
 provides=('logger')
 backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/$pkgname-$pkgver.tar.gz \
-	syslog-ng.conf syslog-ng.logrotate syslog-ng)
-md5sums=('2d4232f7167c2b4f48794e4f8f80e863' 'ee95af3a4f969f3759e477289305c8c6'\
-         '9714c7479119922b55a7992677ebecb5' '9bd98250cfa49e13fa3fa731b6040549')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$_shortver/src/$pkgname-$pkgver.tar.gz
+        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc)
+md5sums=('e502745de194570182ad9d69c9860d7d'
+         'ee95af3a4f969f3759e477289305c8c6'
+         '9714c7479119922b55a7992677ebecb5'
+         '9bd98250cfa49e13fa3fa731b6040549')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var/lib/syslog-ng --enable-tcp-wrapper \
-    --disable-spoof-source
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -d $startdir/pkg/var/lib/syslog-ng
-  install -D -m644 ../syslog-ng.conf $startdir/pkg/etc/syslog-ng.conf
-  install -D -m644 ../syslog-ng.logrotate $startdir/pkg/etc/logrotate.d/syslog-ng
-  install -D -m755 ../syslog-ng $startdir/pkg/etc/rc.d/syslog-ng
+    cd $srcdir/$pkgname-$pkgver
+
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var/lib/syslog-ng \
+                --enable-tcp-wrapper \
+                --enable-mixed-linking \
+                --disable-spoof-source
+    make || return 1
+    make DESTDIR=$pkgdir install || return 1
+
+    mkdir -p $pkgdir/var/lib/syslog-ng
+    install -D -m644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf
+    install -D -m644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng
+    install -D -m755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
 }

Deleted: syslog-ng
===================================================================
--- syslog-ng	2008-12-12 04:19:16 UTC (rev 21353)
+++ syslog-ng	2008-12-12 05:24:52 UTC (rev 21354)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/syslog-ng`
-case "$1" in
-  start)
-    stat_busy "Starting Syslog-NG"
-    [ -z "$PID" ] && /usr/sbin/syslog-ng
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/syslog-ng.pid
-#     Removing stale syslog-ng.persist file. It's new location, as of 2.0.6-1, is /var/lib/syslog-ng/
-      rm -f /var/syslog-ng.persist
-      rm_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Copied: syslog-ng/trunk/syslog-ng.rc (from rev 21353, syslog-ng/trunk/syslog-ng)
===================================================================
--- syslog-ng.rc	                        (rev 0)
+++ syslog-ng.rc	2008-12-12 05:24:52 UTC (rev 21354)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/syslog-ng`
+case "$1" in
+  start)
+    stat_busy "Starting Syslog-NG"
+    [ -z "$PID" ] && /usr/sbin/syslog-ng
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon syslog-ng
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Syslog-NG"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/syslog-ng.pid
+#     Removing stale syslog-ng.persist file. It's new location, as of 2.0.6-1, is /var/lib/syslog-ng/
+      rm -f /var/syslog-ng.persist
+      rm_daemon syslog-ng
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0


Property changes on: syslog-ng/trunk/syslog-ng.rc
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mergeinfo
   +