diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2011-12-28 14:01:19 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2011-12-28 14:01:19 +0000 |
| commit | e5fe1e67a3aaa1d4994a7302e7c4cf4567cdd273 (patch) | |
| tree | d64047599e6f8b12b7de8e1f624f86482a5e7cfb /app-forensics | |
| parent | Fix URIs for longterm kernels (diff) | |
| download | gentoo-2-e5fe1e67a3aaa1d4994a7302e7c4cf4567cdd273.tar.gz gentoo-2-e5fe1e67a3aaa1d4994a7302e7c4cf4567cdd273.tar.bz2 gentoo-2-e5fe1e67a3aaa1d4994a7302e7c4cf4567cdd273.zip | |
Fix bug #396263 (build failures with rpm probes), patch by Corentin Labbe
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'app-forensics')
| -rw-r--r-- | app-forensics/openscap/ChangeLog | 5 | ||||
| -rw-r--r-- | app-forensics/openscap/metadata.xml | 1 | ||||
| -rw-r--r-- | app-forensics/openscap/openscap-0.8.0.ebuild | 17 |
3 files changed, 20 insertions, 3 deletions
diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog index 6f0a9da2ff87..333b03b72ef4 100644 --- a/app-forensics/openscap/ChangeLog +++ b/app-forensics/openscap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-forensics/openscap # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.14 2011/12/28 05:06:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.15 2011/12/28 14:01:19 swift Exp $ + + 28 Dec 2011; <swift@gentoo.org> openscap-0.8.0.ebuild, metadata.xml: + Fix build failure with RPM probes (bug #396263) by Corentin Labbe 28 Dec 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml: Fix maintainer tag order. diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml index e20ecc98b6a4..8be2af1a9c36 100644 --- a/app-forensics/openscap/metadata.xml +++ b/app-forensics/openscap/metadata.xml @@ -14,6 +14,7 @@ </maintainer> <use> <flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag> +<flag name="rpm">Compiles the RPM probes</flag> <flag name="sql">Build the sql independant probes</flag> </use> <longdescription lang="en"> diff --git a/app-forensics/openscap/openscap-0.8.0.ebuild b/app-forensics/openscap/openscap-0.8.0.ebuild index 8e422ec5f761..df2a7435c2c9 100644 --- a/app-forensics/openscap/openscap-0.8.0.ebuild +++ b/app-forensics/openscap/openscap-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild,v 1.1 2011/12/26 14:30:28 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild,v 1.2 2011/12/28 14:01:19 swift Exp $ EAPI=3 @@ -15,11 +15,12 @@ SRC_URI="http://www.open-scap.org/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bash-completion doc nss perl python sql" +IUSE="bash-completion doc nss perl python rpm sql" RESTRICT="test" RDEPEND="!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) + rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) dev-libs/libpcre dev-libs/libxml2 @@ -34,6 +35,18 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die + sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die + if ! use rpm ; then + sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die + sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die + sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die + sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die + sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die + fi +} + src_configure() { local myconf if use python || use perl ; then |