version bump fix #501988 #501982 #501986 #490744 thx to @Whissi

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

14 files changed, 752 insertions, 590 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 7d670080cdf1..816543139d91 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.111 2014/04/16 16:14:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.112 2014/05/22 11:15:49 ultrabug Exp $
+
+*rsyslog-7.6.3 (22 May 2014)
+
+  22 May 2014; Ultrabug <ultrabug@gentoo.org> -rsyslog-7.4.3.ebuild,
+  -rsyslog-7.4.6.ebuild, -rsyslog-7.4.7.ebuild, +rsyslog-7.6.3.ebuild,
+  +files/7-stable/50-default.conf, +files/7-stable/README.gentoo,
+  +files/7-stable/bugfix_52.patch, +files/7-stable/bugfix_73.patch,
+  +files/7-stable/fix-omruleset-default-value.patch,
+  +files/7-stable/rsyslog.conf, +files/7-stable/rsyslog.confd-r1,
+  +files/7-stable/rsyslog.initd-r1, +files/7-stable/rsyslog.logrotate-r1,
+  metadata.xml:
+  version bump fix #501988 #501982 #501986 #490744 thx to @Whissi, drop old
+  versions
 
   16 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org>
   +files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
diff --git a/app-admin/rsyslog/files/7-stable/50-default.conf b/app-admin/rsyslog/files/7-stable/50-default.conf
new file mode 100644
index 000000000000..9ae8578215bb
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/50-default.conf
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+	type="omfile"
+	File="/var/log/auth.log"
+	FileCreateMode="0600"
+	FileOwner="root"
+	FileGroup="adm"
+	Sync="off"
+)
+
+cron.* action(
+	type="omfile"
+	File="/var/log/cron.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+daemon.* action(
+	type="omfile"
+	File="/var/log/daemon.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+kern.* action(
+	type="omfile"
+	File="/var/log/kern.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+lpr.* action(
+	type="omfile"
+	File="/var/log/lpr.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+mail.* action(
+	type="omfile"
+	File="/var/log/mail.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+news.* action(
+	type="omfile"
+	File="/var/log/news.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+user.* action(
+	type="omfile"
+	File="/var/log/user.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+	type="omfile"
+	File="/var/log/debug.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+	type="omfile"
+	File="/var/log/messages"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#	type="omfile"
+#	File="/var/log/syslog"
+#	FileOwner="root"
+#	FileGroup="adm"
+#)
+
+*.emerg action(
+	type="omusrmsg"
+	Users="*"
+	action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/7-stable/README.gentoo b/app-admin/rsyslog/files/7-stable/README.gentoo
new file mode 100644
index 000000000000..9f0666c86b0a
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/README.gentoo
@@ -0,0 +1,36 @@
+Introduction
+============
+
+Since rsyslog version 7.6 we are shipping a new default Gentoo
+configuration. See bug #501982 to learn more about what we were trying to
+achieve by rewriting the entire configuration.
+
+
+Important changes
+=================
+
+1. "/var/log/syslog" log file is now deprecated
+
+   Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
+   longer being written per default. We are considering this file as
+   deprecated/obsolet for the typical user/system.
+   The content from this log file is still availble through other
+   (dedicated) log files, see
+   
+     - /var/log/cron.log
+     - /var/log/daemon.log
+     - /var/log/mail.log
+     - /var/log/messages
+   
+   If you really need the old "/var/log/syslog" log file, all you have to
+   do is uncommenting the corresponding configuration directive in
+   "/etc/rsyslog.d/50-default.conf".
+   
+   If you do so, don't forget to re-enable log rotation in
+   "/etc/logrotate.d/rsyslog", too.
+
+
+2. An additional input socket in "/var/empty/dev/log" (default chroot
+   location) will be created per default
+
+   See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_52.patch b/app-admin/rsyslog/files/7-stable/bugfix_52.patch
new file mode 100644
index 000000000000..f5da7b92f3bf
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/bugfix_52.patch
@@ -0,0 +1,100 @@
+From b017e29aad70702c69e6016b07a932b7825a83e5 Mon Sep 17 00:00:00 2001
+From: Thomas D <whissi@whissi.de>
+Date: Sat, 3 May 2014 14:45:25 +0200
+Subject: [PATCH] Remove "--enable-cached-man-pages" switch and make rst2man
+ optional when required man pages already exist
+
+This commit backports the bugfix for issue #52 for the v7-stable branch.
+---
+ configure.ac | 61 +++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 36 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0dd40c2..07d96dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1087,30 +1087,6 @@ fi
+ AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes)
+ 
+ 
+-# Support using cached man file copies, to avoid the need for rst2man
+-# in the build environment
+-AC_ARG_ENABLE(cached_man_pages,
+-        [AS_HELP_STRING([--enable-cached-man-pages],[Enable using cached versions of man files (avoid rst2man) @<:@default=no@:>@])],
+-        [case "${enableval}" in
+-         yes) enable_cached_man_pages="yes" ;;
+-          no) enable_cached_man_pages="no" ;;
+-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-cached-man-pages) ;;
+-         esac],
+-        [enable_cached_man_pages=no]
+-)
+-if test "x$enable_cached_man_pages" = "xno"; then
+-# obtain path for rst2man
+-  if test "x$enable_libgcrypt" = "xyes" || \
+-     test "x$enable_guardtime" = "xyes"; then
+-        AC_PATH_PROG([RST2MAN], [rst2man])
+-        if test "x${RST2MAN}" == "x"; then
+-            AC_MSG_FAILURE([rst2man not found in PATH])
+-        fi
+-  fi
+-fi
+-
+-
+-
+ # RFC 3195 support
+ AC_ARG_ENABLE(rfc3195,
+         [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
+@@ -1519,6 +1495,41 @@ AM_CONDITIONAL(ENABLE_OMHIREDIS, test x$enable_omhiredis = xyes)
+ 
+ # END HIREDIS SUPPORT
+ 
++
++AC_CHECKING([if required man pages already exist])
++have_to_generate_man_pages="no"
++
++# man pages for libgcrypt module
++if test "x$enable_usertools" = "xyes" && test "x$enable_libgcrypt" = "xyes"; then
++    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
++        [],
++        [have_to_generate_man_pages="yes"]
++    )
++fi
++
++# man pages for GuardTime module
++if test "x$enable_usertools" = "xyes" && test "x$enable_guardtime" = "xyes"; then
++    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
++        [],
++        [have_to_generate_man_pages="yes"]
++    )
++fi
++
++if test "x$have_to_generate_man_pages" = "xyes"; then
++    AC_MSG_RESULT([Some man pages are missing. We need rst2man to generate the missing man pages from source...])
++else
++    AC_MSG_RESULT([All required man pages found. We don't need rst2man!])
++fi
++
++if test "x$have_to_generate_man_pages" = "xyes"; then
++    # We need rst2man to generate our man pages
++    AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py], [])
++    if test -z "$RST2MAN"; then
++        AC_MSG_ERROR([rst2man is required to build man pages. You can use the release tarball with pregenerated man pages to avoid this depedency.])
++    fi
++fi
++
++
+ AC_CONFIG_FILES([Makefile \
+ 		runtime/Makefile \
+ 		compat/Makefile \
+@@ -1594,7 +1605,7 @@ echo "    Zlib compression support enabled:         $enable_zlib"
+ echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
+ echo "    rsyslogd will be built:                   $enable_rsyslogd"
+ echo "    GUI components will be built:             $enable_gui"
+-echo "    cached man files will be used:            $enable_cached_man_pages"
++echo "    have to generate man pages:               $have_to_generate_man_pages"
+ echo "    Unlimited select() support enabled:       $enable_unlimited_select"
+ echo "    uuid support enabled:                     $enable_uuid"
+ echo "    Log file signing support:                 $enable_guardtime"
+-- 
+1.9.2
+
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_73.patch b/app-admin/rsyslog/files/7-stable/bugfix_73.patch
new file mode 100644
index 000000000000..cc295d614def
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/bugfix_73.patch
@@ -0,0 +1,103 @@
+This patch will update the pre-generated rscryutil man page from the release
+tarball so we don't need to depend on dev-python/docutils.
+
+https://github.com/rsyslog/rsyslog/issues/73
+
+diff -rupN old/rsyslog-7.6.3/tools/rscryutil.1 new/rsyslog-7.6.3/tools/rscryutil.1
+--- old/rsyslog-7.6.3/tools/rscryutil.1	2013-10-29 16:31:21.000000000 +0100
++++ new/rsyslog-7.6.3/tools/rscryutil.1	2014-05-03 20:41:46.143825094 +0200
+@@ -1,4 +1,4 @@
+-.\" Man page generated from reStructeredText.
++.\" Man page generated from reStructuredText.
+ .
+ .TH RSCRYUTIL 1 "2013-04-15" "" ""
+ .SH NAME
+@@ -31,12 +31,16 @@ level margin: \\n[rst2man-indent\\n[rst2
+ .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+ ..
+ .SH SYNOPSIS
++.INDENT 0.0
++.INDENT 3.5
+ .sp
+ .nf
+ .ft C
+ rscryutil [OPTIONS] [FILE] ...
+ .ft P
+ .fi
++.UNINDENT
++.UNINDENT
+ .SH DESCRIPTION
+ .sp
+ This tool performs various operations on encrypted log files.
+@@ -44,46 +48,46 @@ Most importantly, it provides the abilit
+ .SH OPTIONS
+ .INDENT 0.0
+ .TP
+-.B \-d,  \-\-decrypt
++.B \-d\fP,\fB  \-\-decrypt
+ Select decryption mode. This is the default mode.
+ .TP
+-.BI \-W,  \-\-write\-keyfile \ <file>
++.BI \-W\fP,\fB  \-\-write\-keyfile \ <file>
+ Utility function to write a key to a keyfile. The key can be obtained
+ via any method.
+ .TP
+-.B \-v,  \-\-verbose
++.B \-v\fP,\fB  \-\-verbose
+ Select verbose mode.
+ .TP
+-.B \-f,  \-\-force
++.B \-f\fP,\fB  \-\-force
+ Forces operations that otherwise would fail.
+ .TP
+-.BI \-k,  \-\-keyfile \ <file>
++.BI \-k\fP,\fB  \-\-keyfile \ <file>
+ Reads the key from <file>. File _must_ contain the key, only, no headers
+ or other meta information. Keyfiles can be generated via the
+ \fI\-\-write\-keyfile\fP option.
+ .TP
+-.BI \-p,  \-\-key\-program \ <path\-to\-program>
++.BI \-p\fP,\fB  \-\-key\-program \ <path\-to\-program>
+ In this mode, the key is provided by a so\-called "key program". This program
+ is executed and must return the key to (as well as some meta information)
+ via stdout. The core idea of key programs is that using this interface the
+ user can implement as complex (and secure) method to obtain keys as
+ desired, all without the need to make modifications to rsyslog.
+ .TP
+-.BI \-K,  \-\-key \ <KEY>
++.BI \-K\fP,\fB  \-\-key \ <KEY>
+ TESTING AID, NOT FOR PRODUCTION USE. This uses the KEY specified
+ on the command line. This is the actual key, and as such this mode
+ is highly insecure. However, it can be useful for intial testing
+ steps. This option may be removed in the future.
+ .TP
+-.BI \-a,  \-\-algo \ <algo>
++.BI \-a\fP,\fB  \-\-algo \ <algo>
+ Sets the encryption algorightm (cipher) to be used. See below
+ for supported algorithms. The default is "AES128".
+ .TP
+-.BI \-m,  \-\-mode \ <mode>
++.BI \-m\fP,\fB  \-\-mode \ <mode>
+ Sets the ciphermode to be used. See below for supported modes.
+ The default is "CBC".
+ .TP
+-.BI \-r,  \-\-generate\-random\-key \ <bytes>
++.BI \-r\fP,\fB  \-\-generate\-random\-key \ <bytes>
+ Generates a random key of length <bytes>. This option is
+ meant to be used together with \fI\-\-write\-keyfile\fP (and it is hard
+ to envision any other valid use for it).
+@@ -97,7 +101,7 @@ multiple operations mode are set on the
+ unpredictable.
+ .SS decrypt
+ .sp
+-The provided log files are decrypted. Note that the \fI.encinfo\fP side files
++The provided log files are decrypted. Note that the \fI\&.encinfo\fP side files
+ must exist and be accessible in order for decryption to to work.
+ .SS write\-keyfile
+ .sp
+@@ -198,5 +202,4 @@ LGPLv2.
+ .SH AUTHOR
+ Rainer Gerhards <rgerhards@adiscon.com>
+ .\" Generated by docutils manpage writer.
+-.\" 
+ .
diff --git a/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch b/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
new file mode 100644
index 000000000000..816471caffa7
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
@@ -0,0 +1,25 @@
+From 14f3b45151864aa4170de515f406a69ad2931eba Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 31 Oct 2013 18:21:47 +0100
+Subject: [PATCH] module omruleset is no longer enabled by default.
+
+Note that it has been deprecated in v7 and been replaced by the "call"
+statement. Also, it can still be build without problems, the option must
+just explicitely be given.
+---
+diff --git a/configure.ac b/configure.ac
+index 3abd559..de4c3ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1353,7 +1353,7 @@ AC_ARG_ENABLE(omruleset,
+           no) enable_omruleset="no" ;;
+            *) AC_MSG_ERROR(bad value ${enableval} for --enable-omruleset) ;;
+          esac],
+-        [enable_omruleset=yes]
++        [enable_omruleset=no]
+ )
+ AM_CONDITIONAL(ENABLE_OMRULESET, test x$enable_omruleset = xyes)
+ 
+-- 
+1.9.1
+
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.conf b/app-admin/rsyslog/files/7-stable/rsyslog.conf
new file mode 100644
index 000000000000..da484598a652
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.conf
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+	load="builtin:omfile"
+	Template="RSYSLOG_TraditionalFileFormat"
+	FileCreateMode="0644"
+	DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
new file mode 100644
index 000000000000..d8cbe875960a
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# 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
+RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
new file mode 100644
index 000000000000..90a9702f6e1c
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1,v 1.1 2014/05/22 11:15:49 ultrabug Exp $
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}"
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files=( "${RSYSLOG_CONFIGFILE}" )
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+	need clock hostname localmount
+	provide logger
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	rm -f ${RSYSLOG_PIDFILE}
+}
+
+configtest() {
+	# This will currently only detect fatal errors
+	# See https://github.com/rsyslog/rsyslog/issues/79
+
+	local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}"
+	local _retval=0
+
+	ebegin "Checking rsyslogd's configuration"
+	${_test_command} &>/dev/null
+	_retval=$?
+
+	if [ ${_retval} -ne 0 ]; then
+		${_test_command}
+	fi
+
+	eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+	ebegin "Re-opening rsyslogd logs"
+	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+	eend $?
+}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
new file mode 100644
index 000000000000..1eae30e0d741
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#	rotate 7
+#	daily
+#	missingok
+#	notifempty
+#	delaycompress
+#	compress
+#	postrotate
+#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#	endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+	endscript
+}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index bd711f139060..6f23de3e8171 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,23 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ultrabug@gentoo.org</email>
-    <name>Ultrabug</name>
-    <description>Primary Maintainer</description>
-  </maintainer>
-  <maintainer>
-    <email>whissi@whissi.de</email>
-    <name>Thomas D. (Whissi)</name>
-    <description>Proxy-Maintainer, CC. bugs</description>
-  </maintainer>
-  <use>
-    <flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
-    <flag name="mongodb">Add support for the MongoDB output template module using <pkg>dev-libs/libmongo-client</pkg></flag>
-    <flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
-    <flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
-  </upstream>
+	<maintainer>
+		<email>ultrabug@gentoo.org</email>
+		<name>Ultrabug</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>whissi@whissi.de</email>
+		<name>Thomas D. (Whissi)</name>
+		<description>Proxy-Maintainer, CC. bugs</description>
+	</maintainer>
+	<use>
+		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
+		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
+		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
+		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+		<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
+		<flag name="oracle">Build the Oracle database output module (requires <pkg>dev-db/oracle-instantclient-basic</pkg>)</flag>
+		<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
+		<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
+		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
+		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
+		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
+		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
+		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
+		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
+		<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
+		<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/zeromq</pkg>)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
+		<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-7.4.3.ebuild b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
deleted file mode 100644
index 007d1ae8dad0..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.3.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.8 2014/04/16 16:14:41 maksbotan Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.5
-	dev-libs/libgcrypt:0
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-PATCHES=(
-	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch
-	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch
-	"$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-)
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-7.4.6.ebuild b/app-admin/rsyslog/rsyslog-7.4.6.ebuild
deleted file mode 100644
index 73b852e64afb..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.6 2014/04/16 16:14:41 maksbotan Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.9
-	dev-libs/libgcrypt:0
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd omjournal)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-7.4.7.ebuild b/app-admin/rsyslog/rsyslog-7.6.3.ebuild
index 4eac17feddb9..9a5e38b85242 100644
--- a/app-admin/rsyslog/rsyslog-7.4.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.6.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v 1.5 2014/04/16 16:14:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3.ebuild,v 1.1 2014/05/22 11:15:49 ultrabug Exp $
 
 EAPI=5
-AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils eutils systemd
 
@@ -12,118 +12,168 @@ HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="dbi debug doc extras kerberos mongodb mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
+IUSE="dbi debug doc elasticsearch +gcrypt kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
 
 RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libee
+	>=dev-libs/json-c-0.11:=
 	>=dev-libs/libestr-0.1.9
-	dev-libs/libgcrypt:0=
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
 	kerberos? ( virtual/krb5 )
-	mongodb? ( dev-libs/libmongo-client )
+	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-0.3.1:=
+		!>=dev-libs/liblognorm-1.0.0
+	)
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
+	postgres? ( >=dev-db/postgresql-base-8.4.20 )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	relp? ( >=dev-libs/librelp-1.2.5 )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23 )
+	systemd? ( >=sys-apps/systemd-208 )
+	zeromq? ( >=net-libs/czmq-1.2.0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 BRANCH="7-stable"
 
-# need access to certain device nodes
+# Test suite requires a special setup or will always fail
 RESTRICT="test"
 
 # Maitainer note : open a bug to upstream
 # showing that building in a separate dir fails
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
 
-src_prepare() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
+DOCS=(
+	AUTHORS
+	ChangeLog
+	doc/rsyslog-example.conf
+	"${FILESDIR}"/${BRANCH}/README.gentoo
+)
+
+PATCHES=(
+	"${FILESDIR}"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+	"${FILESDIR}"/${BRANCH}/fix-omruleset-default-value.patch
+	"${FILESDIR}"/${BRANCH}/bugfix_52.patch
+	"${FILESDIR}"/${BRANCH}/bugfix_73.patch
+)
 
 src_configure() {
 	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
 	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
+		# Input Plugins without depedencies
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
+		--enable-imttcp
+		# Message Modificiation Plugins without depedencies
 		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
 		--enable-omprog
+		--enable-omruleset
 		--enable-omstdout
 		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmcisconames
 		--enable-pmlastmsg
 		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
 		--enable-pmsnare
 		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
+		# DB
 		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable oracle)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
 		$(use_enable debug)
-		$(use_enable debug rtinst)
 		$(use_enable debug diagtools)
+		$(use_enable debug imdiag)
 		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
 		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
+		$(use_enable normalize mmnormalize)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
 		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
 		$(use_enable snmp)
 		$(use_enable snmp mmsnmptrapd)
 		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
 		$(use_enable systemd omjournal)
-		$(use_enable zlib)
+		$(use_enable usertools)
 		$(use_enable zeromq imzmq3)
 		$(use_enable zeromq omzmq3)
 		"$(systemd_with_unitdir)"
 	)
+
 	autotools-utils_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS=(doc/)
+	use doc && HTML_DOCS=( "${S}"/doc/ )
 	autotools-utils_src_install
 
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
 	keepdir /etc/ssl/${PN}
 	keepdir /etc/${PN}.d
 
-	use static-libs || find "${D}" -name '*.la' -delete || die
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate-r1" ${PN}
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
@@ -134,25 +184,50 @@ src_install() {
 		insinto /usr/share/doc/${PF}/scripts/pgsql
 		doins plugins/ompgsql/createDB.sql
 	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
 }
 
 pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
 	fi
 
-	if use ssl; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
+		# Show this message until rsyslog-8.x
 		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
+		elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
+		elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
+
+		advertise_readme=1
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
 	fi
 }
 
@@ -164,7 +239,7 @@ pkg_config() {
 	fi
 
 	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
+	CERTDIR="${EROOT}/etc/ssl/${PN}"
 	if [ ! -d "${CERTDIR}" ]; then
 		mkdir "${CERTDIR}" || die
 	fi