Fix bug #396263 (build failures with rpm probes), patch by Corentin Labbe

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

4 files changed, 23 insertions, 16 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/Manifest b/app-forensics/openscap/Manifest
index 9a431753d1f4..aa5f54bf4bdd 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openscap-0.7.1-sql-fix.patch 1122 RMD160 0a98b86f864b3990c97769141a12f78557046883 SHA1 0058400cf127afd688d065c43b5ff22d6cf0f1c6 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2
 DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
 DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
 DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
 EBUILD openscap-0.7.3.ebuild 1747 RMD160 4bea04b6c700c84594fccfa89e68097b8037865a SHA1 8c4c88a16bcd6912183602dc0a830b9a7b4dda14 SHA256 c477d1381da5be52b9ac41ca44d58fd4c99e242e31de98091f30a47ea288a888
 EBUILD openscap-0.7.4.ebuild 1747 RMD160 c464d7db1152e71d261c132daabb9565b7528288 SHA1 322fd66a4cc67b6a7133fd9349850a036e264833 SHA256 93c8bd09f8a8bc0bf884da3f9a6a98d25d0e861a007b45937ad1ae7d5b8b9e03
-EBUILD openscap-0.8.0.ebuild 1794 RMD160 ef72d2dc51cc816d19c13df042474f4fbf4eb016 SHA1 b3c471fc8191ece0ee626c0e01aa94c4b96ac457 SHA256 590ba23789bb8fe7cb061e0139338c0b24e8f690b7fb91aecba2f4cb40ee77df
-MISC ChangeLog 2302 RMD160 e550b5b15d8a1b1ebc087aad7f2ce1be69ca90c7 SHA1 565a649917301097d40467c60c509bc6d14e9b51 SHA256 3643ea9f5fc3836d7883c448e8901291709ecfd6209885a6f6f2f45bbfb84dae
-MISC metadata.xml 642 RMD160 09ec4c930e520f7a87cfb4bd0d5670e4aa864627 SHA1 6c63ae5cbd50e06b6cf65edf9231c225fd1d4045 SHA256 21f11d3db7a091f50125f7572b2468e546884c05a3b9223c20ca714eec710082
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk76o88ACgkQVWmRsqeSphMu5ACdHBikDkoxjGlBEsRuXshe+w3X
-PLIAn0+LRDXFIG2B5gJr/WB5ev1AM637
-=7CWi
------END PGP SIGNATURE-----
+EBUILD openscap-0.8.0.ebuild 2482 RMD160 f5cfc2dbeedba684363c8f20e9483c1dbe90b625 SHA1 643c59e571efc6ccf069e79bdfaa472edc7233c0 SHA256 5de57427c774574ae719652f084ac072a6c4c0eb177025e8b56a7cd8540af9e5
+MISC ChangeLog 2444 RMD160 df4094ed6d6b1b09963d2bff2405fecb16c7164f SHA1 f73e92081f6e0935d585bba7ead782798851a61e SHA256 e9b11335ffbc45939d24ae60dbac8a4b2fafb9a98feba5973db4289b12a1ae0f
+MISC metadata.xml 690 RMD160 70288627b4da157c34d478ef77a331037be21428 SHA1 c0950ee1c531d606fbfaabfb71d6c3dd71dc045b SHA256 c826790db1cf53df236c92afe8bfbf530a6352195aebe16036eaa58366abbeb5
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