Version bump by Corentin LABBE via email.

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

8 files changed, 22 insertions, 299 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 21f35815d42a..bc035aa68569 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/openscap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.22 2013/03/04 19:09:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.23 2013/06/18 10:38:18 xmw Exp $
+
+*openscap-0.9.8 (18 Jun 2013)
+
+  18 Jun 2013; Michael Weber <xmw@gentoo.org> +openscap-0.9.8.ebuild,
+  -files/openscap-0.7.1-sql-fix.patch, -files/openscap-0.9.3-policy.patch,
+  -files/test_probes_interface.patch, -files/test_probes_process.patch,
+  -openscap-0.9.1.ebuild, -openscap-0.9.3-r1.ebuild, -openscap-0.9.3.ebuild:
+  Version bump by Corentin LABBE via email.
 
 *openscap-0.9.4.1 (04 Mar 2013)
 
diff --git a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch b/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
deleted file mode 100644
index abd247035b0c..000000000000
--- a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://git.fedorahosted.org/git/?p=openscap.git;a=blobdiff_plain;f=src%2FOVAL%2Fprobes%2Findependent%2Fsql.c;h=ad7988c60ec344fa721e28b8aca59b9690cabbac;hp=0eb18a9a7cd0c03d3923c2b724eea23791e4ff25;hb=9eeceaecde0718cf28ffc8a672923f4f16b63c6a;hpb=dfad8e4db009182a3a2c3c2ba79563feefb09ada
-
-diff --git a/src/OVAL/probes/independent/sql.c b/src/OVAL/probes/independent/sql.c
-index 0eb18a9..ad7988c 100644
---- a/src/OVAL/probes/independent/sql.c
-+++ b/src/OVAL/probes/independent/sql.c
-@@ -242,8 +242,8 @@ __fail:
- 	return (-1);
- }
- 
--static SEXP_t *dbSQL_eval(const char *engine, const char *version,
--			  const char *conn, const char *sql, SEXP_t *probe_out)
-+static int dbSQL_eval(const char *engine, const char *version,
-+                      const char *conn, const char *sql, SEXP_t *probe_out)
- {
- 	int err = -1;
- 	dbURIInfo_t uriInfo = { .host = NULL,
-@@ -350,7 +350,7 @@ __exit:
- 	return (err);
- }
- 
--int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg)
-+int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg, SEXP_t *filters)
- {
- 	char       *engine, *version, *conn, *sqlexp;
- 	int err;
diff --git a/app-forensics/openscap/files/openscap-0.9.3-policy.patch b/app-forensics/openscap/files/openscap-0.9.3-policy.patch
deleted file mode 100644
index e1b01271e111..000000000000
--- a/app-forensics/openscap/files/openscap-0.9.3-policy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450328
---- src/XCCDF_POLICY/xccdf_policy.c.orig	2012-12-14 18:13:18.000000000 +0800
-+++ src/XCCDF_POLICY/xccdf_policy.c	2013-01-07 22:31:10.417704932 +0800
-@@ -389,8 +389,8 @@
-         __attribute__nonnull__(policy);
-         __attribute__nonnull__(item);
- 
--	static bool TRUE = true;
--	static bool FALSE = false;
-+	static bool TRUE2 = true;
-+	static bool FALSE2 = false;
- 	bool result;
- 
- 	oscap_htable_detach(policy->selected_final, xccdf_item_get_id(item));
-@@ -408,7 +408,7 @@
- 		xccdf_item_iterator_free(child_it);
- 	}
- 
--	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE : &FALSE), NULL);
-+	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE2 : &FALSE2), NULL);
- }
- 
- /**
diff --git a/app-forensics/openscap/files/test_probes_interface.patch b/app-forensics/openscap/files/test_probes_interface.patch
deleted file mode 100644
index 672426d7ca76..000000000000
--- a/app-forensics/openscap/files/test_probes_interface.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/probes/interface/test_probes_interface.sh.orig	2012-04-05 14:41:53.846540789 +0200
-+++ tests/probes/interface/test_probes_interface.sh	2012-04-05 14:42:41.141285232 +0200
-@@ -22,6 +22,8 @@
-     local DF="test_probes_interface.xml"
-     local RF="results.xml"
- 
-+    require "ipcalc" || return 255
-+
-     [ -f $RF ] && rm -f $RF
- 
-     if [ ! -x test_probes_interface ]; then		
diff --git a/app-forensics/openscap/files/test_probes_process.patch b/app-forensics/openscap/files/test_probes_process.patch
deleted file mode 100644
index b9c1c3a64b45..000000000000
--- a/app-forensics/openscap/files/test_probes_process.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/probes/process/test_probes_process.xml.sh.orig	2012-04-05 15:49:38.746901398 +0200
-+++ tests/probes/process/test_probes_process.xml.sh	2012-04-05 15:50:02.330775903 +0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- 
--TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
-+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -iE '^[a-z0-9A-Z \-]*$' |grep -vE 'cron|grep' | awk '$1 != 2 && $2 != 2 {print $3}' | \
-         sed -n '2,30p'`)
- 
- COUNTER=1
diff --git a/app-forensics/openscap/openscap-0.9.1.ebuild b/app-forensics/openscap/openscap-0.9.1.ebuild
deleted file mode 100644
index 600b216c48c4..000000000000
--- a/app-forensics/openscap/openscap-0.9.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.1.ebuild,v 1.1 2012/10/25 17:16:04 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#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
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemted
-	sed -i 's,.*runlevel_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
-	epatch "${FILESDIR}"/test_probes_process.patch || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "",' tests/mitre/test_mitre.sh || 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
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use python || use perl ; then
-		myconf+=" --enable-bindings"
-	else
-		myconf+=" --disable-bindings"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
-	#--enable-bindings enable all bindings, clean unwanted bindings
-	if use python && ! use perl ; then
-		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
-	fi
-	if ! use python && use perl ; then
-		rm -rf "${D}"/$(python_get_sitedir) || die
-	fi
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/openscap/openscap-0.9.3.ebuild b/app-forensics/openscap/openscap-0.9.3.ebuild
deleted file mode 100644
index dbc31a4929bf..000000000000
--- a/app-forensics/openscap/openscap-0.9.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.3.ebuild,v 1.1 2013/01/04 22:48:07 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#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
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemented
-	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
-
-	#This test fail
-	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	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
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use python ; then
-		myconf+=" --enable-python"
-	else
-		myconf+=" --enable-python=no"
-	fi
-	if use perl ; then
-		myconf+=" --enable-perl"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/openscap/openscap-0.9.3-r1.ebuild b/app-forensics/openscap/openscap-0.9.8.ebuild
index a6f62ef70cff..b8737e8e3e47 100644
--- a/app-forensics/openscap/openscap-0.9.3-r1.ebuild
+++ b/app-forensics/openscap/openscap-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.3-r1.ebuild,v 1.1 2013/01/30 18:43:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.8.ebuild,v 1.1 2013/06/18 10:38:18 xmw Exp $
 
 EAPI=3
 
@@ -15,11 +15,12 @@ SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
+IUSE="bash-completion doc ldap nss perl python rpm selinux sql test"
 #RESTRICT="test"
 
 RDEPEND="!nss? ( dev-libs/libgcrypt )
 	nss? ( dev-libs/nss )
+	ldap? ( net-nds/openldap )
 	rpm? ( >=app-arch/rpm-4.9 )
 	sql? ( dev-db/opendbx )
 	dev-libs/libpcre
@@ -41,6 +42,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i 's,^    bash,    LC_ALL=C bash,' tests/probes/process/test_probes_process.sh || die
+
 	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
 
 	#probe runlevel for non-centos/redhat/fedora is not implemented
@@ -67,16 +70,21 @@ src_prepare() {
 		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
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
 		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
 	fi
 	if ! use selinux ; then
+		einfo "Disabling SELinux probes"
 		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
 		#process58 need selinux
 		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
 	fi
-	#450328
-	epatch "${FILESDIR}"/${P}-policy.patch
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
 }
 
 src_configure() {