update to 3.37.1

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

.gitignore

@@ -1 +1,48 @@
 syslog-ng_3.1.1.tar.gz
+/syslog-ng-3.2.2.tar.bz2
+/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

rsyslog-3.14.1-logrotate.d-rsyslog.log

@@ -1,6 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
-    sharedscripts
-    postrotate
-        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
-    endscript
-}

rsyslog-syslog-ng-fc10.sysconfig

@@ -1,3 +0,0 @@
-SYSLOGNG_PID="/var/run/syslog-ng.pid"
-SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
-SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"

rsyslog-syslog-ng.sysconfig

@@ -1,3 +0,0 @@
-SYSLOGNG_PID="/var/run/syslog-ng.pid"
-SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
-SYSLOGNG_COMPAT_PID="/var/run/rsyslogd.pid"

sources

@@ -1 +1 @@
-4fdc64ff0ad964dc811a746228609412  syslog-ng_3.1.1.tar.gz
+SHA512 (syslog-ng-3.37.1.tar.gz) = beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7

sysklogd-1.4.1-44-logrotate.d-syslog.log

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

sysklogd-1.4.1-logrotate.d-syslog.log

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

sysklogd-syslog-ng.sysconfig

@@ -1,3 +0,0 @@
-SYSLOGNG_PID="/var/run/syslog-ng.pid"
-SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
-SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"

syslog-ng-2.1.4-libnet.patch

@@ -1,12 +0,0 @@
-diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
---- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
-+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
-@@ -466,7 +466,7 @@
- elif test "x$enable_static_linking" = "xyes"; then
- 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
- else
--	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
-+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
- fi
- LIBS="$DEPS_LIBS"
- YFLAGS="-d"

syslog-ng.conf

@@ -1,4 +1,5 @@
-@version:3.0
+@version: 3.35
+@include "scl.conf"
 
 # syslog-ng configuration file.
 #
@@ -7,23 +8,24 @@
 #
 # 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);
-	use_dns (no);
-	use_fqdn (no);
-	create_dirs (no);
-	keep_hostname (yes);
+    flush_lines (0);
+    time_reopen (10);
+    log_fifo_size (1000);
+    chain_hostnames (off);
+    use_dns (no);
+    use_fqdn (no);
+    create_dirs (no);
+    keep_hostname (yes);
 };
 
 source s_sys {
-	file ("/proc/kmsg" program_override("kernel: "));
-	unix-stream ("/dev/log");
-	internal();
-	# udp(ip(0.0.0.0) port(514));
+    system();
+    internal();
+    # udp(ip(0.0.0.0) port(514));
 };
 
 destination d_cons { file("/dev/console"); };
