update to 3.37.1

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -3,3 +3,46 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.2.3-20110424.tar.bz2
 /syslog-ng_3.2.3.tar.gz
 /syslog-ng_3.2.4.tar.gz
+/syslog-ng-3.2.4+20111022+0801.tar.gz
+/syslog-ng-3.2.4+20111023+0856.tar.gz
+/syslog-ng_3.2.5.tar.gz
+/syslog-ng-3.3.6.91-20121008-v3.3.6.91.tar.gz
+/syslog-ng_3.3.7.tar.gz
+/syslog-ng_3.3.8.tar.gz
+/syslog-ng_3.4.0rc2.tar.gz
+/syslog-ng_3.4.1.tar.gz
+/syslog-ng_3.4.3.tar.gz
+/syslog-ng_3.4.4.tar.gz
+/syslog-ng_3.5.0beta3.tar.gz
+/syslog-ng_3.5.0rc1.tar.gz
+/syslog-ng_3.5.1.tar.gz
+/syslog-ng_3.5.2.tar.gz
+/syslog-ng_3.5.3.tar.gz
+/syslog-ng_3.5.4.1.tar.gz
+/syslog-ng_3.5.5.tar.gz
+/syslog-ng_3.5.6.tar.gz
+/syslog-ng-3.6.0rc1.tar.gz
+/syslog-ng_3.6.0rc1.tar.gz
+/syslog-ng_3.6.1.tar.gz
+/syslog-ng_3.6.2.tar.gz
+/syslog-ng-3.8.1.tar.gz
+/syslog-ng-3.9.1.tar.gz
+/syslog-ng-3.10.1.tar.gz
+/syslog-ng-3.11.1.tar.gz
+/syslog-ng-3.14.1.tar.gz
+/syslog-ng-3.15.1.tar.gz
+/syslog-ng-3.16.1.tar.gz
+/syslog-ng-3.17.1.tar.gz
+/syslog-ng-3.17.2.tar.gz
+/syslog-ng-3.18.1.tar.gz
+/syslog-ng-3.19.1.tar.gz
+/syslog-ng-3.20.1.tar.gz
+/syslog-ng-3.21.1.tar.gz
+/syslog-ng-3.22.1.tar.gz
+/syslog-ng-3.23.1.tar.gz
+/syslog-ng-3.25.1.tar.gz
+/syslog-ng-3.27.1.tar.gz
+/syslog-ng-3.30.1.tar.gz
+/syslog-ng-3.33.2.tar.gz
+/syslog-ng-3.35.1.tar.gz
+/syslog-ng-3.37.1.tar.gz

sources

@@ -1 +1 @@
-5995f7dad0053a478b60a63f6f754203  syslog-ng_3.2.4.tar.gz
+SHA512 (syslog-ng-3.37.1.tar.gz) = beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7

syslog-ng-3.2.4-chain-hostnames-processing.patch

