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

[Dave Reisner]

    Date: Thursday, March 22, 2012 @ 20:16:02
  Author: dreisner
Revision: 154089

upgpkg: syslog-ng 3.3.4-3

- add /etc/conf.d/syslog-ng (FS#29038)
- remove journald workaround

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

------------------+
 PKGBUILD         |   18 ++++++++++--------
 syslog-ng.conf.d |    6 ++++++
 syslog-ng.rc     |    3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-22 23:51:37 UTC (rev 154088)
+++ PKGBUILD	2012-03-23 00:16:02 UTC (rev 154089)
@@ -5,7 +5,7 @@
 
 pkgname=syslog-ng
 pkgver=3.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -16,16 +16,21 @@
 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')
+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')
 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)
 sha1sums=('3437a50af027f281747087ab47a45aa5fbabbf14'
           '98074e0facfc6ef036202662cc86d04b38a2c142'
+          '18d50ffe2ebed564748c9b10c4eeb4b757952877'
           '949128fe3d7f77a7aab99048061f885bc758000c'
-          'a6ad26912b5bcbe1b47b003309945d733613b98f')
+          '8d5619077fe08ffc2a102151f1ae261c1b3d0a08')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -51,8 +56,5 @@
   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"
-
-  # compat with pre-systemd 38
-  # XXX: remove this once the journal is in extra
-  sed -i '/^ExecStartPre/s/=/=-/' "$pkgdir/lib/systemd/system/syslog-ng.service"
+  install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
 }

Added: syslog-ng.conf.d
===================================================================
--- syslog-ng.conf.d	                        (rev 0)
+++ syslog-ng.conf.d	2012-03-23 00:16:02 UTC (rev 154089)
@@ -0,0 +1,6 @@
+#
+# /etc/conf.d/syslog-ng
+#
+
+# passed to syslog-ng at startup
+SYSLOG_NG_OPTS=()

Modified: syslog-ng.rc
===================================================================
--- syslog-ng.rc	2012-03-22 23:51:37 UTC (rev 154088)
+++ syslog-ng.rc	2012-03-23 00:16:02 UTC (rev 154089)
@@ -2,6 +2,7 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/syslog-ng
 
 checkconfig() {
   if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then
@@ -24,7 +25,7 @@
   start)
     stat_busy "Starting Syslog-NG"
     checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng; then
+    if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
       add_daemon syslog-ng
       stat_done
     else