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

[Dave Reisner]

    Date: Friday, March 23, 2012 @ 06:07:12
  Author: dreisner
Revision: 154103

upgpkg: syslog-ng 3.3.4-4

- add SYSLOG_NG_CHECKOPTS

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

------------------+
 PKGBUILD         |    6 +++---
 syslog-ng.conf.d |    4 ++++
 syslog-ng.rc     |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-23 08:14:41 UTC (rev 154102)
+++ PKGBUILD	2012-03-23 10:07:12 UTC (rev 154103)
@@ -5,7 +5,7 @@
 
 pkgname=syslog-ng
 pkgver=3.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -28,9 +28,9 @@
         syslog-ng.rc)
 sha1sums=('3437a50af027f281747087ab47a45aa5fbabbf14'
           '98074e0facfc6ef036202662cc86d04b38a2c142'
-          '18d50ffe2ebed564748c9b10c4eeb4b757952877'
+          '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8'
           '949128fe3d7f77a7aab99048061f885bc758000c'
-          '8d5619077fe08ffc2a102151f1ae261c1b3d0a08')
+          '94af81a84e3add6653755122cdd5080694de059d')
 
 build() {
   cd "$pkgname-$pkgver"

Modified: syslog-ng.conf.d
===================================================================
--- syslog-ng.conf.d	2012-03-23 08:14:41 UTC (rev 154102)
+++ syslog-ng.conf.d	2012-03-23 10:07:12 UTC (rev 154103)
@@ -2,5 +2,9 @@
 # /etc/conf.d/syslog-ng
 #
 
+# passed to syslog-ng on config check
+SYSLOG_NG_CHECKOPTS=()
+
 # passed to syslog-ng at startup
 SYSLOG_NG_OPTS=()
+

Modified: syslog-ng.rc
===================================================================
--- syslog-ng.rc	2012-03-23 08:14:41 UTC (rev 154102)
+++ syslog-ng.rc	2012-03-23 10:07:12 UTC (rev 154103)
@@ -5,7 +5,7 @@
 . /etc/conf.d/syslog-ng
 
 checkconfig() {
-  if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then
+  if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
     stat_fail
     exit 1
   fi