Date: Thursday, July 30, 2015 @ 03:31:12 Author: eric Revision: 242849
upgpkg: syslog-ng 3.6.3-1 Upstream update, Add json support (close FS#43403), Remove old patch Modified: syslog-ng/trunk/PKGBUILD Deleted: syslog-ng/trunk/syslog-ng-fix-test.diff -------------------------+ PKGBUILD | 20 +++++++++---------- syslog-ng-fix-test.diff | 47 ---------------------------------------------- 2 files changed, 10 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-29 23:15:40 UTC (rev 242848) +++ PKGBUILD 2015-07-30 01:31:12 UTC (rev 242849) @@ -2,29 +2,28 @@ # Maintainer: Eric Bélanger <e...@archlinux.org> pkgname=syslog-ng -pkgver=3.6.2 +pkgver=3.6.3 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') +depends=('awk' 'eventlog' 'systemd' 'glib2' 'libdbi') +makedepends=('python2' 'libxslt' 'json-c') +optdepends=('logrotate: for rotating log files' + 'json-c: for json-plugin') 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' + syslog-ng.conf syslog-ng.logrotate) +sha1sums=('33a8983d8324abf88975838149cbb772f5860d8a' '3e7ec4f3f68265aaa98f37338f801c5c22b85c17' - '949128fe3d7f77a7aab99048061f885bc758000c' - 'ee0eb0a03a78bbdad8492e6ac8a7330fd46cd0e7') + '949128fe3d7f77a7aab99048061f885bc758000c') 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() { @@ -32,7 +31,8 @@ ./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 + --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-manpages --with-jsonc=system make } Deleted: syslog-ng-fix-test.diff =================================================================== --- syslog-ng-fix-test.diff 2015-07-29 23:15:40 UTC (rev 242848) +++ syslog-ng-fix-test.diff 2015-07-30 01:31:12 UTC (rev 242849) @@ -1,47 +0,0 @@ -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); - }