@@ -39,13 +41,13 @@ destination d_mlal { usertty("*"); };
 filter f_kernel     { facility(kern); };
 filter f_default    { level(info..emerg) and
                         not (facility(mail)
-                        or facility(authpriv) 
+                        or facility(authpriv)
                         or facility(cron)); };
 filter f_auth       { facility(authpriv); };
 filter f_mail       { facility(mail); };
 filter f_emergency  { level(emerg); };
 filter f_news       { facility(uucp) or
-                        (facility(news) 
+                        (facility(news)
                         and level(crit..emerg)); };
 filter f_boot   { facility(local7); };
 filter f_cron   { facility(cron); };
@@ -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.init.d

@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-# syslog-ng starts/stops syslog-ng service
-#
-# chkconfig: - 12 88
-# description: Syslog is the facility by which many daemons use to log \
-#     messages to various system log files.
-#
-
-### BEGIN INIT INFO
-# Provides: $syslog
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Short-Description: Next-generation syslog server
-# Description: syslog-ng, as the name shows, is a syslogd replacement, but
-#     with new functionality for the new generation. The original syslogd
-#     allows messages only to be sorted based on priority/facility pairs;
-#     syslog-ng adds the possibility to filter based on message contents
-#     using regular expressions. The new configuration scheme is intuitive
-#     and powerful.  Forwarding logs over TCP and remembering all forwarding
-#     hops makes it ideal for firewalled environments.  
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-[ -e /etc/sysconfig/syslog-ng ] && . /etc/sysconfig/syslog-ng
-
-RETVAL=0
-
-check_syntax()
-{
-	[ -x /sbin/syslog-ng ] || exit 5
-	syslog-ng -s $SYSLOGNG_OPTIONS
-	RETVAL=$?
-	return $RETVAL
-}
-
-verify_config()
-{
-	check_syntax
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] || exit $retval
-}
-
-checkconfig()
-{
-	action $"Checking Configuration: " check_syntax
-}
-
-start()
-{
-	verify_config
-	echo -n $"Starting syslog-ng: "
-	if [ -e $SYSLOGNG_COMPAT_PID ]; then
-		failure "PID file for existing syslog daemon exists"
-	fi
-	daemon syslog-ng $SYSLOGNG_OPTIONS
-	ln -sf $SYSLOGNG_PID $SYSLOGNG_COMPAT_PID
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
-	return $RETVAL
-}
-
-stop()
-{
-	echo -n $"Stopping syslog-ng: "
-	REMOVE_COMPAT_PID=0
-	if [ -e $SYSLOGNG_PID ]; then
-		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
-			REMOVE_COMPAT_PID=1
-		fi
-	fi
-	killproc syslog-ng
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/syslog-ng
-	[ $RETVAL -eq 0 -a $REMOVE_COMPAT_PID -eq 1 ] && rm -f $SYSLOGNG_COMPAT_PID
-	return $RETVAL
-}
-
-reload()
-{
-	verify_config
-	echo -n $"Reloading syslog-ng: "
-	killproc syslog-ng -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}
-
-restart()
-{
-	stop
-	start
-}
-
-
-case "$1" in
-	start|stop|reload)
-		$1
-		;;
-	restart|force_reload)
-		restart
-		;;
-	status)
-		status syslog-ng
-		;;
-	checkconfig|configtest|check|test)
-		checkconfig
-		;;
-	condrestart|try-restart)
-		[ -f /var/lock/subsys/syslog-ng ] && restart || :
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|reload|condrestart|checkconfig}"
-		exit 1
-esac
-
-exit $?
-
-# vim: ft=sh:ts=4:ai:si:

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

@@ -0,0 +1,16 @@
+[Unit]
+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
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

syslog-ng.vim

@@ -1,52 +0,0 @@
-" Vim syntax file
-" Language:	syslog-ng: syslog-ng main configuration file (1.5.5a)
-" Maintainer:	--
-" Last change:	2001 Apr 13
-" URL:		--
-" syslog-ng's home:	http://www.balabit.hu
-" Something like this in filetype.vim would be helpful
-"   au BufNewFile,BufRead syslog-ng.conf		setf syslog-ng
-
-
-" Remove any old syntax stuff hanging around
-syn clear
-syn case match
-set iskeyword=a-z,A-Z,48-57,_,-,.
-
-syn keyword sysngStatement	source destination filter log options
-syn match sysngComment		"#.*$"
-syn match sysngString		+"[^"]*"+
-syn match sysngOctNumber	"\<0\o\+\>"
-syn match sysngDecNumber	"\<\d\+\>"
-syn match sysngHexNumber	"\<0x\x\+\>"
-syn keyword sysngBool		yes no on off
-syn match sysngIdentifier	"\<[sdf]_\+\>"
-
-syn keyword sysngDriver		internal remote_control
-syn keyword sysngDriver		file fifo pipe door
-syn keyword sysngDriver		udp tcp udp6 tcp6
-syn keyword sysngDriver		sun_stream sun_streams sun-stream sun-streams
-syn keyword sysngDriver		unix_dgram unix_stream unix-dgram unix-stream
-syn keyword sysngDriver		usertty program
-
-syn keyword sysngFilter		not and or .. level priority facility
-syn keyword sysngFilter		program host match DEFAULT
-
-if !exists("did_sysng_syntax_inits")
-    let did_sysng_syntax_inits = 1
-
-    hi link sysngStatement	Statement
-    hi link sysngComment	Comment
-    hi link sysngString		String
-    hi link sysngOctNumber	Number
-    hi link sysngDecNumber	Number
-    hi link sysngHexNumber	Number
-    hi link sysngBool		Constant
-    hi link sysngIdentifier	Identifier
-
-    hi link sysngDriver		Type
-    hi link sysngFilter		Operator
-endif
-
-let b:current_syntax = "syslog-ng"
-