[arch-commits] Commit in syslog-ng/repos (9 files)

Dave Reisner dreisner at archlinux.org
Wed Jan 25 13:57:03 UTC 2012


    Date: Wednesday, January 25, 2012 @ 08:57:03
  Author: dreisner
Revision: 147267

db-move: moved syslog-ng from [testing] to [core] (x86_64)

Added:
  syslog-ng/repos/core-x86_64/PKGBUILD
    (from rev 147265, syslog-ng/repos/testing-x86_64/PKGBUILD)
  syslog-ng/repos/core-x86_64/syslog-ng.conf
    (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.conf)
  syslog-ng/repos/core-x86_64/syslog-ng.logrotate
    (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.logrotate)
  syslog-ng/repos/core-x86_64/syslog-ng.rc
    (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.rc)
Deleted:
  syslog-ng/repos/core-x86_64/PKGBUILD
  syslog-ng/repos/core-x86_64/syslog-ng.conf
  syslog-ng/repos/core-x86_64/syslog-ng.logrotate
  syslog-ng/repos/core-x86_64/syslog-ng.rc
  syslog-ng/repos/testing-x86_64/

---------------------+
 PKGBUILD            |  110 +++++++++++++++--------------
 syslog-ng.conf      |  184 +++++++++++++++++++++++++-------------------------
 syslog-ng.logrotate |   14 +--
 syslog-ng.rc        |  132 +++++++++++++++++------------------
 4 files changed, 222 insertions(+), 218 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-01-25 13:57:02 UTC (rev 147266)
+++ core-x86_64/PKGBUILD	2012-01-25 13:57:03 UTC (rev 147267)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=syslog-ng
-pkgver=3.3.3
-pkgrel=1
-pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' '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)
-sha1sums=('e2ec8ba4bde24809630a7675bf5d97f00be467f8'
-          '98074e0facfc6ef036202662cc86d04b38a2c142'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          'a6ad26912b5bcbe1b47b003309945d733613b98f')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc/syslog-ng \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var/lib/syslog-ng \
-    --with-pidfile-dir=/run \
-    --disable-spoof-source \
-    --enable-systemd \
-    --with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" 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"
-}

