[arch-commits] Commit in syslog-ng/repos/testing-x86_64 (6 files)

Florian Pritz bluewind at archlinux.org
Thu Jun 13 21:41:45 UTC 2019


    Date: Thursday, June 13, 2019 @ 21:41:44
  Author: bluewind
Revision: 356033

archrelease: copy trunk to testing-x86_64

Added:
  syslog-ng/repos/testing-x86_64/PKGBUILD
    (from rev 356032, syslog-ng/trunk/PKGBUILD)
  syslog-ng/repos/testing-x86_64/syslog-ng.conf
    (from rev 356032, syslog-ng/trunk/syslog-ng.conf)
  syslog-ng/repos/testing-x86_64/syslog-ng.logrotate
    (from rev 356032, syslog-ng/trunk/syslog-ng.logrotate)
Deleted:
  syslog-ng/repos/testing-x86_64/PKGBUILD
  syslog-ng/repos/testing-x86_64/syslog-ng.conf
  syslog-ng/repos/testing-x86_64/syslog-ng.logrotate

---------------------+
 PKGBUILD            |  145 +++++++++++++++++++--------------------
 syslog-ng.conf      |  184 +++++++++++++++++++++++++-------------------------
 syslog-ng.logrotate |   14 +--
 3 files changed, 170 insertions(+), 173 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-13 21:41:40 UTC (rev 356032)
+++ PKGBUILD	2019-06-13 21:41:44 UTC (rev 356033)
@@ -1,74 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=syslog-ng
-pkgver=3.21.1
-pkgrel=2
-pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('x86_64')
-url="https://www.syslog-ng.com/products/open-source-log-management/"
-license=('GPL2' 'LGPL2.1')
-depends=('awk' 'systemd-libs' 'glib2' 'libnsl' 'json-c' 'curl' 'libnet')
-makedepends=('libxslt' 'mongo-c-driver' 'librabbitmq-c' 'python' 'libesmtp' 'hiredis'
-             'libdbi' 'geoip' 'libmaxminddb')
-checkdepends=('python-nose' 'python-pylint' 'python-ply')
-optdepends=('logrotate: for rotating log files'
-            'libdbi: for the SQL plugin'
-            'librabbitmq-c: for the AMQP plugin'            
-            'mongo-c-driver: for the MongoDB plugin'
-            'python: for the Python plugin'
-            'libesmtp: for the SMTP plugin'
-            'hiredis: for the Redis plugin'
-            'geoip: for the GeoIP plugin'
-            'libmaxminddb: for the GeoIP2 plugin'
-            'python: for Python-based plugins')
-conflicts=('eventlog')
-replaces=('eventlog')
-backup=('etc/syslog-ng/scl.conf'
-        'etc/syslog-ng/syslog-ng.conf'
-        'etc/logrotate.d/syslog-ng'
-        'etc/default/syslog-ng at default')
-source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
-        syslog-ng.conf syslog-ng.logrotate)
-sha256sums=('8d163da5ad79cf3a5f043b2ed0fe18a4888d0d740542703bf2508f0b9996cd25'
-            '31cee11ae3c897c51ea01982e1ea838aa8ac730d56661a17e66bd9de5bede1c7'
-            '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng at .service
-  sed -i -e 's|/var/run|/run|g' contrib/systemd/syslog-ng at default
-
-  # remove this line before releasing 3.21.1: https://github.com/balabit/syslog-ng/pull/2632
-  sed -i -e 's|etc|etc/syslog-ng|g' contrib/systemd/syslog-ng at default
-
-  # the version in pkg-config is 0.0.0 and so it won't detect the flags without
-  # this. since your version is newer this is an easy fix for now, but should
-  # eventually be removed when this bug is fixed:
-  # https://bugs.archlinux.org/task/61888
-  sed -i -e 's|^LMC_MIN_VERSION="1.0.0"|LMC_MIN_VERSION="0.0.0"|' configure.ac configure
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \
-    --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share \
-    --with-pidfile-dir=/run --enable-spoof-source --enable-ipv6 \
-    --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-manpages --enable-all-modules --disable-java --disable-java-modules  \
-    --disable-riemann --with-python=3 --with-jsonc=system
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check || /bin/true # unit test requires criterion, python test requires pep8
-}
-
-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 -Dm644 "$srcdir"/$pkgname-$pkgver/contrib/systemd/syslog-ng at default -t "$pkgdir"/etc/default
-}

