Revbump with patch to fix bug #450328. Thanks to Anton Bolshakov <anton.bugs@gmail.com>

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

5 files changed, 160 insertions, 17 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 2a3037a55fdf..09af8b8c5cbd 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2013/01/04 22:48:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.21 2013/01/30 18:43:25 hwoarang Exp $
+
+*openscap-0.9.3-r1 (30 Jan 2013)
+
+  30 Jan 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/openscap-0.9.3-policy.patch, +openscap-0.9.3-r1.ebuild, metadata.xml:
+  Revbump with patch to fix bug #450328. Thanks to Anton Bolshakov
+  <anton.bugs@gmail.com>
 
 *openscap-0.9.3 (04 Jan 2013)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index cce40d8cb54d..c668a004be82 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA256
 
 AUX openscap-0.7.1-sql-fix.patch 1122 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2 SHA512 e085bea2b703248e1863d90a23478f8349c23083ca09576781efd9818df505a979c20366f7f0f096b65c8794d1703e17c1b91e8d5675df8bf9a5db5105303392 WHIRLPOOL 7f2e6cd1e051f80cd5007853abed90d0078f429f704bdbfc54b5e9e067f385cf1a36d24f304fbcd2d31ebb9e517a78c48167e37ca8417f7003d442452d9b672c
+AUX openscap-0.9.3-policy.patch 800 SHA256 aae1bd28267aba2f44acb30e33460870b1d9d2749c3976bee23e0292777b3b09 SHA512 532978a5a168f122ad7a62d525b66de7e8805189c430728b929a9448fd9f68502cb4e9773bce1f0e3a395a20f794e77dbb198a96a70c59b3307f3d66605a885c WHIRLPOOL 4f5b4da69bbee73171662b31c8cbb9f12c206f82713f469a6226fa37d8dc66e9fdb556ef6a21f4c0833a8a16567983e15d47b097487e9c53e7a702a1c9df5faa
 AUX test_probes_interface.patch 387 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c SHA512 dca99d4c421588686cf89aa2e3513b4266dad1660d9f61837f5e59bf57936a485275f5df58935b6de14c0c9fca125bb06071d994e5ddabb860809d1db634e5ea WHIRLPOOL f51f99fe4f631a311f0b2d8d613a9d2c442fe513bbea49f9f6047f167addbf8751de95788cd1011e94d8dbda688067f8ff21348b807ddc50dcd3e217e56cd279
 AUX test_probes_process.patch 496 SHA256 9c15c0f58e84928349b8a4f9cd14e9b702653d1ddd8f9d7b42e774feaeacf531 SHA512 7714969722355842ab24e4a7cdc92aeb60128f7e8c9ad173a8f8880001a0d0cbc3c6fc1ac254fb691ef0a62dfea27ef772ecefdbb9fe8fb887557e53992cf10c WHIRLPOOL 3ee11d5af84f4149266478effd6d7b4ac1ee0047dd1d5d9492a7e78e27e9cdf8cdb80e70837e6f08b80520ab818ee74a44c017bf9c8f42dbbf7689d68614b74f
 DIST openscap-0.9.1.tar.gz 10744598 SHA256 4601ffd6c1b5d0e9025e49db194f2e7f7d7fef1826981bb212ef543c28e94fe6 SHA512 0ead581b8801b3cd1a0af20d746a766d8c56f58013be49c390df152001bb721a81445d5e683fac50c19071340ab78ff068161bff7d76d67e15e62dfdc50d88aa WHIRLPOOL 966c6604591dfb3d10eaad793c2348b5a4ae0a813fdcdfdf8ebf22f9cb471181bfcd3e0455acda16fe6d358c704067e92584a054fe88b1a8fd2743614af8428a
 DIST openscap-0.9.3.tar.gz 11928497 SHA256 0aa482fa4a22493ec3d5987fd8c86d5124a94675f5cbdd6aac1cb86f14402acd SHA512 75f5d958d04c290a3a8458a4a21956da6f5d337c85ab6da1b246bb13cfbcf376e811f55f16b70c7a3d3c73ae27cb7ab01242bc472556218a116c562c162464fd WHIRLPOOL f46c317c95d5d33f995f4498707d315cf7f38f3be7960efcc9e460b94979290cb783907c6f8b26c436a6152b7d3ca58059b0e2e4382d2be75352dc17232665b2
 EBUILD openscap-0.9.1.ebuild 3886 SHA256 f0a6f2de17ae3add56be14eb3c792f2f0458bf8317c8bdeb2e0447d2d03ee300 SHA512 3dada66de05006c1bd78ebffddc53727c4c5e15bdc1ad8a3d53c8b0142e7bdde23491e2a68d49485ad3d6e3ed2b02bc2010e72d41d93a7cdf681076c2e9969e4 WHIRLPOOL 429adb0d397f813f3779feba51b03f14f4e0490c23dcfac7e1ccb411bf8dabfa16d8bf856e9278f69a52f699101cfd0df194e69318fbc2ee482a03f75cea83f2
+EBUILD openscap-0.9.3-r1.ebuild 3698 SHA256 c02d8b38c648601fe39574f00712bc67d373d304624b426b5ae4654a216a0804 SHA512 96689d209ba03df492a2d04143973d54e27d8a15eb6ebdc5e31bfe6cfcba6191e291f56dcf803965642a4a813927ad0adc22a7293c4869b2627cd6783678a580 WHIRLPOOL 34b74b797f18edfb87452cb442c7c7d4752cf590f471f7b6c833397350d62e37c07406a478d33f3b44295dc2dbc0bedc740f164fd576f8e45c9b5d1ab31ef0be
 EBUILD openscap-0.9.3.ebuild 3646 SHA256 92fba4a8409ca2fa5e263ccd4d17577ce846c9016affe1f4193008937076f117 SHA512 a423ed34e88a2f32183693b8e74e9a8b673a3b8e9f984d58250dd63948eef165ea49cd4d4dee84cea3def37eb8f4e48f1d8416d3cf355b4966cade1e1767da46 WHIRLPOOL bd8413f3fb43b9f9672c3224c96bf678d9e8cbf0e8930f7eda10507fe98a6acb162914738e0e214c1de657ec9b13b0d6521aaf976aa832d2f1ab4415614b0b35
-MISC ChangeLog 3604 SHA256 766f3e6a8d10e49f26b9168cb0f37b4ba5d6885b26c02cff43489fcebd238099 SHA512 0fcbc5633a51ddd25514df46c89e69ae9bb124e6d248d5611e9229b473ee1622bdb0f499f3f40958730e351041be4b7b0b48c62243cd8c556d867e8221d75290 WHIRLPOOL cf9e2d30fad7370b0ab6df9ac59d48fccdc1ea87ab2649dd7a808b450c560d5b145f814d300100b4c62423f2326cec67c53b0a2924f21ffb4041118148cf62f7
-MISC metadata.xml 553 SHA256 c1b738afa5f0c31dc88343ac21988fd386bf1c4cf510fab0c582614d33ceccdb SHA512 c84bb5cc3288fb838f46346b4bb22a233ef379f1e599ebf82402125c599350bb74603e5b4f7591cd93ffba0921464f2215739ec833d38b87576fc0a217b76569 WHIRLPOOL b2351ed3170880010610da36462553ec3120a9daa6e20c6d3d8632a2db90025ef651d1f9584d979babda0f91a7e9e252e32787a935c7b1a16f1405c66f523b10
+MISC ChangeLog 3863 SHA256 23b271fa0f4d8503a00ec18e08d14e92fffa8f62ff7bc4c9243552e079ad76b2 SHA512 849b2cf1edca47819ad45937ce68bfa3d950a3efe39c916be6185aac977ee8956c7a44998d18e78c52c0f559d15f0c9d9a104bed938c099087a725ec8b72f227 WHIRLPOOL 4131c33ec1960d73d0cefc2755a0b7f111ae8ff491dee934ff746126b4327ecdfbb4ee2c888be303195649eacdba5c7c3b0aede6634eed2a632738f2c1f41866
+MISC metadata.xml 552 SHA256 43527b7d217ec12cf41e0c349cf7d32def4c3c292ddc8f78f325a05ff352e36f SHA512 96e5b1568077071ba734d04bb42d9c68caea93f6defd100478f81c31b734b893a56d0bd5fe476926e06e22400192d9ab1001c64d517366f7810a30577ab11549 WHIRLPOOL 27a48b4227d8a07a9d120a1606237223574660315e8a33537fcb717d4f7744267611f519d83e49477eac946049e2a4a4da22d75fda7e7d9cb8140a9c0e68b5dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ51whAAoJEPqDWhW0r/LCx04P/RqXZGmPryCTtBrh6mtEEB61
-fAC7gsdlXkNHcAJRY+Oj0QH4SOL4uymYDDTbgR0C2aSXKTIbodqVqs3CdIUwznCz
-zHOvJoWMGVQA/EWY1sydKaAceO6q8E8+zlIYrNg+FhesbcRQQsPzMGj+YW0iLV3t
-lnBqmMRTR2PTZqMmm7X/INf7FPMYhFtazS0wdLVdds8HtCRVZcKZrnC+ztbDpfOk
-+mRhs1YRjvRuhBKTX79QqYoYuEnLHRg45MOsnavJuWebWdkDmDFh59LC9SL8EADW
-I5IoAXsUDGS20UKTqDWESFetK9hrciRh135jiK06JnBek2zBXRElleU0Oc6ZUcjZ
-vBJMX01yk7pe6afbHlhmYRNCiC2/NXtXrlksXhB/uvslVVb9YaXCFwRR0sXc5JrR
-SZhzcYNtg6hJBYarbnA6YDIooShXRp8SZp+XSdWJLeOA1FDLicPyxZ0vJ5EdbDXJ
-RFpYII/VWewlagakfybWp9xSJwvdyjJMeUzN3JgDGlwnOKQY4dyWhj9HCAM0lkAT
-tHFSuKnurorgIQDv5jsZAUITXUPGdv1b16wDfA/z9UvHI0gFcqbvpYycbhmqJDAO
-aHPj6thUq3yNx6XL3om83gF9xpCb7o8EV4gzw0h8WMVAbu57ptFkonj2U3AVmzxw
-BpciyL1X6xkU5yg/4PCr
-=w3o4
+iQIcBAEBCAAGBQJRCWnMAAoJEPqDWhW0r/LC+j0QAK7c9X0IvbzPNl2hjDKgJ2Z0
+1BYWI+mTtMm6h9gYRVU59YiCOpHTGn8axM8NEUgNWBl5BU8mYevWQLYBzbpYyuie
+AcwC6VoYnvlu66Jv8Aq1hjOcZNDTAmS/5S5W6C0Lpmn4AgE5AQP2DYpaoX+sQtfv
+xdpvVGBz9fB7SAK/0QrvoKxsMKP+hv2NKZZ4w7FxwVXGLoQTd22PHYZ5dozsCmV/
+9NnGCVY7Uk2QzGVRcdH3XiIBGqpWi1eL61bG6H+pOTy5FfSBDjmOP/v2Gae5rYr6
+9Hv7DpdQQ0+BndexyVfdiR5S+MW9WJiCBp7ZsPa8R/e4CJqZg7FsQQmCLWFeFNWZ
+nnt3j8nWH5AxfF/dAnUG+LeSB790qQ2tXVTmEqGgSJYQcT9UHyDhY134jZvwvAR/
+ogiQSybEEFXwXZtXWJZo9xb2lGXKUWb+M/myzfSMB9Cz7J22Bd7/ExN9KKKNOtaj
+P2ak8p5zUUWIMhKedadD1LxhoWDI7jk2JkFwGGNrVdxKt3Dw0vYNsW9B2ZXB+0g2
+DDMLsaRfTo+i6U5RQ4/ZRckM5cMWUU25tD9RSBTVZ64/k+px6kiiDbGy41K2+nvi
+cUT8naAgsN4b9YKIt/14mJBEcKwu4RKimAk1mufIABuPAEecPEFBHJMp8DgM8jQP
+qogqbLCOPNUizGTOqqQV
+=xMRz
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/files/openscap-0.9.3-policy.patch b/app-forensics/openscap/files/openscap-0.9.3-policy.patch
new file mode 100644
index 000000000000..e1b01271e111
--- /dev/null
+++ b/app-forensics/openscap/files/openscap-0.9.3-policy.patch
@@ -0,0 +1,23 @@
+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/metadata.xml b/app-forensics/openscap/metadata.xml
index 889e265b225d..51d5fd284635 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-<email>corentin.labbe@geomatys.fr</email>
+<email>clabbe.montjoie@gmail.com</email>
 <name>LABBE Corentin (Montjoie)</name>
 <description>Maintainer</description>
 </maintainer>
diff --git a/app-forensics/openscap/openscap-0.9.3-r1.ebuild b/app-forensics/openscap/openscap-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..a6f62ef70cff
--- /dev/null
+++ b/app-forensics/openscap/openscap-0.9.3-r1.ebuild
@@ -0,0 +1,111 @@
+# 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 $
+
+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
+	#450328
+	epatch "${FILESDIR}"/${P}-policy.patch
+}
+
+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
+}