Version bump thanks to LABBE Corentin <corentin.labbe@geomatys.fr>

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 122 insertions, 15 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index af688d196088..a64cbc0f653c 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-forensics/openscap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.17 2012/07/26 22:09:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.18 2012/08/01 13:34:25 hwoarang Exp $
+
+*openscap-0.8.3 (01 Aug 2012)
+
+  01 Aug 2012; Markos Chandras <hwoarang@gentoo.org> +openscap-0.8.3.ebuild:
+  Version bump thanks to LABBE Corentin <corentin.labbe@geomatys.fr>
 
   26 Jul 2012; Markos Chandras <hwoarang@gentoo.org>
   files/test_probes_process.patch:
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index cbbeb6565798..8a0d3ba3ce0d 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -6,24 +6,26 @@ AUX test_probes_interface.patch 387 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572
 AUX test_probes_process.patch 474 SHA256 5c2c6493e0ab80933946cac9dd5997f1f4a05b3b0ce7f2ee4416bf4b257d04d6 SHA512 6500c4eb5c47719fb18c2dc1cac6e866349a0d668d54c91baf880c26a1bdc009804da2c2343400bd5ebdd1e5d59161d0ec7b971c5c0f4876e169a5e54e9423f8 WHIRLPOOL 95bc8be0c1c03d9f188219fb048eb8aa762c6583c4ef34a173496ab7779a11ab4cfec9787dec5661de5b560185a06419df4b777319399a003a7ad2abb11fc911
 DIST openscap-0.8.0.tar.gz 4473555 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33 SHA512 f0fd5f042ad8fc595ec7835efd9ec2f66c44615d53faa986eb5320d4bc7701323b4fec3840c15a52603c105aeac091912ab42ee6f2270c033e90584b7abd6afd WHIRLPOOL 45d8f741068e1f0a435559dea9f0e341639d5ed2a1a199dce6aadaa5c964f1e327baa6a83fda0843329e38f23e583a9d003686bd6dcd1d94fa47423ebfb8de56
 DIST openscap-0.8.2.tar.gz 4524453 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11 SHA512 a7bf55014095f0e5d2168905518c592ba3eb91783db89ab74eec7a9c29a17bcb8071c41cb9256d9c449b8a10aebaa57173ef3f9ed37ebe24ecf84edb85da5790 WHIRLPOOL 1fb157676c71c4db7af030746605c6181b16a17cbbbdd2e9d0ada99fc9bffc5570c9f488570c47780928906484d68723446056e68e032181dee18a655eb4e510
+DIST openscap-0.8.3.tar.gz 6420923 SHA256 e00b9ee6741b7ae01f46172c2ed560b38107a1fffdda5bc7c32be4f4a15ef5e4 SHA512 b1fe3577e18d9ee8da0ce39f15c7f1e0ade507da1893aaa71093af1214be119b72c5a16f0f3e81b0ed91fde1ffbfdd53c9252d096ca45a356cb63f9fa8d31427 WHIRLPOOL 59a48c872ca047396f911a96efb2b559ac35055d46c61a78b3170c390c4959f9276cc9545fd4b94e0c29bbab545e702f0cbd93600d36d0765749a66bceaba86e
 EBUILD openscap-0.8.0.ebuild 2482 SHA256 5de57427c774574ae719652f084ac072a6c4c0eb177025e8b56a7cd8540af9e5 SHA512 05d95d7108318680aa2af388ba0810bdd1a01fe5a1517a4e69b8e5f9e2c48676c42afeec1f285b4263f8dfd93b3c63e1eee35565b64bfb743ad25414f238d0f3 WHIRLPOOL 72cbe756f94d77e7f97d0d0c79fa310e1f7a6eb6494a5d3f3c514f0cc4dd4a92c48e054d4486c1a141d59d936dbeda8c4f9611b26eff80478e44e56f30b26d9a
 EBUILD openscap-0.8.2.ebuild 3522 SHA256 3cba73aa789f38ed97b700ed598172c06f2e771ce4c34d8846ff8d993dba0d2e SHA512 b1dfd51d70903718ebc9d724ec86585e2e66172619571897c2caade53d4cfffe2124f3aa666c3595692ff5901c19a946baf93bc3fc99d9b46415589fe37c78f1 WHIRLPOOL 79ff38510ea8f35f0f46092ec94ed525e3a53f9884470b372c8c84149c6c9ae2426716abe1e8486d4607fb78d1bc450807272ac498aa164fbbd3aa860c469422