Copied: syslog-ng/repos/testing-x86_64/PKGBUILD (from rev 356032, syslog-ng/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-13 21:41:44 UTC (rev 356033)
@@ -0,0 +1,71 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=syslog-ng
+pkgver=3.21.1
+pkgrel=3
+pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
+arch=('x86_64')
+url="https://www.syslog-ng.com/products/open-source-log-management/"
+license=('GPL2' 'LGPL2.1')
+depends=('awk' 'systemd-libs' 'glib2' 'libnsl' 'json-c' 'curl' 'libnet')
+makedepends=('libxslt' 'mongo-c-driver' 'librabbitmq-c' 'python' 'libesmtp' 'hiredis'
+             'libdbi' 'geoip' 'libmaxminddb')
+checkdepends=('python-nose' 'python-pylint' 'python-ply')
+optdepends=('logrotate: for rotating log files'
+            'libdbi: for the SQL plugin'
+            'librabbitmq-c: for the AMQP plugin'            
+            'mongo-c-driver: for the MongoDB plugin'
+            'python: for the Python plugin'
+            'libesmtp: for the SMTP plugin'
+            'hiredis: for the Redis plugin'
+            'geoip: for the GeoIP plugin'
+            'libmaxminddb: for the GeoIP2 plugin'
+            'python: for Python-based plugins')
+conflicts=('eventlog')
+replaces=('eventlog')
+backup=('etc/syslog-ng/scl.conf'
+        'etc/syslog-ng/syslog-ng.conf'
+        'etc/logrotate.d/syslog-ng'
+        'etc/default/syslog-ng at default')
+source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
+        syslog-ng.conf syslog-ng.logrotate)
+sha256sums=('8d163da5ad79cf3a5f043b2ed0fe18a4888d0d740542703bf2508f0b9996cd25'
+            '31cee11ae3c897c51ea01982e1ea838aa8ac730d56661a17e66bd9de5bede1c7'
+            '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng at .service
+  sed -i -e 's|/var/run|/run|g' contrib/systemd/syslog-ng at default
+
+  # the version in pkg-config is 0.0.0 and so it won't detect the flags without
+  # this. since your version is newer this is an easy fix for now, but should
+  # eventually be removed when this bug is fixed:
+  # https://bugs.archlinux.org/task/61888
+  sed -i -e 's|^LMC_MIN_VERSION="1.0.0"|LMC_MIN_VERSION="0.0.0"|' configure.ac configure
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \
+    --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share \
+    --with-pidfile-dir=/run --enable-spoof-source --enable-ipv6 \
+    --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --enable-manpages --enable-all-modules --disable-java --disable-java-modules  \
+    --disable-riemann --with-python=3 --with-jsonc=system
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check || /bin/true # unit test requires criterion, python test requires pep8
+}
+
+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 -Dm644 "$srcdir"/$pkgname-$pkgver/contrib/systemd/syslog-ng at default -t "$pkgdir"/etc/default
+}

Deleted: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2019-06-13 21:41:40 UTC (rev 356032)
+++ syslog-ng.conf	2019-06-13 21:41:44 UTC (rev 356033)
@@ -1,92 +0,0 @@
- at version: 3.17
- at include "scl.conf"
-#
-# /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 {
-  system();
-  internal();
-};
-
-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/testing-x86_64/syslog-ng.conf (from rev 356032, syslog-ng/trunk/syslog-ng.conf)
===================================================================
--- syslog-ng.conf	                        (rev 0)
+++ syslog-ng.conf	2019-06-13 21:41:44 UTC (rev 356033)
@@ -0,0 +1,92 @@
+ at version: 3.17
+ at include "scl.conf"
+#
+# /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 {
+  system();
+  internal();
+};
+
+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: syslog-ng.logrotate
===================================================================
--- syslog-ng.logrotate	2019-06-13 21:41:40 UTC (rev 356032)
+++ syslog-ng.logrotate	2019-06-13 21:41:44 UTC (rev 356033)
@@ -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/testing-x86_64/syslog-ng.logrotate (from rev 356032, syslog-ng/trunk/syslog-ng.logrotate)
===================================================================
--- syslog-ng.logrotate	                        (rev 0)
+++ syslog-ng.logrotate	2019-06-13 21:41:44 UTC (rev 356033)
@@ -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
+}


More information about the arch-commits mailing list