Copied: syslog-ng/repos/core-x86_64/PKGBUILD (from rev 147265, syslog-ng/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-01-25 13:57:03 UTC (rev 147267)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=syslog-ng
+pkgver=3.3.4
+pkgrel=1
+pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('base')
+url="http://www.balabit.com/network-security/syslog-ng/"
+depends=('glib2' 'eventlog' '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)
+sha1sums=('3437a50af027f281747087ab47a45aa5fbabbf14'
+          '98074e0facfc6ef036202662cc86d04b38a2c142'
+          '949128fe3d7f77a7aab99048061f885bc758000c'
+          'a6ad26912b5bcbe1b47b003309945d733613b98f')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc/syslog-ng \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var/lib/syslog-ng \
+    --with-pidfile-dir=/run \
+    --disable-spoof-source \
+    --enable-systemd \
+    --with-systemdsystemunitdir=/lib/systemd/system
+
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" 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"
+
+  # 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"
+}

Deleted: core-x86_64/syslog-ng.conf
===================================================================
--- core-x86_64/syslog-ng.conf	2012-01-25 13:57:02 UTC (rev 147266)
+++ core-x86_64/syslog-ng.conf	2012-01-25 13:57:03 UTC (rev 147267)
@@ -1,92 +0,0 @@
- at version: 3.3
-#
-# /etc/syslog-ng/syslog-ng.conf
-#
-
-options {
-  stats_freq (0);
-  flush_lines (0);
-  time_reopen (10);
-  log_fifo_size (10000);
-  chain_hostnames (off);
-  use_dns (no);
-  use_fqdn (no);
-  create_dirs (no);
-  keep_hostname (yes);
-  perm(0640);
-  group("log");
-};
-
-source src {
-  unix-dgram("/dev/log");
-  internal();
-  file("/proc/kmsg");
-};
-
-destination d_authlog { file("/var/log/auth.log"); };
-destination d_syslog { file("/var/log/syslog.log"); };
-destination d_cron { file("/var/log/crond.log"); };
-destination d_daemon { file("/var/log/daemon.log"); };
-destination d_kernel { file("/var/log/kernel.log"); };
-destination d_lpr { file("/var/log/lpr.log"); };
-destination d_user { file("/var/log/user.log"); };
-destination d_uucp { file("/var/log/uucp.log"); };
-destination d_mail { file("/var/log/mail.log"); };
-destination d_news { file("/var/log/news.log"); };
-destination d_ppp { file("/var/log/ppp.log"); };
-destination d_debug { file("/var/log/debug.log"); };
-destination d_messages { file("/var/log/messages.log"); };
-destination d_errors { file("/var/log/errors.log"); };
-destination d_everything { file("/var/log/everything.log"); };
-destination d_iptables { file("/var/log/iptables.log"); };
-destination d_acpid { file("/var/log/acpid.log"); };
-destination d_console { usertty("root"); };
-
-# Log everything to tty12
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { program(syslog-ng); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern) and not filter(f_iptables); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_news { facility(news); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-filter f_ppp { facility(local2); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
-filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-filter f_emergency { level(emerg); };
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
-filter f_acpid { program("acpid"); };
-
-log { source(src); filter(f_acpid); destination(d_acpid); };
-log { source(src); filter(f_authpriv); destination(d_authlog); };
-log { source(src); filter(f_syslog); destination(d_syslog); };
-log { source(src); filter(f_cron); destination(d_cron); };
-log { source(src); filter(f_daemon); destination(d_daemon); };
-log { source(src); filter(f_kernel); destination(d_kernel); };
-log { source(src); filter(f_lpr); destination(d_lpr); };
-log { source(src); filter(f_mail); destination(d_mail); };
-log { source(src); filter(f_news); destination(d_news); };
-log { source(src); filter(f_ppp); destination(d_ppp); };
-log { source(src); filter(f_user); destination(d_user); };
-log { source(src); filter(f_uucp); destination(d_uucp); };
-#log { source(src); filter(f_debug); destination(d_debug); };
-log { source(src); filter(f_messages); destination(d_messages); };
-log { source(src); filter(f_err); destination(d_errors); };
-log { source(src); filter(f_emergency); destination(d_console); };
-log { source(src); filter(f_everything); destination(d_everything); };
-log { source(src); filter(f_iptables); destination(d_iptables); };
-
-# Log everything to tty12
-#log { source(src); destination(console_all); };

Copied: syslog-ng/repos/core-x86_64/syslog-ng.conf (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.conf)
===================================================================
--- core-x86_64/syslog-ng.conf	                        (rev 0)
+++ core-x86_64/syslog-ng.conf	2012-01-25 13:57:03 UTC (rev 147267)
@@ -0,0 +1,92 @@
+ at version: 3.3
+#
+# /etc/syslog-ng/syslog-ng.conf
+#
+
+options {
+  stats_freq (0);
+  flush_lines (0);
+  time_reopen (10);
+  log_fifo_size (10000);
+  chain_hostnames (off);
+  use_dns (no);
+  use_fqdn (no);
+  create_dirs (no);
+  keep_hostname (yes);
+  perm(0640);
+  group("log");
+};
+
+source src {
+  unix-dgram("/dev/log");
+  internal();
+  file("/proc/kmsg");
+};
+
+destination d_authlog { file("/var/log/auth.log"); };
+destination d_syslog { file("/var/log/syslog.log"); };
+destination d_cron { file("/var/log/crond.log"); };
+destination d_daemon { file("/var/log/daemon.log"); };
+destination d_kernel { file("/var/log/kernel.log"); };
+destination d_lpr { file("/var/log/lpr.log"); };
+destination d_user { file("/var/log/user.log"); };
+destination d_uucp { file("/var/log/uucp.log"); };
+destination d_mail { file("/var/log/mail.log"); };
+destination d_news { file("/var/log/news.log"); };
+destination d_ppp { file("/var/log/ppp.log"); };
+destination d_debug { file("/var/log/debug.log"); };
+destination d_messages { file("/var/log/messages.log"); };
+destination d_errors { file("/var/log/errors.log"); };
+destination d_everything { file("/var/log/everything.log"); };
+destination d_iptables { file("/var/log/iptables.log"); };
+destination d_acpid { file("/var/log/acpid.log"); };
+destination d_console { usertty("root"); };
+
+# Log everything to tty12
+destination console_all { file("/dev/tty12"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { program(syslog-ng); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kernel { facility(kern) and not filter(f_iptables); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_news { facility(news); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+filter f_ppp { facility(local2); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
+filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
+filter f_emergency { level(emerg); };
+filter f_info { level(info); };
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
+filter f_acpid { program("acpid"); };
+
+log { source(src); filter(f_acpid); destination(d_acpid); };
+log { source(src); filter(f_authpriv); destination(d_authlog); };
+log { source(src); filter(f_syslog); destination(d_syslog); };
+log { source(src); filter(f_cron); destination(d_cron); };
+log { source(src); filter(f_daemon); destination(d_daemon); };
+log { source(src); filter(f_kernel); destination(d_kernel); };
+log { source(src); filter(f_lpr); destination(d_lpr); };
+log { source(src); filter(f_mail); destination(d_mail); };
+log { source(src); filter(f_news); destination(d_news); };
+log { source(src); filter(f_ppp); destination(d_ppp); };
+log { source(src); filter(f_user); destination(d_user); };
+log { source(src); filter(f_uucp); destination(d_uucp); };
+#log { source(src); filter(f_debug); destination(d_debug); };
+log { source(src); filter(f_messages); destination(d_messages); };
+log { source(src); filter(f_err); destination(d_errors); };
+log { source(src); filter(f_emergency); destination(d_console); };
+log { source(src); filter(f_everything); destination(d_everything); };
+log { source(src); filter(f_iptables); destination(d_iptables); };
+
+# Log everything to tty12
+#log { source(src); destination(console_all); };

Deleted: core-x86_64/syslog-ng.logrotate
===================================================================
--- core-x86_64/syslog-ng.logrotate	2012-01-25 13:57:02 UTC (rev 147266)
+++ core-x86_64/syslog-ng.logrotate	2012-01-25 13:57:03 UTC (rev 147267)
@@ -1,7 +0,0 @@
-/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
-	missingok
-	sharedscripts
-	postrotate
-		/bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true
-	endscript
-}

Copied: syslog-ng/repos/core-x86_64/syslog-ng.logrotate (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.logrotate)
===================================================================
--- core-x86_64/syslog-ng.logrotate	                        (rev 0)
+++ core-x86_64/syslog-ng.logrotate	2012-01-25 13:57:03 UTC (rev 147267)
@@ -0,0 +1,7 @@
+/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
+	missingok
+	sharedscripts
+	postrotate
+		/bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true
+	endscript
+}

Deleted: core-x86_64/syslog-ng.rc
===================================================================
--- core-x86_64/syslog-ng.rc	2012-01-25 13:57:02 UTC (rev 147266)
+++ core-x86_64/syslog-ng.rc	2012-01-25 13:57:03 UTC (rev 147267)
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-checkconfig() {
-  if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; 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; 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

Copied: syslog-ng/repos/core-x86_64/syslog-ng.rc (from rev 147265, syslog-ng/repos/testing-x86_64/syslog-ng.rc)
===================================================================
--- core-x86_64/syslog-ng.rc	                        (rev 0)
+++ core-x86_64/syslog-ng.rc	2012-01-25 13:57:03 UTC (rev 147267)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+checkconfig() {
+  if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; 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; 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




More information about the arch-commits mailing list