version bump

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

3 files changed, 225 insertions, 2 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 2e28c398a0a4..a9f66460fe69 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2011/03/04 09:01:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.37 2011/03/24 14:05:41 ultrabug Exp $
+
+*rsyslog-5.6.5 (24 Mar 2011)
+
+  24 Mar 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.6.5.ebuild:
+  version bump
 
 *rsyslog-5.6.4 (04 Mar 2011)
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 996eb6bb92e3..d3acef289984 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,9 +10,11 @@ DIST rsyslog-3.20.4.tar.gz 1304299 RMD160 27922bfd174e935f17d3789f6c4538ba4633cc
 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 2366 RMD160 4e13523ddee5115f154c53f70b010eea427dbc4b SHA1 0139c184e9a8ea6c77902c4a3d846973905e8e58 SHA256 cbbfa8a052b35e53bd395157458efa6f9e4e7e331ce79741478182a8cea35651
 EBUILD rsyslog-3.22.0.ebuild 2464 RMD160 51597c2c92b54352feb40bd6238dea815f3ba04c SHA1 e914e7cbd78e057f5b2ad288a3679d37a4915b75 SHA256 07a0a89a0b51c75f73bc3a9fc2dd4885d37f90b326b3e968538f97a005426101
 EBUILD rsyslog-3.22.1.ebuild 2479 RMD160 56eb8a0667fca6cc14398d3340edec22866a9e07 SHA1 a4af54c515465c23a69db5968ae9867f5565100e SHA256 ba24a7c7fada05d5e9aeb0c64ec29e22e87d0fba3b81562a7f8742a4471c3052
 EBUILD rsyslog-5.6.4.ebuild 6401 RMD160 6cc171ab2fc0d8b784dd865504394a162af86b72 SHA1 6a124e37248485f82ec36f1d4944698545c74b6c SHA256 ea326eff7da49315cfd4491800ac1a0c1d7e8dad860b38e09b7c54995b38c944
-MISC ChangeLog 8005 RMD160 873fdd99e27013089f9917ee091f285766ba495e SHA1 5bc9dbded873ce370bfa8f36372ed1775f176700 SHA256 97f469d522b275f70e3289802f55f1976cbe7f9f678afaa69f307dc7583309c6
+EBUILD rsyslog-5.6.5.ebuild 6376 RMD160 8fcf2267110390e40c69bdf447aef51b62ff38f4 SHA1 fcea50c1fc3dfec5c81ff8b455d8dce4d39d4893 SHA256 5efca65f592ee627a561b29225dfce118a18733fb459c36df2bb69437b5bc7e6
+MISC ChangeLog 8120 RMD160 02f2f27f2a1eb42ae4b13b8b20564d4af9682fda SHA1 bbe4f8e2c12a6fd25a945dd7cc1a5c6cf57fc669 SHA256 12563a0169a8ec04f217f03885f68b13b5a42858b01c9bb394485ccbc1a7c172
 MISC metadata.xml 750 RMD160 e64218fc6d6655f53384e335445f0af53ac5da72 SHA1 926d94f2608ccee91bdaf2c621fb492906a36228 SHA256 3a14e3f745742969dd8f9d0b7c147fd87d90efedccf3d676a34082fffb693940
diff --git a/app-admin/rsyslog/rsyslog-5.6.5.ebuild b/app-admin/rsyslog/rsyslog-5.6.5.ebuild
new file mode 100644
index 000000000000..587576d61d22
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-5.6.5.ebuild
@@ -0,0 +1,216 @@
+# 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.5.ebuild,v 1.1 2011/03/24 14:05:41 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 logrotate mysql oracle postgres relp snmp static-libs zlib"
+
+DEPEND="dbi? ( dev-db/libdbi )
+	extras? ( net-libs/libnet )
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	logrotate? ( app-admin/logrotate )
+	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
+
+	if use logrotate; then
+		insinto /etc/logrotate.d/
+		newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
+	fi
+}
+
+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"
+}