[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng-fix-test.diff)

[Eric Bélanger]

    Date: Wednesday, January 7, 2015 @ 05:22:58
  Author: eric
Revision: 228730

upgpkg: syslog-ng 3.6.2-1

Upstream update

Added:
  syslog-ng/trunk/syslog-ng-fix-test.diff
Modified:
  syslog-ng/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   18 +++++++++--------
 syslog-ng-fix-test.diff |   47 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-07 02:12:48 UTC (rev 228729)
+++ PKGBUILD	2015-01-07 04:22:58 UTC (rev 228730)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.6.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -15,18 +15,20 @@
         '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'
+        syslog-ng.conf syslog-ng.logrotate syslog-ng-fix-test.diff)
+sha1sums=('36eeaf920383ee8cb1c17d945205b7562f9fbbb2'
           '3e7ec4f3f68265aaa98f37338f801c5c22b85c17'
-          '949128fe3d7f77a7aab99048061f885bc758000c')
+          '949128fe3d7f77a7aab99048061f885bc758000c'
+          'ee0eb0a03a78bbdad8492e6ac8a7330fd46cd0e7')
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  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"
+  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 \
@@ -35,12 +37,12 @@
 }
 
 check() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+  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"

Added: syslog-ng-fix-test.diff
===================================================================
--- syslog-ng-fix-test.diff	                        (rev 0)
+++ syslog-ng-fix-test.diff	2015-01-07 04:22:58 UTC (rev 228730)
@@ -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);
+     }