diff --git a/syslog-ng/PKGBUILD b/syslog-ng/PKGBUILD index eaa2e8758..c0871895c 100644 --- a/syslog-ng/PKGBUILD +++ b/syslog-ng/PKGBUILD @@ -1,13 +1,13 @@ pkgname=syslog-ng -pkgver=3.14.1 +pkgver=3.19.1 pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('x86_64') url="http://www.balabit.com/network-security/syslog-ng/" license=('GPL2' 'LGPL2.1') -depends=('awk' 'systemd' 'glib2' 'libdbi') -makedepends=('python2' 'libxslt' 'json-c' 'python3') -checkdepends=('python3-nose' 'python3-ply') +depends=('awk' 'libsystemd' 'glib2' 'libdbi') +makedepends=('libxslt' 'json-c' 'python3') +checkdepends=('python3-nose' 'python3-ply' 'python2') optdepends=('logrotate: for rotating log files' 'json-c: for json-plugin' 'curl: for the HTTP module' @@ -20,8 +20,8 @@ backup=('etc/syslog-ng/scl.conf' 'etc/default/syslog-ng@default') source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz syslog-ng.conf syslog-ng.logrotate) -sha256sums=('0245260dc9942a9a07110948151654a60992e039821358da348fb34356c4e944' - '887e4d0e0a0e8d31b639215c36892d90cd32123465d685ae95bbeb0793363544' +sha256sums=('5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178' + '31cee11ae3c897c51ea01982e1ea838aa8ac730d56661a17e66bd9de5bede1c7' '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317') prepare() { diff --git a/syslog-ng/syslog-ng.conf b/syslog-ng/syslog-ng.conf index 43140ac70..cc27bd5b5 100644 --- a/syslog-ng/syslog-ng.conf +++ b/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.13 +@version: 3.17 @include "scl.conf" # # /etc/syslog-ng/syslog-ng.conf diff --git a/syslog-ng/syslog-ng.conf.d b/syslog-ng/syslog-ng.conf.d deleted file mode 100644 index 05a725e51..000000000 --- a/syslog-ng/syslog-ng.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/conf.d/syslog-ng -# - -# passed to syslog-ng on config check -SYSLOG_NG_CHECKOPTS=() - -# passed to syslog-ng at startup -SYSLOG_NG_OPTS=() diff --git a/syslog-ng/test_systemd_journal.patch b/syslog-ng/test_systemd_journal.patch deleted file mode 100644 index d783863bc..000000000 --- a/syslog-ng/test_systemd_journal.patch +++ /dev/null @@ -1,43 +0,0 @@ -@@ -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); - }