-MISC ChangeLog 2939 SHA256 3c60ee1b65ae395f22567c1ee3888c15cd33d3020ad3df1e332f5d8fb3490d4a SHA512 0f2bdf3ce42660a91f8680500a39907531fb0f85efcb76fdab920d70b837606adf2a15548872bdabeacf39e250d0e6511cd392cb993b365a1281c0305f66b70f WHIRLPOOL 57fb265f1da16bf7e5755d6622c68548f9a097451af5b95cb6ce531ac88440b17e34bfcb73b93d4a42dbead3b058e62863fd3b3499cdb4b33c64a3c3ca78e214
+EBUILD openscap-0.8.3.ebuild 3279 SHA256 e48216adf50f95975b204a8416f5ddf9dacea63a257498fabdf5f702bce52292 SHA512 94ced274bd1c8c15bbbc4a6f854a78a5ba103c3e3eba91df056952c1bb246af787cc0cc499e56da7ca498e4acf0061e069700e87f71132f0dd32a3c10cc1a0b4 WHIRLPOOL 655140ac84ea5bf37b72b0758eee2fbf67cb5c87d85bfad9ac0dafda7060e9257e75f330748b3906a4c311996c59a08d70c48672f8218728ec635f69703b9ef9
+MISC ChangeLog 3117 SHA256 1635ba3a9bc8de38d05706f42a43943b7d0019e0859f416862727818fd71e8fa SHA512 e0636302a940489d269273c4d584c3faf927700181208e38e34a09bab978e97ab2a327d37ae1a6158e12456e94b36b78a9a4218703edf9e11e28fbe4102bff07 WHIRLPOOL edb91405caf6ceabd0352f0171d80b9d206745f8369aca417405be06eed9e9bbc74e638c9a6931ccb646bf990be777b404704b27145cf95c3d8e51072e5a55eb
 MISC metadata.xml 690 SHA256 c826790db1cf53df236c92afe8bfbf530a6352195aebe16036eaa58366abbeb5 SHA512 24b69f392e98ce311bafb1cf5f737bcf5b0f6967c50402cd13086e178314300a8ffee0b83ee9bca230c327f6d42618131de05d4ece6104e2306486c509a29c45 WHIRLPOOL 38ae67e52723148a50cdcffa999d92bef5cf1ae620ba5ee9bbea36eeded410be1b6501f6594a6da9f3aec2b20dff77c3e6814772875fb810332dd704c14aa357
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQEcAUAAoJEPqDWhW0r/LCKg8QAL2hYMpgHLbvj2ROGKc6kuV6
-kPsWg7mEEC92H6+B5k5TZ4WiNWmpXHd+5jXooRaJKGNVY7resaEB/QcWFPEx50ga
-79K8VBYQ3L2Q6UOUT93aBz0NAgkQbPu4XJ0NbYeDEDGEqGfWKK+06hffWLBgRbl5
-yLS6IhJv9qJINJLSom7C+B51ZOOXQacoENj4UfpyOhLZ5yCBaefz9JQU/ksVO9yS
-dlbkfnV2WDgNw1EOqYzBbzJTFxhqctTfDgBWOW/FBeIMP57cc7xi+9Tn0FvO2Bxe
-s24vb+Rkkot0OnayWUAPI06DVHjba4NX5UIGOHHUyYFFw7+Ihq7YeNgwNfatwsSo
-rMZ5ZPYJUxCYoUx9sLvM1tZSlW1HgFw0kB4IPw7l8c3wFtVGDm6KDg2axpezl4x7
-/Rfsn5A3Lxav65apL6YKl8HQN413csCHuq7kOJrzi7t8p13ykCLHaRRgr9iznqJo
-zHEwQxzsGg99iFP3YkLnx7Qy4uq/Q/a+UMgV4vUyFIFyHtsiV+3wePXFmf6an4Aq
-JxxPGK5iV+m2UgVhNu3MdSdV4CUS4VUQ0GbPFPJfXUHMcjdDs7n2bpaw7Lht0bSj
-Yl6RIDZf0XDO/8aQT7l8VGyjsAj57cxcDmIb9qyp4s31sKzlSoxOB8YQm/Gs440I
-Qtq6iMkofYsqCBzkutom
-=zntZ
+iQIcBAEBCAAGBQJQGTBnAAoJEPqDWhW0r/LCavQP/3q8x1ZyIQf4rsihUitnIbqN
+6ey9wNfjKTDUvURdHqVF43GV/WIxAbdJUYt6CURMAgn7ZFKCVyVKEmACq5bUmu1P
+NuDc5N5mhP8pKDuwv3KOhSKEYpOTaCJtZfbW8r4i3QQ9NoKsoM3ThWcpnTnbbodv
+qrFtYzOIOV8RCf3TLTJHW7va7YKATUeyDUjE3xsN63i53h9lUB3Fo4t9MZI3oQYN
+ASvX72TDORme7XkqM+L+bFGWNI8MG29snqq8EnkB5pCQCqXeejdgOMVFIGW9608N
+lZ8GZZ+MWV3lpjZfp2GuW6aCdRAp6NDrly3vCv8hF/3szrQ7HFc6DHiDU9Cxn2UG
+d6zkPQg3ERcmWGK35tbqQhX4e2WtU6kjv03DJ0R517KiM1TSpqTjoaWw+nX6m91C
+ju0QRopV1qEfTLUU9dM+wajFV4vjTdDFuVo4t88aJbTs/W0vmyDJYM5H45sPGgWR
+714adhE+HS+LRAm+cv0Dp3dnNGUvI0H4dq2grg8deb7MvfVpi626th34YszKUXT6
+Cy/IcryWWrUe2swhw7EY6fd4vJoeLFigFPtvpMC9UH3KXVjejkrnUZZRq1dsnsZ6
+zDYQSRDRrme2zL7Dfy28cezZtl+lbeUg3Tirx1J4cmH0wqah8dCeRW1lB8pzaFyK
+qSm25+hqiPRR2NeMPj1v
+=l4hB
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/openscap-0.8.3.ebuild b/app-forensics/openscap/openscap-0.8.3.ebuild
new file mode 100644
index 000000000000..20b159e50cc8
--- /dev/null
+++ b/app-forensics/openscap/openscap-0.8.3.ebuild
@@ -0,0 +1,100 @@
+# 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.8.3.ebuild,v 1.1 2012/08/01 13:34: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
+		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
+	sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
+	# runlevel isnt supported on gentoo
+	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
+
+	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
+	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
+}