From 220bf8a76a7016546440b0b09ed9765bcf420752 Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Wed, 28 Dec 2011 12:00:25 +0000 Subject: [PATCH] version bump. Package-Manager: portage-2.1.10.43/cvs/Linux x86_64 --- app-admin/rsyslog/ChangeLog | 7 +- app-admin/rsyslog/Manifest | 12 +- app-admin/rsyslog/rsyslog-5.8.6.ebuild | 253 +++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 7 deletions(-) create mode 100644 app-admin/rsyslog/rsyslog-5.8.6.ebuild diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index add68c356927..f24254fced69 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.60 2011/09/13 12:14:45 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.61 2011/12/28 12:00:25 ultrabug Exp $ + +*rsyslog-5.8.6 (28 Dec 2011) + + 28 Dec 2011; Ultrabug +rsyslog-5.8.6.ebuild: + Version bump. 13 Sep 2011; Ultrabug -rsyslog-5.6.5.ebuild, -rsyslog-5.8.3.ebuild: diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 75ecd015c877..633db9fe007e 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -6,16 +6,16 @@ AUX 5-stable/rsyslog.confd 654 RMD160 ca340f748c84404df86bfdaf9ca9d47d0ff38121 S AUX 5-stable/rsyslog.initd 944 RMD160 44c17fc063f2f80679803533dae6905d0044daab SHA1 1d73dac4178b37f2874d1b7cf8dadf8a4a976776 SHA256 b82b955b33ad6eafd876d5da1fa94a8d74163c8a13110d888adc219efffc2d51 AUX 5-stable/rsyslog.logrotate 440 RMD160 b2599c94c718af02a641e762960b9796952411bb SHA1 228dba04c683d778bccd86f6bcd80650b9c774b4 SHA256 f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 DIST rsyslog-5.8.5.tar.gz 2364874 RMD160 46b20433e0e5feb807b4777bb8141221fe5dd65b SHA1 a5dc735714b573f577db2892f596dcb0ef35c747 SHA256 a519704c06de1026847f69d99f31a2a32783e9547f5249dddefe805bfbc3ea50 +DIST rsyslog-5.8.6.tar.gz 2373078 RMD160 96beddd94eea0c635c41409f92c897d3620182c0 SHA1 1afe39077253dc9f636f676e8374d09a101a9c94 SHA256 c51206e3b11c7b4cddf92607b9d6ddd07430ff7dd8d06849804c9ea1c9191825 DIST rsyslog-zeromq.tar.gz 22223 RMD160 632a1888d3972da4ce623c8f6973c72b026b035c SHA1 e6f02c25af19022d0cc9d4782f58db3fc27a9f0f SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753 EBUILD rsyslog-5.8.5.ebuild 7286 RMD160 ce2622a45949c96fcbd52e782b85154052fc7d93 SHA1 7a7a4e26155bb6e3cb504b0c24d814f2ca612adf SHA256 c0e88de79f155d7b1202bc0349862b10dce6d347b945a8e79bdefc73afc13441 -MISC ChangeLog 11776 RMD160 f511c56ce9f9d8e401f931f7d110366dbb366635 SHA1 34c40c5a3b35b161cf8b6417fccc56c30c242ce2 SHA256 77e240cc89ffc8eae62f194f8b8549b3c779b99366c91c22268046171221dc74 +EBUILD rsyslog-5.8.6.ebuild 7291 RMD160 064c05f12ef2611e3dac96cf06ce77b9cddcfe77 SHA1 8dd9700fb318a1b90a1d8d43d7b513201d069405 SHA256 363415af397911aedf42e6503e86768e6a02b53c6300748e584c1319f3ea242e +MISC ChangeLog 11892 RMD160 12accefeb6972f68536de309a10f2ee741585e25 SHA1 6a980838555aaaa4fcfaa1f50a6cef354e38ab56 SHA256 5394c0c10902c89bb5c78ff976a3e00db4563b20edcf70bb0f967ad794ba7ee7 MISC metadata.xml 769 RMD160 76e1953b0841e1020088079af549451ea6d16723 SHA1 8f9ed914369c0229f6d4aaec7340d9dcf6fb5030 SHA256 70468ddaa9ff15f4cb3059fcf8834ca7f2e8f55a6f3ac57e1487202e5f3f1730 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk589RYACgkQfXuS5UK5QB3joQP/RaTJMYI6BrZj4mM8CPQSXmjh -+JZKp9e4e+OQT+gBu+dn8IJz7y8EgMZIWCeCaUqlk6xioNbyCyR7WFAVrhe4g7hU -claSHgyu5+XvGH4N3padKvvshEfLk/8ujt8TLyljMjXwv5VC+ESuqUzNozANbcBt -7JGprjRO/cfH+zTHNvM= -=rHJC +iF4EAREIAAYFAk77BOIACgkQKiQSS7ZY+hPNWgEAkq0Lp43RXFj1zxsS/9eN4HbN +rU3IwqvhZ7XfkJsnlGMBALZFjYE1/iQtknd3Uvr57xFzOlRsv/iSZzXQ6EvkjG40 +=ewFu -----END PGP SIGNATURE----- diff --git a/app-admin/rsyslog/rsyslog-5.8.6.ebuild b/app-admin/rsyslog/rsyslog-5.8.6.ebuild new file mode 100644 index 000000000000..fd97c03ec539 --- /dev/null +++ b/app-admin/rsyslog/rsyslog-5.8.6.ebuild @@ -0,0 +1,253 @@ +# 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.6.ebuild,v 1.1 2011/12/28 12:00:25 ultrabug 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 gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib" + +RDEPEND="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 ) + zeromq? ( net-libs/zeromq ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + dev-util/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 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 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" +} -- 2.26.2