From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E7C0C1381F3 for ; Tue, 27 Nov 2012 12:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A36E21C05F for ; Tue, 27 Nov 2012 12:07:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F9B521C045 for ; Tue, 27 Nov 2012 11:45:35 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47EC933D7E8 for ; Tue, 27 Nov 2012 11:45:34 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2287) id 0375E20C65; Tue, 27 Nov 2012 11:45:32 +0000 (UTC) From: "Alexys Jacob (ultrabug)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ultrabug@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-admin/rsyslog: ChangeLog rsyslog-7.2.2-r1.ebuild rsyslog-7.2.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog rsyslog-7.2.2-r1.ebuild rsyslog-7.2.2.ebuild X-VCS-Directories: app-admin/rsyslog X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121127114533.0375E20C65@flycatcher.gentoo.org> Date: Tue, 27 Nov 2012 11:45:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 511f4727-fd30-4e8e-bacb-361e35f06531 X-Archives-Hash: 776938bc28f0747918851f1c84f6ff80 ultrabug 12/11/27 11:45:32 Modified: ChangeLog Added: rsyslog-7.2.2-r1.ebuild Removed: rsyslog-7.2.2.ebuild Log: fix #444754 #444774 revbump (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B658FA13) Revision Changes Path 1.87 app-admin/rsyslog/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.87&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.87&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.86&r2=1.87 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ChangeLog 23 Nov 2012 10:53:47 -0000 1.86 +++ ChangeLog 27 Nov 2012 11:45:32 -0000 1.87 @@ -1,6 +1,13 @@ # 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.86 2012/11/23 10:53:47 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.87 2012/11/27 11:45:32 ultrabug Exp $ + +*rsyslog-7.2.2-r1 (27 Nov 2012) + + 27 Nov 2012; Ultrabug files/7-stable/rsyslog.logrotate, + -rsyslog-7.2.2.ebuild, +rsyslog-7.2.2-r1.ebuild: + Fix #444774 logrotate script thx to Robin Hill, fix #444754 curl dep thx to + Didier Cardoso 23 Nov 2012; Ultrabug rsyslog-6.6.0.ebuild, rsyslog-7.2.2.ebuild: 1.1 app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild?rev=1.1&content-type=text/plain Index: rsyslog-7.2.2-r1.ebuild =================================================================== # 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-7.2.2-r1.ebuild,v 1.1 2012/11/27 11:45:32 ultrabug Exp $ EAPI=4 AUTOTOOLS_AUTORECONF=yes inherit autotools-utils eutils 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" LICENSE="GPL-3 LGPL-3 Apache-2.0" KEYWORDS="~amd64 ~arm ~hppa ~x86" SLOT="0" IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib" RDEPEND=" dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-misc/curl 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-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} virtual/pkgconfig" BRANCH="7-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() { # Don't force '-g' CFLAG sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die # Fix runtime UUID/JSON libs linking epatch "${FILESDIR}/6-stable/${PN}-6.6.0-fix-runtime.patch" autotools-utils_src_prepare } 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. # * mongodb : doesnt work with mongo-c-driver ? local myeconfargs=( --disable-gui --disable-rfc3195 --enable-imdiag --enable-imfile --enable-impstats --enable-imptcp --enable-largefile --enable-mail --enable-mmnormalize --enable-mmjsonparse --enable-mmaudit --enable-omprog --enable-omstdout --enable-omuxsock --enable-pmlastmsg --enable-pmrfc3164sd --enable-pmcisconames --enable-pmaixforwardedfrom --enable-pmsnare --enable-sm_cust_bindcdr --enable-unlimited-select --enable-uuid $(use_enable dbi libdbi) $(use_enable debug) $(use_enable debug rtinst) $(use_enable debug diagtools) $(use_enable debug memcheck) $(use_enable debug valgrind) $(use_enable extras omudpspoof) $(use_enable kerberos gssapi-krb5) $(use_enable mysql) $(use_enable oracle) $(use_enable postgres pgsql) $(use_enable relp) $(use_enable snmp) $(use_enable snmp mmsnmptrapd) $(use_enable ssl gnutls) $(use_enable zlib) $(use_enable zeromq imzmq3) $(use_enable zeromq omzmq3) ) 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 touch "${D}"/etc/${PN}.d/00_gentoo.conf 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" }