Date: Wednesday, January 7, 2015 @ 05:26:21 Author: eric Revision: 228731
archrelease: copy trunk to extra-i686, extra-x86_64 Added: syslog-ng/repos/extra-i686/PKGBUILD (from rev 228730, syslog-ng/trunk/PKGBUILD) syslog-ng/repos/extra-i686/syslog-ng-fix-test.diff (from rev 228730, syslog-ng/trunk/syslog-ng-fix-test.diff) syslog-ng/repos/extra-i686/syslog-ng.conf (from rev 228730, syslog-ng/trunk/syslog-ng.conf) syslog-ng/repos/extra-i686/syslog-ng.logrotate (from rev 228730, syslog-ng/trunk/syslog-ng.logrotate) syslog-ng/repos/extra-x86_64/PKGBUILD (from rev 228730, syslog-ng/trunk/PKGBUILD) syslog-ng/repos/extra-x86_64/syslog-ng-fix-test.diff (from rev 228730, syslog-ng/trunk/syslog-ng-fix-test.diff) syslog-ng/repos/extra-x86_64/syslog-ng.conf (from rev 228730, syslog-ng/trunk/syslog-ng.conf) syslog-ng/repos/extra-x86_64/syslog-ng.logrotate (from rev 228730, syslog-ng/trunk/syslog-ng.logrotate) Deleted: syslog-ng/repos/extra-i686/PKGBUILD syslog-ng/repos/extra-i686/syslog-ng.conf syslog-ng/repos/extra-i686/syslog-ng.logrotate syslog-ng/repos/extra-x86_64/PKGBUILD syslog-ng/repos/extra-x86_64/syslog-ng.conf syslog-ng/repos/extra-x86_64/syslog-ng.logrotate --------------------------------------+ /PKGBUILD | 98 +++++++++++++++++ /syslog-ng.conf | 184 +++++++++++++++++++++++++++++++++ /syslog-ng.logrotate | 14 ++ extra-i686/PKGBUILD | 47 -------- extra-i686/syslog-ng-fix-test.diff | 47 ++++++++ extra-i686/syslog-ng.conf | 92 ---------------- extra-i686/syslog-ng.logrotate | 7 - extra-x86_64/PKGBUILD | 47 -------- extra-x86_64/syslog-ng-fix-test.diff | 47 ++++++++ extra-x86_64/syslog-ng.conf | 92 ---------------- extra-x86_64/syslog-ng.logrotate | 7 - 11 files changed, 390 insertions(+), 292 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-i686/PKGBUILD 2015-01-07 04:26:21 UTC (rev 228731) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=syslog-ng -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -url="http://www.balabit.com/network-security/syslog-ng/" -license=('GPL2' 'LGPL2.1') -depends=('awk' 'eventlog' 'systemd' 'pcre' 'libdbi') -makedepends=('python2' 'libxslt' ) -optdepends=('logrotate: for rotating log files') -backup=('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) -sha1sums=('be7e95696ed172db1d0f44904e173d25769daa93' - '3e7ec4f3f68265aaa98f37338f801c5c22b85c17' - '949128fe3d7f77a7aab99048061f885bc758000c') - -prepare() { - cd "$pkgname-$pkgver" - sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service -} - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \ - --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \ - --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 --enable-sql \ - --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -check() { - cd "$pkgname-$pkgver" - make check -} - -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" -} Copied: syslog-ng/repos/extra-i686/PKGBUILD (from rev 228730, syslog-ng/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=syslog-ng +pkgver=3.6.2 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +url="http://www.balabit.com/network-security/syslog-ng/" +license=('GPL2' 'LGPL2.1') +depends=('awk' 'eventlog' 'systemd' 'pcre' 'libdbi') +makedepends=('python2' 'libxslt' ) +optdepends=('logrotate: for rotating log files') +backup=('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-fix-test.diff) +sha1sums=('36eeaf920383ee8cb1c17d945205b7562f9fbbb2' + '3e7ec4f3f68265aaa98f37338f801c5c22b85c17' + '949128fe3d7f77a7aab99048061f885bc758000c' + 'ee0eb0a03a78bbdad8492e6ac8a7330fd46cd0e7') + +prepare() { + cd $pkgname-$pkgver + sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service + patch -p1 -i "$srcdir/syslog-ng-fix-test.diff" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \ + --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \ + --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 --enable-sql \ + --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +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" +} Copied: syslog-ng/repos/extra-i686/syslog-ng-fix-test.diff (from rev 228730, syslog-ng/trunk/syslog-ng-fix-test.diff) =================================================================== --- extra-i686/syslog-ng-fix-test.diff (rev 0) +++ extra-i686/syslog-ng-fix-test.diff 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,47 @@ +diff --git a/modules/systemd-journal/tests/test_systemd_journal.c b/modules/systemd-journal/tests/test_systemd_journal.c +index 48da20c..37b2395 100644 +--- a/modules/systemd-journal/tests/test_systemd_journal.c ++++ b/modules/systemd-journal/tests/test_systemd_journal.c +@@ -464,18 +464,18 @@ _test_default_facility_test(TestCase *self, TestSource *src, LogMessage *msg) + void + _test_program_field_init(TestCase *self, TestSource *src, Journald *journal, JournalReader *reader, JournalReaderOptions *options) + { +- MockEntry *entry = mock_entry_new("test _COMM first win"); +- mock_entry_add_data(entry, "_COMM=comm_program"); ++ MockEntry *entry = mock_entry_new("test SYSLOG_IDENTIFIER first win"); + mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ mock_entry_add_data(entry, "_COMM=comm_program"); + journald_mock_add_entry(journal, entry); + +- entry = mock_entry_new("test _COMM second win"); +- mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ entry = mock_entry_new("test SYSLOG_IDENTIFIER second win"); + mock_entry_add_data(entry, "_COMM=comm_program"); ++ mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); + journald_mock_add_entry(journal, entry); + +- entry = mock_entry_new("no _COMM"); +- mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ entry = mock_entry_new("no SYSLOG_IDENTIFIER"); ++ mock_entry_add_data(entry, "_COMM=comm_program"); + journald_mock_add_entry(journal, entry); + + self->user_data = journal; +@@ -487,14 +487,14 @@ _test_program_field_test(TestCase *self, TestSource *src, LogMessage *msg) + Journald *journal = self->user_data; + gchar *cursor; + journald_get_cursor(journal, &cursor); +- if (strcmp(cursor, "no _COMM") != 0) ++ if (strcmp(cursor, "no SYSLOG_IDENTIFIER") != 0) + { +- assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "comm_program", ASSERTION_ERROR("Bad program name")); ++ assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "syslog_program", ASSERTION_ERROR("Bad program name")); + g_free(cursor); + } + else + { +- assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "syslog_program", ASSERTION_ERROR("Bad program name")); ++ assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "comm_program", ASSERTION_ERROR("Bad program name")); + g_free(cursor); + test_source_finish_tc(src); + } Deleted: extra-i686/syslog-ng.conf =================================================================== --- extra-i686/syslog-ng.conf 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-i686/syslog-ng.conf 2015-01-07 04:26:21 UTC (rev 228731) @@ -1,92 +0,0 @@ -@version: 3.6 -@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/extra-i686/syslog-ng.conf (from rev 228730, syslog-ng/trunk/syslog-ng.conf) =================================================================== --- extra-i686/syslog-ng.conf (rev 0) +++ extra-i686/syslog-ng.conf 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,92 @@ +@version: 3.6 +@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: extra-i686/syslog-ng.logrotate =================================================================== --- extra-i686/syslog-ng.logrotate 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-i686/syslog-ng.logrotate 2015-01-07 04:26:21 UTC (rev 228731) @@ -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/extra-i686/syslog-ng.logrotate (from rev 228730, syslog-ng/trunk/syslog-ng.logrotate) =================================================================== --- extra-i686/syslog-ng.logrotate (rev 0) +++ extra-i686/syslog-ng.logrotate 2015-01-07 04:26:21 UTC (rev 228731) @@ -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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-x86_64/PKGBUILD 2015-01-07 04:26:21 UTC (rev 228731) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=syslog-ng -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -url="http://www.balabit.com/network-security/syslog-ng/" -license=('GPL2' 'LGPL2.1') -depends=('awk' 'eventlog' 'systemd' 'pcre' 'libdbi') -makedepends=('python2' 'libxslt' ) -optdepends=('logrotate: for rotating log files') -backup=('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) -sha1sums=('be7e95696ed172db1d0f44904e173d25769daa93' - '3e7ec4f3f68265aaa98f37338f801c5c22b85c17' - '949128fe3d7f77a7aab99048061f885bc758000c') - -prepare() { - cd "$pkgname-$pkgver" - sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service -} - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \ - --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \ - --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 --enable-sql \ - --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -check() { - cd "$pkgname-$pkgver" - make check -} - -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" -} Copied: syslog-ng/repos/extra-x86_64/PKGBUILD (from rev 228730, syslog-ng/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=syslog-ng +pkgver=3.6.2 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +url="http://www.balabit.com/network-security/syslog-ng/" +license=('GPL2' 'LGPL2.1') +depends=('awk' 'eventlog' 'systemd' 'pcre' 'libdbi') +makedepends=('python2' 'libxslt' ) +optdepends=('logrotate: for rotating log files') +backup=('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-fix-test.diff) +sha1sums=('36eeaf920383ee8cb1c17d945205b7562f9fbbb2' + '3e7ec4f3f68265aaa98f37338f801c5c22b85c17' + '949128fe3d7f77a7aab99048061f885bc758000c' + 'ee0eb0a03a78bbdad8492e6ac8a7330fd46cd0e7') + +prepare() { + cd $pkgname-$pkgver + sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service + patch -p1 -i "$srcdir/syslog-ng-fix-test.diff" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \ + --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \ + --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 --enable-sql \ + --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +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" +} Copied: syslog-ng/repos/extra-x86_64/syslog-ng-fix-test.diff (from rev 228730, syslog-ng/trunk/syslog-ng-fix-test.diff) =================================================================== --- extra-x86_64/syslog-ng-fix-test.diff (rev 0) +++ extra-x86_64/syslog-ng-fix-test.diff 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,47 @@ +diff --git a/modules/systemd-journal/tests/test_systemd_journal.c b/modules/systemd-journal/tests/test_systemd_journal.c +index 48da20c..37b2395 100644 +--- a/modules/systemd-journal/tests/test_systemd_journal.c ++++ b/modules/systemd-journal/tests/test_systemd_journal.c +@@ -464,18 +464,18 @@ _test_default_facility_test(TestCase *self, TestSource *src, LogMessage *msg) + void + _test_program_field_init(TestCase *self, TestSource *src, Journald *journal, JournalReader *reader, JournalReaderOptions *options) + { +- MockEntry *entry = mock_entry_new("test _COMM first win"); +- mock_entry_add_data(entry, "_COMM=comm_program"); ++ MockEntry *entry = mock_entry_new("test SYSLOG_IDENTIFIER first win"); + mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ mock_entry_add_data(entry, "_COMM=comm_program"); + journald_mock_add_entry(journal, entry); + +- entry = mock_entry_new("test _COMM second win"); +- mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ entry = mock_entry_new("test SYSLOG_IDENTIFIER second win"); + mock_entry_add_data(entry, "_COMM=comm_program"); ++ mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); + journald_mock_add_entry(journal, entry); + +- entry = mock_entry_new("no _COMM"); +- mock_entry_add_data(entry, "SYSLOG_IDENTIFIER=syslog_program"); ++ entry = mock_entry_new("no SYSLOG_IDENTIFIER"); ++ mock_entry_add_data(entry, "_COMM=comm_program"); + journald_mock_add_entry(journal, entry); + + self->user_data = journal; +@@ -487,14 +487,14 @@ _test_program_field_test(TestCase *self, TestSource *src, LogMessage *msg) + Journald *journal = self->user_data; + gchar *cursor; + journald_get_cursor(journal, &cursor); +- if (strcmp(cursor, "no _COMM") != 0) ++ if (strcmp(cursor, "no SYSLOG_IDENTIFIER") != 0) + { +- assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "comm_program", ASSERTION_ERROR("Bad program name")); ++ assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "syslog_program", ASSERTION_ERROR("Bad program name")); + g_free(cursor); + } + else + { +- assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "syslog_program", ASSERTION_ERROR("Bad program name")); ++ assert_string(log_msg_get_value(msg, LM_V_PROGRAM, NULL), "comm_program", ASSERTION_ERROR("Bad program name")); + g_free(cursor); + test_source_finish_tc(src); + } Deleted: extra-x86_64/syslog-ng.conf =================================================================== --- extra-x86_64/syslog-ng.conf 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-x86_64/syslog-ng.conf 2015-01-07 04:26:21 UTC (rev 228731) @@ -1,92 +0,0 @@ -@version: 3.6 -@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/extra-x86_64/syslog-ng.conf (from rev 228730, syslog-ng/trunk/syslog-ng.conf) =================================================================== --- extra-x86_64/syslog-ng.conf (rev 0) +++ extra-x86_64/syslog-ng.conf 2015-01-07 04:26:21 UTC (rev 228731) @@ -0,0 +1,92 @@ +@version: 3.6 +@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: extra-x86_64/syslog-ng.logrotate =================================================================== --- extra-x86_64/syslog-ng.logrotate 2015-01-07 04:22:58 UTC (rev 228730) +++ extra-x86_64/syslog-ng.logrotate 2015-01-07 04:26:21 UTC (rev 228731) @@ -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/extra-x86_64/syslog-ng.logrotate (from rev 228730, syslog-ng/trunk/syslog-ng.logrotate) =================================================================== --- extra-x86_64/syslog-ng.logrotate (rev 0) +++ extra-x86_64/syslog-ng.logrotate 2015-01-07 04:26:21 UTC (rev 228731) @@ -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 +}