diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2015-03-23 11:44:44 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2015-03-23 11:44:44 +0000 |
| commit | 7fb8947fd71df38f70d7aadc620f34b86921962d (patch) | |
| tree | 322c9dcbebaf5bcbf1127f4c121ee9da5b7bf404 /app-admin/rsyslog | |
| parent | Remove vulnerable ebuilds for security bug #539884. (diff) | |
| download | gentoo-2-7fb8947fd71df38f70d7aadc620f34b86921962d.tar.gz gentoo-2-7fb8947fd71df38f70d7aadc620f34b86921962d.tar.bz2 gentoo-2-7fb8947fd71df38f70d7aadc620f34b86921962d.zip | |
fix #542330
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'app-admin/rsyslog')
| -rw-r--r-- | app-admin/rsyslog/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild (renamed from app-admin/rsyslog/rsyslog-8.7.0.ebuild) | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index a489a96bc1dd..da03e33864a7 100644 --- a/app-admin/rsyslog/ChangeLog +++ b/app-admin/rsyslog/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/rsyslog # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.133 2015/02/23 14:46:03 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.134 2015/03/23 11:44:44 ultrabug Exp $ + +*rsyslog-8.7.0-r1 (23 Mar 2015) + + 23 Mar 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.7.0.ebuild, + +rsyslog-8.7.0-r1.ebuild: + fix some deps and doc building thx to Martin Dummer and Thomas D. fix #542330 *rsyslog-8.7.0 (23 Feb 2015) diff --git a/app-admin/rsyslog/rsyslog-8.7.0.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild index 6deca9113983..f828be357a3b 100644 --- a/app-admin/rsyslog/rsyslog-8.7.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0.ebuild,v 1.1 2015/02/23 14:46:03 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild,v 1.1 2015/03/23 11:44:44 ultrabug Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -22,7 +22,6 @@ if [[ ${PV} == "9999" ]]; then " inherit git-r3 - KEYWORDS="" else SRC_URI=" http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz @@ -52,12 +51,12 @@ RDEPEND=" >=dev-libs/liblognorm-1.1.0:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20 ) + postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) redis? ( >=dev-libs/hiredis-0.11.0 ) relp? ( >=dev-libs/librelp-1.2.5 ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( >=dev-libs/openssl-0.9.8y ) + rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23 ) systemd? ( >=sys-apps/systemd-208 ) @@ -66,7 +65,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" if [[ ${PV} == "9999" ]]; then - RDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" + DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" fi BRANCH="8-stable" @@ -198,7 +197,7 @@ src_configure() { src_compile() { autotools-utils_src_compile - if use doc -a ${PV} == "9999"; then + if use doc && [[ "${PV}" == "9999" ]]; then einfo "Building documentation ..." local doc_dir="${S}/docs" cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |