version bump wrt #364145. Drop old stable. Thanks to Opportunist for reporting.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 227 insertions, 90 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 814573b72925..7d5a819fdc34 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2011/04/19 09:32:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.44 2011/04/26 07:33:03 ultrabug Exp $
+
+*rsyslog-5.8.0 (26 Apr 2011)
+
+  26 Apr 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-3.20.4.ebuild,
+  +rsyslog-5.8.0.ebuild:
+  version bump wrt #364145. Drop old stable. Thanks to Opportunist for
+  reporting.
 
   19 Apr 2011; Thomas Kahle <tomka@gentoo.org> rsyslog-5.6.4.ebuild:
   x86 stable per bug 359765
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3094844f29da..ea17d32e48b4 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -9,22 +9,22 @@ AUX 5-stable/rsyslog-gentoo.conf 3998 RMD160 db8979c4cfe4aa43c6ae5583972a21037dd
 AUX 5-stable/rsyslog.confd 654 RMD160 ca340f748c84404df86bfdaf9ca9d47d0ff38121 SHA1 e56695ebc21a30f60f1b070f8f26236677ef5d81 SHA256 c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56
 AUX 5-stable/rsyslog.initd 798 RMD160 691fa40e5f7aadad2ff0d3795a7dd6f544b523eb SHA1 2013e291f02c6a687551a4653dc6dbe21166431e SHA256 79cbd52fd54fa36e9d8d658124b24e7f388fc7cb34240afdd9d0aaa35b3badfa
 AUX 5-stable/rsyslog.logrotate 440 RMD160 b2599c94c718af02a641e762960b9796952411bb SHA1 228dba04c683d778bccd86f6bcd80650b9c774b4 SHA256 f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5
-DIST rsyslog-3.20.4.tar.gz 1304299 RMD160 27922bfd174e935f17d3789f6c4538ba4633cc88 SHA1 e4c6f02eb7f22dfdfe32ff7a84d7b33466a0a2c9 SHA256 adc179e5996c9769ed5d46c68e0db07ed6c87a38982de9165105c69cd8786342
 DIST rsyslog-3.22.0.tar.gz 1335136 RMD160 1b3dc5478dee1dde935db532c958aca89c765a8b SHA1 e667387c49d1d53a98f82225bcd235d291227120 SHA256 efbed2c534833e25ed7477a94a4a259310d2b8f1326d39e0789364333285ae7d
 DIST rsyslog-3.22.1.tar.gz 1358598 RMD160 979dc146d40a5373ec7d210c424e925b5e091c15 SHA1 d5c8828db3edef35e48a1eec418e800fafc6d6a3 SHA256 5d3bb28dc87b3abb7053ccae8316f032ddd0486681683b116a25f66fc0942abb
 DIST rsyslog-5.6.4.tar.gz 2258113 RMD160 07a911764b4a8d36a568bc912a550dd53fd36ed7 SHA1 32366a33cb40477905531c167ca21e624d5605be SHA256 523d11095f09bee176b653e9f6be838dfda79556e45d1ae089a6d393336c7e94
 DIST rsyslog-5.6.5.tar.gz 2260991 RMD160 a954e783151f2854b1ea4fe9f1cc768e9222c027 SHA1 959c74f4b7a9ed1126b96b117053cd903915ad38 SHA256 4aa1036e9ec468aa7ab38095969d363941c815dd1ba6fabcd593d16baef1b859
