Version bump (bug #292919), also solves bug #283416 and #339985. Thanks to Ultrabug for the version bump and extensions/fixes and Mike Nerone for testing.

(Portage version: 2.2_rc98/cvs/Linux x86_64)

6 files changed, 69 insertions, 38 deletions

diff --git a/app-admin/rsyslog/files/3-devel/rsyslog.conf b/app-admin/rsyslog/files/3-devel/rsyslog.conf
deleted file mode 100644
index 5abd19260b7a..000000000000
--- a/app-admin/rsyslog/files/3-devel/rsyslog.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Config file for /etc/init.d/rsyslog for Gentoo Linux
-
-CONFIGFILE="/etc/rsyslog.conf"
-
-PIDFILE="/var/run/rsyslogd.pid"
-
-# Options to rsyslogd
-# See rsyslogd(8) for more details
-# Notes:
-# * Do not specify another PIDFILE but use the variable above to change the location
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-# * "-c3" tells rsyslog to _not_ run in sysklogd compatibility mode
-
-RSYSLOG_OPTS="-c3"
diff --git a/app-admin/rsyslog/files/3-devel/rsyslog.logrotate b/app-admin/rsyslog/files/3-devel/rsyslog.logrotate
deleted file mode 100644
index 674af8bef691..000000000000
--- a/app-admin/rsyslog/files/3-devel/rsyslog.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-devel/rsyslog.logrotate,v 1.1 2008/04/09 17:32:55 dev-zero Exp $
-#
-# Syslog-ng logrotate snippet for Gentoo Linux
-#
-
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
-    sharedscripts
-    postrotate
-        /etc/init.d/rsyslog reload > /dev/null 2>&1 || true
-    endscript
-}
diff --git a/app-admin/rsyslog/files/3-devel/rsyslog-gentoo.conf b/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf
index 2ff7d2713e0c..40442c96fa83 100644
--- a/app-admin/rsyslog/files/3-devel/rsyslog-gentoo.conf
+++ b/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf
@@ -1,4 +1,4 @@
-# rsyslog v3: load input modules
+# rsyslog v5: load input modules
 # If you do not load inputs, nothing happens!
 # You may need to set the module load path if modules are not found.
 
@@ -6,6 +6,15 @@ $ModLoad immark.so # provides --MARK-- message capability
 $ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
 $ModLoad imklog.so # kernel logging (formerly provided by rklogd)
 
+# Include configuration files from directory
+$IncludeConfig /etc/rsyslog.d/*
+
+# Check config syntax on startup and abort if unclean (default off)
+#$AbortOnUncleanConfig on
+
+# Reduce repeating messages (default off)
+#$RepeatedMsgReduction on
+
 # Log all kernel messages to the console.
 # Logging much else clutters up the screen.
 #kern.*                                                 /dev/console
@@ -20,7 +29,6 @@ authpriv.*                                              /var/log/secure
 # Log all the mail messages in one place.
 mail.*                                                  -/var/log/maillog
 
-
 # Log cron stuff
 cron.*                                                  -/var/log/cron
 
@@ -33,28 +41,50 @@ uucp,news.crit                                          -/var/log/spooler
 # Save boot messages also to boot.log
 local7.*                                                /var/log/boot.log
 
+# More configuration examples:
+#
 # Remote Logging (we use TCP for reliable delivery)
 # An on-disk queue is created for this action. If the remote host is
 # down, messages are spooled to disk and sent when it is up again.
-#$WorkDirectory /rsyslog/spool # where to place spool files
+#$WorkDirectory /var/spool/rsyslog # where to place spool files
 #$ActionQueueFileName uniqName # unique name prefix for spool files
 #$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
 #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
 #$ActionQueueType LinkedList   # run asynchronously
 #$ActionResumeRetryCount -1    # infinety retries if host is down
+#$ActionResumeInterval 30      # retry interval
 # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
 #*.* @@remote-host
 
+# Remote Logging with TCP + SSL/TLS
+#$DefaultNetstreamDriver gtls
+#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem
+#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_CLIENT.cert.pem
+#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_CLIENT.key.pem
+#$ActionSendStreamDriverAuthMode x509/name # enable peer authentication
+#$ActionSendStreamDriverPermittedPeer foo # authorize to send encrypted data to server foo
+#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode
 
-# ######### Receiving Messages from Remote Hosts ########## 
+# ######### Receiving Messages from Remote Hosts ##########
 # TCP Syslog Server:
-# provides TCP syslog reception and GSS-API (if compiled to support it)
-#$ModLoad imtcp.so  # load module
-# Note: as of now, you need to use the -t command line option to
-# enable TCP reception (e.g. -t514 to run a server at port 514/tcp)
-# This will change in later v3 releases.
+#$ModLoad imtcp  # provides TCP syslog reception
+#$TCPServerRun 10514 # start a TCP syslog server at port 10514
+
+# TCP + SSL/TLS Syslog Server:
+#$ModLoad imtcp  # provides TCP syslog reception
+#$DefaultNetstreamDriver gtls # use gnuTLS for data encryption
+#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem
+#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_SERVER.cert.pem
+#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_SERVER.key.pem
+#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode
+#$InputTCPServerStreamDriverAuthMode x509/name # enable peer authentication
+#$InputTCPServerStreamDriverPermittedPeer bar # authorize client named bar (one line per client)
+#$TCPServerRun 10514 # start a TCP syslog server at port 10514
 
 # UDP Syslog Server:
 #$ModLoad imudp.so  # provides UDP syslog reception
 #$UDPServerRun 514 # start a UDP syslog server at standard port 514
 
+# RELP Syslog Server:
+#$ModLoad imrelp  # provides RELP syslog reception
+#$InputRELPServerRun 10515 # start a RELP syslog server at port 10515
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.confd b/app-admin/rsyslog/files/5-stable/rsyslog.confd
new file mode 100644
index 000000000000..85e90edc0783
--- /dev/null
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.confd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
+
+# Configuration file
+CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+PIDFILE="/var/run/rsyslogd.pid"
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode
+RSYSLOG_OPTS="-c5"
diff --git a/app-admin/rsyslog/files/3-devel/rsyslog.init b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index a2fdde55d6d8..68ff86c06ec8 100644
--- a/app-admin/rsyslog/files/3-devel/rsyslog.init
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-devel/rsyslog.init,v 1.2 2008/08/14 06:47:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
 
 opts="reload"
 
@@ -30,8 +30,8 @@ reload() {
 		eerror "rsyslogd not running"
 		return 1
 	fi
-	
-	ebegin "Reloading configuration and re-opening log files"
+
+	ebegin "Re-opening rsyslogd log files"
 	start-stop-daemon --stop --oknodo --signal HUP \
 		--pidfile "${PIDFILE}"
 	eend $?
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.logrotate b/app-admin/rsyslog/files/5-stable/rsyslog.logrotate
new file mode 100644
index 000000000000..86095def1c24
--- /dev/null
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.logrotate
@@ -0,0 +1,9 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.logrotate,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    sharedscripts
+    postrotate
+        /etc/init.d/rsyslog reload &>/dev/null || true
+    endscript
+}