@@ -1,29 +0,0 @@
-From: Balazs Scheidler <bazsi@balabit.hu>
-Date: Mon, 27 Jun 2011 07:47:51 +0000 (+0200)
-Subject: fixed chain-hostnames() processing
-X-Git-Url: http://git.balabit.hu/?p=bazsi%2Fsyslog-ng-3.2.git;a=commitdiff_plain;h=2db971fc37471e39f6a8b34595ca23833166831e
-
-fixed chain-hostnames() processing
-
-The marking of local messages was broken, and as a result hostnames generated
-by chain-hostnames(yes) got also broken: instead of <source>@<hostname>
-<hostname>/<hostname> got generated.
-
-Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
----
-
-diff --git a/lib/logreader.c b/lib/logreader.c
-index 7508abf..400668a 100644
---- a/lib/logreader.c
-+++ b/lib/logreader.c
-@@ -280,6 +280,9 @@ log_reader_handle_line(LogReader *self, const guchar *line, gint length, GSockAd
-   m = log_msg_new((gchar *) line, length,
-                   saddr,
-                   &self->options->parse_options);
-+
-+  if (self->options->flags & LR_LOCAL)
-+    m->flags |= LF_LOCAL;
-   
-   if (!m->saddr && self->peer_addr)
-     {

syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch

@@ -1,19 +0,0 @@
-diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
---- syslog-ng-3.2.4/tests/functional/func_test.py	2010-07-09 11:19:27.000000000 +0100
-+++ syslog-ng-3.2.4-modified/tests/functional/func_test.py	2011-05-12 03:23:48.276226460 +0100
-@@ -60,11 +60,12 @@
- # import test modules
- import test_file_source
- import test_filters
--import test_input_drivers
-+#import test_input_drivers
- import test_performance
--import test_sql
-+#import test_sql
- 
--tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
-+#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
-+tests = (test_file_source, test_filters, test_performance)
- 
- init_env()
- seed_rnd()

syslog-ng-3.2.4-disable-ssl-tests.patch

@@ -1,18 +0,0 @@
-diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
---- syslog-ng-3.2.4/tests/functional/func_test.py	2010-07-09 11:19:27.000000000 +0100
-+++ syslog-ng-3.2.4-modified/tests/functional/func_test.py	2011-05-16 20:47:48.586752031 +0100
-@@ -60,11 +60,12 @@
- # import test modules
- import test_file_source
- import test_filters
--import test_input_drivers
-+#import test_input_drivers
- import test_performance
- import test_sql
- 
--tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
-+#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
-+tests = (test_sql, test_file_source, test_filters, test_performance)
- 
- init_env()
- seed_rnd()

syslog-ng.conf

@@ -1,4 +1,5 @@
-@version:3.2
+@version: 3.35
+@include "scl.conf"
 
 # syslog-ng configuration file.
 #
@@ -7,12 +8,14 @@
 #
 # See syslog-ng(8) and syslog-ng.conf(5) for more information.
 #
+# Note: it also sources additional configuration files (*.conf)
+#       located in /etc/syslog-ng/conf.d/
 
 options {
     flush_lines (0);
     time_reopen (10);
     log_fifo_size (1000);
-	long_hostnames (off);
+    chain_hostnames (off);
     use_dns (no);
     use_fqdn (no);
     create_dirs (no);
@@ -20,8 +23,7 @@ options {
 };
 
 source s_sys {
-	file ("/proc/kmsg" program_override("kernel: "));
+    system();
-	unix-stream ("/dev/log");
     internal();
     # udp(ip(0.0.0.0) port(514));
 };
@@ -60,4 +62,9 @@ log { source(s_sys); filter(f_news); destination(d_spol); };
 log { source(s_sys); filter(f_boot); destination(d_boot); };
 log { source(s_sys); filter(f_cron); destination(d_cron); };
 
+
+# Source additional configuration files (.conf extension only)
+@include "/etc/syslog-ng/conf.d/*.conf"
+
+
 # vim:ft=syslog-ng:ai:si:ts=4:sw=4:et:

syslog-ng.logrotate

@@ -1,4 +1,9 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+/var/log/cron
+/var/log/maillog
+/var/log/messages
+/var/log/secure
+/var/log/spooler
+{
     sharedscripts
     postrotate
 	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true

syslog-ng.service

@@ -1,12 +1,16 @@
 [Unit]
-Description=Syslog-ng System Logging Service
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
 
 [Service]
+Type=notify
+ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS -p /var/run/syslogd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+EnvironmentFile=-/etc/default/syslog-ng
 EnvironmentFile=-/etc/sysconfig/syslog-ng
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+StandardOutput=journal
-ExecStart=/sbin/syslog-ng $SYSLOGNG_OPTIONS
+StandardError=journal
-Sockets=syslog.socket
+Restart=on-failure
-StandardOutput=null
 
 [Install]
 WantedBy=multi-user.target

syslog-ng.sysconfig

@@ -1,5 +0,0 @@
-#---
-# Syslog-ng command line options
-# See syslog-ng(8) for more details
-#---
-SYSLOGNG_OPTIONS="-F -p /var/run/syslogd.pid"