version bump fix #408745 and #410241

(Portage version: 2.1.10.62/cvs/Linux x86_64)

5 files changed, 22 insertions, 267 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 2d7ae6536439..92233ffbdfbd 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.67 2012/05/10 17:26:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.68 2012/05/22 12:28:49 ultrabug Exp $
+
+*rsyslog-5.8.11 (22 May 2012)
+
+  22 May 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild,
+  -rsyslog-5.8.6.ebuild, -rsyslog-5.8.7.ebuild, rsyslog-5.8.8.ebuild,
+  +rsyslog-5.8.11.ebuild:
+  Version bump, fix #408745 thx to Opportunist. Fix ssl/gnutls dependencies wrt
+  #410241 thx to Conrad. Drop old versions.
 
   10 May 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.8.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-admin/rsyslog/rsyslog-5.8.6.ebuild b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
index 6acff8998544..0c68a7af9f9b 100644
--- a/app-admin/rsyslog/rsyslog-5.8.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.4 2012/05/03 18:02:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.11.ebuild,v 1.1 2012/05/22 12:28:49 ultrabug Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
 
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
 KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 SLOT="0"
 IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
@@ -24,7 +24,7 @@ RDEPEND="dbi? ( dev-db/libdbi )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	relp? ( >=dev-libs/librelp-0.1.3 )
 	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
 	zeromq? ( net-libs/zeromq )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
@@ -178,12 +178,12 @@ pkg_config() {
 			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
 		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
 
-		cat > "${T}/${PF}.$$" <<_EOF
+		cat > "${T}/${PF}.$$" <<- _EOF
 		cn = Portage automated CA
 		ca
 		cert_signing_key
 		expiration_days = 3650
-_EOF
+		_EOF
 
 		certtool --generate-self-signed \
 			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
@@ -201,12 +201,12 @@ _EOF
 			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
 		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
 
-		cat > "${T}/${PF}.$$" <<_EOF
+		cat > "${T}/${PF}.$$" <<- _EOF
 		cn = ${CN}
 		tls_www_server
 		dns_name = ${CN}
 		expiration_days = 3650
-_EOF
+		_EOF
 
 		certtool --generate-certificate \
 			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
@@ -230,12 +230,12 @@ _EOF
 		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
 	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
 
-	cat > "${T}/${PF}.$$" <<_EOF
+	cat > "${T}/${PF}.$$" <<- _EOF
 	cn = ${CN}
 	tls_www_client
 	dns_name = ${CN}
 	expiration_days = 3650
-_EOF
+	_EOF
 
 	certtool --generate-certificate \
 		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
diff --git a/app-admin/rsyslog/rsyslog-5.8.5.ebuild b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
index c2fc81054d17..af9892e43e6c 100644
--- a/app-admin/rsyslog/rsyslog-5.8.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.7 2012/05/03 18:02:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.8 2012/05/22 12:28:49 ultrabug Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp stati
 
 RDEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
 	kerberos? ( virtual/krb5 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
diff --git a/app-admin/rsyslog/rsyslog-5.8.7.ebuild b/app-admin/rsyslog/rsyslog-5.8.7.ebuild
deleted file mode 100644
index 5575ea693256..000000000000
--- a/app-admin/rsyslog/rsyslog-5.8.7.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.7.ebuild,v 1.2 2012/05/03 18:02:22 jdhore Exp $
-
-EAPI=4
-
-inherit autotools-utils 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
-	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="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-0.1.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="5-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() {
-	# Maintainer notes:
-	# ZeroMQ support, for now it is done by hand until upstream process bug.
-	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
-	if use zeromq; then
-		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
-		epatch ${ZEROPATH}/rsyslog-zeromq.patch
-		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
-	fi
-
-	# Don't force '-g' CFLAG
-	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
-	eautoreconf
-}
-
-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.
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-largefile
-		--enable-unlimited-select
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imtemplate
-		--enable-imptcp
-		--enable-mail
-		--enable-omprog
-		--enable-omstdout
-		--enable-omtemplate
-		--enable-omdbalerting
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		$(use_enable extras omudpspoof)
-		$(use_enable zlib)
-		$(use_enable mysql)
-		$(use_enable dbi libdbi)
-		$(use_enable postgres pgsql)
-		$(use_enable oracle oracle)
-		$(use_enable ssl gnutls)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-	)
-
-	use zeromq && myeconfargs=(
-		${myeconfargs[@]-}
-		$(use_enable zeromq imzeromq)
-		$(use_enable zeromq omzeromq)
-	)
-
-	systemd_to_myeconfargs
-	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-5.8.8.ebuild b/app-admin/rsyslog/rsyslog-5.8.8.ebuild
index ae9b19602bfc..f6074dac6a1c 100644
--- a/app-admin/rsyslog/rsyslog-5.8.8.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.8.ebuild,v 1.2 2012/05/10 17:26:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.8.ebuild,v 1.3 2012/05/22 12:28:49 ultrabug Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ RDEPEND="dbi? ( dev-db/libdbi )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	relp? ( >=dev-libs/librelp-0.1.3 )
 	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
 	zeromq? ( net-libs/zeromq )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}