[gentoo-commits] gentoo-x86 commit in app-forensics/openscap: metadata.xml ChangeLog openscap-0.8.0.ebuild

[gentoo-commits] gentoo-x86 commit in app-forensics/openscap: metadata.xml ChangeLog openscap-0.8.0.ebuild

[Sven Vermeulen (swift)]

swift       11/12/28 14:01:19

  Modified:             metadata.xml ChangeLog openscap-0.8.0.ebuild
  Log:
  Fix bug #396263 (build failures with rpm probes), patch by Corentin Labbe
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  app-forensics/openscap/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	28 Dec 2011 05:06:18 -0000	1.5
+++ metadata.xml	28 Dec 2011 14:01:19 -0000	1.6
@@ -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">



1.15                 app-forensics/openscap/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	28 Dec 2011 05:06:18 -0000	1.14
+++ ChangeLog	28 Dec 2011 14:01:19 -0000	1.15
@@ -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.



1.2                  app-forensics/openscap/openscap-0.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild?r1=1.1&r2=1.2

Index: openscap-0.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openscap-0.8.0.ebuild	26 Dec 2011 14:30:28 -0000	1.1
+++ openscap-0.8.0.ebuild	28 Dec 2011 14:01:19 -0000	1.2
@@ -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 @@
 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 @@
 	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