Version bump thanks to corentin labbe <clabbe.montjoie@gmail.com>

Package-Manager: portage-2.1.11.53/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 141 insertions, 15 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 09af8b8c5cbd..21f35815d42a 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2013/01/30 18:43:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.22 2013/03/04 19:09:51 hwoarang Exp $
+
+*openscap-0.9.4.1 (04 Mar 2013)
+
+  04 Mar 2013; Markos Chandras <hwoarang@gentoo.org> +openscap-0.9.4.1.ebuild:
+  Version bump thanks to corentin labbe <clabbe.montjoie@gmail.com>
 
 *openscap-0.9.3-r1 (30 Jan 2013)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index c668a004be82..386f8aa6dd9a 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -7,25 +7,29 @@ AUX test_probes_interface.patch 387 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572
 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
+DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
 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 3863 SHA256 23b271fa0f4d8503a00ec18e08d14e92fffa8f62ff7bc4c9243552e079ad76b2 SHA512 849b2cf1edca47819ad45937ce68bfa3d950a3efe39c916be6185aac977ee8956c7a44998d18e78c52c0f559d15f0c9d9a104bed938c099087a725ec8b72f227 WHIRLPOOL 4131c33ec1960d73d0cefc2755a0b7f111ae8ff491dee934ff746126b4327ecdfbb4ee2c888be303195649eacdba5c7c3b0aede6634eed2a632738f2c1f41866
+EBUILD openscap-0.9.4.1.ebuild 3834 SHA256 441bdd72ee9a890566e86edc221fba732c7914b96c87841a508368bcfda717b1 SHA512 bf40561aa07ae2c437c3922fb2c823268c034d9b76f0429a041583d005ef669b58ac578fc90c9146419d8603e27681d28e1d5e57baef4dbe80d19ac1297438e6 WHIRLPOOL 1f37d539ce40469fa4c205ecc632014fa8df4ae41b967c32a255ed812ce1ed5ad6f8512da6230397b5b8fc2b7db50b4586eef00229dad13eb010461b20f150f5
+MISC ChangeLog 4044 SHA256 fd9324c8ddce9ca8b23b37d1b99824278817f8f140de6c70a8273057202344dc SHA512 46d592fd08f87587854f15f5b45eee24e303361f73470e1ecaff1f5b46e38a2b49f691399160c76e78727e1b0710a3d306b7874e3e3551e5496aa7e98560dfc9 WHIRLPOOL e02184a7b01be2f94a6b3344bfd125b0e62bc36630fc91aca59eee80face545fc75ec994e872ef6fb02343eeb8e3c2b86c492677a429b31d218885d64b1cae49
 MISC metadata.xml 552 SHA256 43527b7d217ec12cf41e0c349cf7d32def4c3c292ddc8f78f325a05ff352e36f SHA512 96e5b1568077071ba734d04bb42d9c68caea93f6defd100478f81c31b734b893a56d0bd5fe476926e06e22400192d9ab1001c64d517366f7810a30577ab11549 WHIRLPOOL 27a48b4227d8a07a9d120a1606237223574660315e8a33537fcb717d4f7744267611f519d83e49477eac946049e2a4a4da22d75fda7e7d9cb8140a9c0e68b5dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQJ8BAEBCABmBQJRNPF9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88GpAP/ih+dy0oQ6pmvXbEfAhnIeeL
+cAqIBUsaRVGZyBQB/GxI7a52lw+2XVU9JUYdat0vOsUvPaiVuB1bQYhcILnywkjj
+6h3YsqPh8+M3WMPH9LscEcPgJF6+0G+s74XleNIDWeFn14NQwpQPzjkuV3FgIdrU
+BdQbdL33np12p8EfYHt5DFh1hjUhQTjIVqJIixNFOjdOKmEwdGbaEWHrMSFNDsG9
++egWHUjf2OR2f5Co+IwHugdF1ypGCR+mym7m2YS9uL7stSIsGff0VM6E9jTk37i/
+yvDRuRHMbBI2rTK4Sy6kry2IEx1MsXMgMcu0fSBQgebmnOp5k6db7qXNiB/kaR9M
+0Dw1xsaADNOSPMajFG6a4pyS2TdZO8zvNuxh7W7VoLtfeeRJOptZ4LGjwTZf5cyE
+Ki+Uyv8I8M3Kuz079ISEBv5Vo66MDVL9mOnW3YMeIREk7Q8y+QTyNFwt+iiKXJWl
+6taHnkC5JoISpAApBePEkBsP8Q/lVyWybW0bjzj/xrt4BJ+Ikz5v4XV4BGMH33LB
+3lMRxA4J9frYzsHYcjX21izv9d71pppXZ+SEKuGNrutkorgFlBIYk/lTH+faMkbH
+VcSHwLKXYBEUznCnIQTyjwyaeeKlkMjhmBuUXDcOUE/Zzg/EikabLCaSP/fMq4TZ
+vfpD5RwHG6ojf7u0pfTq
+=GcUE
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/openscap-0.9.4.1.ebuild b/app-forensics/openscap/openscap-0.9.4.1.ebuild
new file mode 100644
index 000000000000..3c9b82eefaba
--- /dev/null
+++ b/app-forensics/openscap/openscap-0.9.4.1.ebuild
@@ -0,0 +1,117 @@
+# 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.4.1.ebuild,v 1.1 2013/03/04 19:09:51 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 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
+	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
+		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
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
+}
+
+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
+}