-EBUILD rsyslog-3.20.4.ebuild 2342 RMD160 900f15809dc32fb5685b211630591b6f3b3a8af1 SHA1 7216146f210fa093971af20943876989896bd667 SHA256 b4b3d9ea2ebb972e65ab56f02a6cbb3868dd013a8affc6dcc49f19788e8a909d
+DIST rsyslog-5.8.0.tar.gz 2336866 RMD160 ee0491ec0986ab1ec507a40d5129ea90a0bbdb85 SHA1 5a64f0ca8b6d5b32db1c20d46965803a2d8d047a SHA256 e034b02473fd7e5313522173ec2f6c57e6fbcaec2c6b289edb968b1d64ae3ffd
 EBUILD rsyslog-3.22.0.ebuild 2440 RMD160 9fff6bd252a4a18915e5b32ad3ca9af30f979753 SHA1 477f30f720258c9e83fba565e2ff620a7fb0444d SHA256 cd97e53548d05d16171c7a3dc08b94710530d85c37e7bda5fe54e0fbaf25127d
 EBUILD rsyslog-3.22.1.ebuild 2455 RMD160 d50dc1b81b314cc92d49e5db82a9eb60270496ec SHA1 89501140363ca3fccdf0ddbf30697436a9789939 SHA256 9d0ef316677350b6a71d8c7984c28d2b496e15f3246a8bf06389ecf11779c848
 EBUILD rsyslog-5.6.4.ebuild 6295 RMD160 512416813d8ad8f46316de252c7d43ffeed94ba4 SHA1 5883a2577678a6347b2d01aa4ae056c60771cce4 SHA256 41509151b17b66d7f5d3201ef9acd6eb770bd3fb050248f78e5f635802da2ef2
 EBUILD rsyslog-5.6.5.ebuild 6300 RMD160 610ca0a879cd89f1c0d85977f7797257b8642514 SHA1 cd76e1a29927f13820ffb6b03cb2a5f6c68ff9c4 SHA256 afc9026a9875c74a93d5c57c43b303eca52bc10d02968acd7adb5e6f494e4835
-MISC ChangeLog 8935 RMD160 0d14512ed15b09cbb5ed5c6a1f8f0004fc496838 SHA1 3d122966b23637a93b52445e9a674d5fcc7b3715 SHA256 a7fcab7373fb358ee27271b97af821549eb33a1927989d97e878f4363b8360ca
+EBUILD rsyslog-5.8.0.ebuild 6300 RMD160 0d652b92c02f794a7b1869ccdb7de530cbcefcaf SHA1 1f9b98f59cafa5da6d948d7ff81667adf7860a1d SHA256 9fbc20beed02d7ac3d8a2f3fcd6e27bd660aefbea1a1fa6d6e1c9ef394a53144
+MISC ChangeLog 9148 RMD160 7f6b7a03ca3f04ed687e8c16507d514bc1b8ada8 SHA1 6eb46d957f49a537336952324436942410f51ff4 SHA256 b12430d97715be7a99c8a9403f0d9e8a689b0f9d5e00f22b7e7b39283a82377d
 MISC metadata.xml 677 RMD160 02eb7182593e766a62cfbad77295d36ebecbc728 SHA1 1f9ed7a28d21a7fef0df3a354709775756d169d2 SHA256 0f2b6a04926147b5436f5b303cde33b0fd291ca4d1a56b9bcf4f8c0dc9f890fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2tVIgACgkQodBTJSDyo66JRwD+IDc6N+4LYa1WIafPBmOJsxkE
-zED6+5lzFiPFFhTiL7wA/1lj4Uo8C33+jdZheVez4WWQ8+LDl9XtEkZvcgfBk0lF
-=ijKI
+iF4EAREIAAYFAk22dTgACgkQKiQSS7ZY+hMnrAEAolgwb6gc7p/gN0h4u/oSHCHB
+G7rLwJtCkFfsTyLYibQA/0CX60yrFauwoBmnZBvE8xuW4lo37ZqPmx4xu/qb2qVw
+=TUWH
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/rsyslog-3.20.4.ebuild b/app-admin/rsyslog/rsyslog-3.20.4.ebuild
deleted file mode 100644
index 5031c02557d0..000000000000
--- a/app-admin/rsyslog/rsyslog-3.20.4.ebuild
+++ /dev/null
@@ -1,83 +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.20.4.ebuild,v 1.4 2011/04/07 07:50:20 ultrabug Exp $
-
-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 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"
-
-src_compile() {
-	# 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 mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable dbi libdbi) \
-		$(use_enable snmp) \
-		$(use_enable gnutls) \
-		--enable-rsyslogrt \
-		--enable-rsyslogd \
-		--enable-mail \
-		$(use_enable relp) \
-		--disable-rfc3195 \
-		--enable-imfile \
-		--disable-imtemplate
-	emake || die "emake failed"
-}
-
-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.8.0.ebuild b/app-admin/rsyslog/rsyslog-5.8.0.ebuild
new file mode 100644
index 000000000000..a62c80c158ad
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-5.8.0.ebuild
@@ -0,0 +1,213 @@
+# 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.8.0.ebuild,v 1.1 2011/04/26 07:33:03 ultrabug 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"
+}