Sat Mar 9 00:04:39 PST 2013

3 files changed, 5 insertions, 88 deletions

diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index a8f23bf39..2a4cc6fce 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177980 2013-02-12 19:15:26Z dreisner $
+# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,19 +17,14 @@ options=('!libtool')
 backup=('etc/syslog-ng/modules.conf'
         'etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
-        'etc/conf.d/syslog-ng'
         'etc/logrotate.d/syslog-ng')
 install=$pkgname.install
 source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
         syslog-ng.conf
-        syslog-ng.conf.d
-        syslog-ng.logrotate
-        syslog-ng.rc)
+        syslog-ng.logrotate)
 sha1sums=('e75892262863b77f74a401d19661164154f716e7'
           '0aaf695ea6756b59198ff2e4af237b4a6186525d'
-          '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          '94af81a84e3add6653755122cdd5080694de059d')
+          '949128fe3d7f77a7aab99048061f885bc758000c')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -42,6 +37,7 @@ build() {
     --datadir=/usr/share/syslog-ng \
     --with-pidfile-dir=/run \
     --disable-spoof-source \
+    --enable-ipv6 \
     --enable-systemd \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
 
@@ -54,6 +50,4 @@ package() {
   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"
-  install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
 }
diff --git a/extra/syslog-ng/syslog-ng.conf.d b/extra/syslog-ng/syslog-ng.conf.d
deleted file mode 100644
index 6bf1cd038..000000000
--- a/extra/syslog-ng/syslog-ng.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# /etc/conf.d/syslog-ng
-#
-
-# passed to syslog-ng on config check
-SYSLOG_NG_CHECKOPTS=()
-
-# passed to syslog-ng at startup
-SYSLOG_NG_OPTS=()
-
diff --git a/extra/syslog-ng/syslog-ng.rc b/extra/syslog-ng/syslog-ng.rc
deleted file mode 100755
index d48b71ed1..000000000
--- a/extra/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/syslog-ng
-
-checkconfig() {
-  if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
-    stat_fail
-    exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
-      add_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [[ -z $PID ]]; then
-      stat_fail
-    else
-      checkconfig
-      if kill -HUP $PID &>/dev/null; then
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac