8 files changed, 7 insertions, 515 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index c18d9e46452e..f28e73d7f23f 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.48 2011/05/13 22:10:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.49 2011/05/16 09:45:14 ultrabug Exp $
+
+  16 May 2011; Ultrabug <ultrabug@gentoo.org> -files/3-stable/rsyslog.conf,
+  -files/3-stable/rsyslog.init, -files/3-stable/rsyslog.logrotate,
+  -rsyslog-3.22.0.ebuild, -files/3-stable/rsyslog-gentoo.conf,
+  -rsyslog-3.22.1.ebuild, -rsyslog-5.6.4.ebuild:
+  Remove obsolete v3 branch. Drop old wrt #361219.
 
   13 May 2011; Markos Chandras <hwoarang@gentoo.org> rsyslog-5.6.5.ebuild:
   Stable on amd64 wrt bug #361219
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf b/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf
deleted file mode 100644
index 2ff7d2713e0c..000000000000
--- a/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# rsyslog v3: 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.
-
-$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)
-
-# Log all kernel messages to the console.
-# Logging much else clutters up the screen.
-#kern.*                                                 /dev/console
-
-# Log anything (except mail) of level info or higher.
-# Don't log private authentication messages!
-*.info;mail.none;authpriv.none;cron.none                -/var/log/messages
-
-# The authpriv file has restricted access.
-authpriv.*                                              /var/log/secure
-
-# Log all the mail messages in one place.
-mail.*                                                  -/var/log/maillog
-
-
-# Log cron stuff
-cron.*                                                  -/var/log/cron
-
-# Everybody gets emergency messages
-*.emerg                                                 *
-
-# Save news errors of level crit and higher in a special file.
-uucp,news.crit                                          -/var/log/spooler
-
-# Save boot messages also to boot.log
-local7.*                                                /var/log/boot.log
-
-# 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
-#$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
-# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
-#*.* @@remote-host
-
-
-# ######### 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.
-
-# UDP Syslog Server:
-#$ModLoad imudp.so  # provides UDP syslog reception
-#$UDPServerRun 514 # start a UDP syslog server at standard port 514
-
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog.conf b/app-admin/rsyslog/files/3-stable/rsyslog.conf
deleted file mode 100644
index 5abd19260b7a..000000000000
--- a/app-admin/rsyslog/files/3-stable/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-stable/rsyslog.init b/app-admin/rsyslog/files/3-stable/rsyslog.init
deleted file mode 100644
index 3b09da6be910..000000000000
--- a/app-admin/rsyslog/files/3-stable/rsyslog.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.init,v 1.2 2008/08/14 06:47:38 dev-zero Exp $
-
-opts="reload"
-
-depend() {
-	provide logger
-}
-
-start() {
-	ebegin "Starting rsyslogd"
-	start-stop-daemon \
-		--start --quiet --exec /usr/sbin/rsyslogd \
-		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rsyslogd"
-	start-stop-daemon \
-		--stop --quiet \
-		--pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	if [ ! -f "${PIDFILE}" ]; then
-		eerror "rsyslogd not running"
-		return 1
-	fi
-	
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog.logrotate b/app-admin/rsyslog/files/3-stable/rsyslog.logrotate
deleted file mode 100644
index 44772728d420..000000000000
--- a/app-admin/rsyslog/files/3-stable/rsyslog.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.logrotate,v 1.1 2008/04/09 17:32:56 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/rsyslog-3.22.0.ebuild b/app-admin/rsyslog/rsyslog-3.22.0.ebuild
deleted file mode 100644
index 5a5d5a873a93..000000000000
--- a/app-admin/rsyslog/rsyslog-3.22.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.22.0.ebuild,v 1.6 2011/04/07 07:50:20 ultrabug Exp $
-
-EAPI="2"
-
-inherit versionator
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
-
-DEPEND="kerberos? ( virtual/krb5 )
-	dbi? ( dev-db/libdbi )
-	gnutls? ( net-libs/gnutls )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	relp? ( >=dev-libs/librelp-0.1.1 )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-BRANCH="3-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-src_configure() {
-	# Maintainer notes:
-	# * rsyslog-3 doesn't support single threading anymore
-	# * rfc3195 needs a library and development of that library
-	#   is suspended
-	econf \
-		--enable-largefile \
-		--enable-regexp \
-		$(use_enable zlib) \
-		$(use_enable kerberos gssapi-krb5) \
-		--enable-pthreads \
-		--enable-klog \
-		--enable-unix \
-		--enable-inet \
-		--enable-fsstnd \
-		$(use_enable debug) \
-		$(use_enable debug rtinst) \
-		$(use_enable debug valgrind) \
-		$(use_enable debug diagtools) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable dbi libdbi) \
-		$(use_enable snmp) \
-		$(use_enable gnutls) \
-		--enable-rsyslogrt \
-		--enable-rsyslogd \
-		--enable-mail \
-		--disable-imdiag \
-		$(use_enable relp) \
-		--disable-rfc3195 \
-		--enable-imfile \
-		--disable-imtemplate
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /usr/share/doc/${PF}/scripts/mysql
-	doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-
-	insinto /usr/share/doc/${PF}/scripts/pgsql
-	doins plugins/ompgsql/createDB.sql
-
-	elog "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
-	elog "  /usr/share/doc/${PF}/scripts"
-
-	dodoc AUTHORS ChangeLog doc/rsyslog-example.conf
-	dohtml doc/*
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
-
-	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
-	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
-}
diff --git a/app-admin/rsyslog/rsyslog-3.22.1.ebuild b/app-admin/rsyslog/rsyslog-3.22.1.ebuild
deleted file mode 100644
index 3deac041f881..000000000000
--- a/app-admin/rsyslog/rsyslog-3.22.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.22.1.ebuild,v 1.5 2011/04/07 07:50:20 ultrabug Exp $
-
-EAPI="2"
-
-inherit versionator
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
-
-DEPEND="kerberos? ( virtual/krb5 )
-	dbi? ( dev-db/libdbi )
-	gnutls? ( net-libs/gnutls )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	relp? ( >=dev-libs/librelp-0.1.1 )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-BRANCH="3-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-src_configure() {
-	# Maintainer notes:
-	# * rsyslog-3 doesn't support single threading anymore
-	# * rfc3195 needs a library and development of that library
-	#   is suspended
-	econf \
-		--enable-largefile \
-		--enable-regexp \
-		$(use_enable zlib) \
-		$(use_enable kerberos gssapi-krb5) \
-		--enable-pthreads \
-		--enable-klog \
-		--enable-unix \
-		--enable-inet \
-		--enable-fsstnd \
-		$(use_enable debug) \
-		$(use_enable debug rtinst) \
-		$(use_enable debug valgrind) \
-		$(use_enable debug diagtools) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable dbi libdbi) \
-		$(use_enable snmp) \
-		$(use_enable gnutls) \
-		--enable-rsyslogrt \
-		--enable-rsyslogd \
-		--enable-mail \
-		--disable-imdiag \
-		$(use_enable relp) \
-		--disable-rfc3195 \
-		--enable-imfile \
-		--disable-imtemplate
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /usr/share/doc/${PF}/scripts/mysql
-	doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-
-	insinto /usr/share/doc/${PF}/scripts/pgsql
-	doins plugins/ompgsql/createDB.sql
-
-	elog "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
-	elog "  /usr/share/doc/${PF}/scripts"
-
-	dodoc AUTHORS ChangeLog doc/rsyslog-example.conf
-	dohtml doc/*
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
-
-	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
-	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
-}
diff --git a/app-admin/rsyslog/rsyslog-5.6.4.ebuild b/app-admin/rsyslog/rsyslog-5.6.4.ebuild
deleted file mode 100644
index 159bbe599f40..000000000000
--- a/app-admin/rsyslog/rsyslog-5.6.4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.6.4.ebuild,v 1.6 2011/04/26 15:44:47 jer Exp $
-
-EAPI=3
-
-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"
-KEYWORDS="amd64 ~arm hppa ~sparc x86"
-SLOT="0"
-IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zlib"
-
-DEPEND="dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-0.1.3 )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-BRANCH="5-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-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.
-	econf \
-		--disable-gui \
-		--disable-rfc3195 \
-		--enable-largefile \
-		--enable-unlimited-select \
-		--enable-imdiag \
-		--enable-imfile \
-		--enable-imtemplate \
-		--enable-imptcp \
-		--enable-mail \
-		--enable-omprog \
-		--enable-omstdout \
-		--enable-omtemplate \
-		--enable-omdbalerting \
-		--enable-omuxsock \
-		--enable-pmlastmsg \
-		--enable-pmrfc3164sd \
-		$(use_enable extras omudpspoof) \
-		$(use_enable zlib) \
-		$(use_enable mysql) \
-		$(use_enable dbi libdbi) \
-		$(use_enable postgres pgsql) \
-		$(use_enable oracle oracle) \
-		$(use_enable gnutls) \
-		$(use_enable kerberos gssapi-krb5) \
-		$(use_enable relp) \
-		$(use_enable snmp) \
-		$(use_enable debug) \
-		$(use_enable debug rtinst) \
-		$(use_enable debug diagtools) \
-		$(use_enable debug memcheck) \
-		$(use_enable debug valgrind) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog doc/rsyslog-example.conf || die
-	use doc && dohtml -r doc/*
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf || die
-	newconfd "${FILESDIR}/${BRANCH}/rsyslog.confd" rsyslog || die
-	newinitd "${FILESDIR}/${BRANCH}/rsyslog.initd" rsyslog || die
-	keepdir /var/spool/rsyslog
-	keepdir /etc/ssl/rsyslog
-	keepdir /etc/rsyslog.d
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} || die
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql || die
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
-}
-
-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 gnutls; 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 gnutls ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=gnutls 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"
-}