Version bump. Thanks to LABBE Corentin (Montjoie)

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

6 files changed, 46 insertions, 120 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index a64cbc0f653c..2d104161ae0f 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2012/08/01 13:34:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.19 2012/10/25 17:16:04 hwoarang Exp $
+
+*openscap-0.9.1 (25 Oct 2012)
+
+  25 Oct 2012; Markos Chandras <hwoarang@gentoo.org> +openscap-0.9.1.ebuild,
+  -openscap-0.8.0.ebuild, -openscap-0.8.2.ebuild,
+  files/test_probes_process.patch, metadata.xml:
+  Version bump. Thanks to LABBE Corentin (Montjoie)
 
 *openscap-0.8.3 (01 Aug 2012)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index 8a0d3ba3ce0d..ffa1faff85b3 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -3,29 +3,27 @@ Hash: SHA256
 
 AUX openscap-0.7.1-sql-fix.patch 1122 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2 SHA512 e085bea2b703248e1863d90a23478f8349c23083ca09576781efd9818df505a979c20366f7f0f096b65c8794d1703e17c1b91e8d5675df8bf9a5db5105303392 WHIRLPOOL 7f2e6cd1e051f80cd5007853abed90d0078f429f704bdbfc54b5e9e067f385cf1a36d24f304fbcd2d31ebb9e517a78c48167e37ca8417f7003d442452d9b672c
 AUX test_probes_interface.patch 387 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c SHA512 dca99d4c421588686cf89aa2e3513b4266dad1660d9f61837f5e59bf57936a485275f5df58935b6de14c0c9fca125bb06071d994e5ddabb860809d1db634e5ea WHIRLPOOL f51f99fe4f631a311f0b2d8d613a9d2c442fe513bbea49f9f6047f167addbf8751de95788cd1011e94d8dbda688067f8ff21348b807ddc50dcd3e217e56cd279
-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
+AUX test_probes_process.patch 496 SHA256 9c15c0f58e84928349b8a4f9cd14e9b702653d1ddd8f9d7b42e774feaeacf531 SHA512 7714969722355842ab24e4a7cdc92aeb60128f7e8c9ad173a8f8880001a0d0cbc3c6fc1ac254fb691ef0a62dfea27ef772ecefdbb9fe8fb887557e53992cf10c WHIRLPOOL 3ee11d5af84f4149266478effd6d7b4ac1ee0047dd1d5d9492a7e78e27e9cdf8cdb80e70837e6f08b80520ab818ee74a44c017bf9c8f42dbbf7689d68614b74f
 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
+DIST openscap-0.9.1.tar.gz 10744598 SHA256 4601ffd6c1b5d0e9025e49db194f2e7f7d7fef1826981bb212ef543c28e94fe6 SHA512 0ead581b8801b3cd1a0af20d746a766d8c56f58013be49c390df152001bb721a81445d5e683fac50c19071340ab78ff068161bff7d76d67e15e62dfdc50d88aa WHIRLPOOL 966c6604591dfb3d10eaad793c2348b5a4ae0a813fdcdfdf8ebf22f9cb471181bfcd3e0455acda16fe6d358c704067e92584a054fe88b1a8fd2743614af8428a
 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
+EBUILD openscap-0.9.1.ebuild 3886 SHA256 f0a6f2de17ae3add56be14eb3c792f2f0458bf8317c8bdeb2e0447d2d03ee300 SHA512 3dada66de05006c1bd78ebffddc53727c4c5e15bdc1ad8a3d53c8b0142e7bdde23491e2a68d49485ad3d6e3ed2b02bc2010e72d41d93a7cdf681076c2e9969e4 WHIRLPOOL 429adb0d397f813f3779feba51b03f14f4e0490c23dcfac7e1ccb411bf8dabfa16d8bf856e9278f69a52f699101cfd0df194e69318fbc2ee482a03f75cea83f2
+MISC ChangeLog 3377 SHA256 6acc634ca568501480461d2dd424504319d2a6808f99babe6e00c4d2db0f570e SHA512 59c8790fd634bced0622aa84b622ae0534958e45bf607c61737f86091527f5f118678a3cf016e48f00c264b39ae16a481c950d56a5e3f8419c1544c286ce1649 WHIRLPOOL d03e436c4be7749983fe7e74ba821262d2acf3b7abb84620b10246a49fdb23a364645b7562760268792bda55abb0499940eeeb71b2655792a86810b988e6ef92
+MISC metadata.xml 553 SHA256 c1b738afa5f0c31dc88343ac21988fd386bf1c4cf510fab0c582614d33ceccdb SHA512 c84bb5cc3288fb838f46346b4bb22a233ef379f1e599ebf82402125c599350bb74603e5b4f7591cd93ffba0921464f2215739ec833d38b87576fc0a217b76569 WHIRLPOOL b2351ed3170880010610da36462553ec3120a9daa6e20c6d3d8632a2db90025ef651d1f9584d979babda0f91a7e9e252e32787a935c7b1a16f1405c66f523b10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJQiXPUAAoJEPqDWhW0r/LCuqsQAMHSW2rJYn3SBEv9Fm8LD2wD
+q/dHkaH/3mZJQzSVXGECber5wnIAcdWcqJ4H4rTL6Qs9VjxoUO4+wf6XjnS3qVLv
+XE4K5evIHKkhY+b8afDQ99L9OLkdWjIVVkE2JZdO0OsXC4ZO050oG4gNoOje5K8X
+S5nQXVjz7ifWfCaHCFTzg9wSGU1TVxOMfZA2Ev0YWu/FM05bDGSsMwP/TIZjBscf
+wWzrfOX5L+q7Q2mU3IDoniQGoG75bmBuquLtcYqM+gie70U4oKcXD28U9I48Q5z5
+r/T//WM7NKbWbs5mr0UQ8sK1JbVkfdpvLGzDlPY0lpey2Jb+rbWU92BiZKdrE1P0
+MCB0ikDaOoog3TTP4iCJWYiMuj9osjwge6BIeO1YqRYfENfZbC5qyKKg+BXlVzmo
+YMUc9i7xT/FPk9Yab3HcMpCN440PIcpJSZeLH1vKWMPQ8ukTl5td0706ldeHOuim
+Yy7ArhgYGMIdLS+8GpHGfn/LVbAbQh2OwPGD2wXQIt0xfo81PCb4nOH5bUSFcFpM
+cAG1N1xv0FKIXP/H/OuND6wlnG7sqb/ascpKosNrwo0kXkw+dFpWZzhXR1wn3NKb
+95764yFWRReuRSzjBJslyihSj5mgla7vyxhLpEcvI4yutJG/iogbP9ggso9dRJ04
+hu5Ytd1217v5miIsuqE9
+=ZEPC
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/files/test_probes_process.patch b/app-forensics/openscap/files/test_probes_process.patch
index 508c059e2a77..b9c1c3a64b45 100644
--- a/app-forensics/openscap/files/test_probes_process.patch
+++ b/app-forensics/openscap/files/test_probes_process.patch
@@ -4,7 +4,7 @@
  #!/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 \-]*$' | 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/metadata.xml b/app-forensics/openscap/metadata.xml
index 8be2af1a9c36..889e265b225d 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -5,12 +5,7 @@
 <maintainer>
 <email>corentin.labbe@geomatys.fr</email>
 <name>LABBE Corentin (Montjoie)</name>
-<description>Maintainer.</description>
-</maintainer>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-<description>Proxy maintainer.</description>
+<description>Maintainer</description>
 </maintainer>
 <use>
 <flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag>
diff --git a/app-forensics/openscap/openscap-0.8.0.ebuild b/app-forensics/openscap/openscap-0.8.0.ebuild
deleted file mode 100644
index df2a7435c2c9..000000000000
--- a/app-forensics/openscap/openscap-0.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.2 2011/12/28 14:01:19 swift 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="http://www.open-scap.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-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
-	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
-		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.8.2.ebuild b/app-forensics/openscap/openscap-0.9.1.ebuild
index 7bb3862d272f..600b216c48c4 100644
--- a/app-forensics/openscap/openscap-0.8.2.ebuild
+++ b/app-forensics/openscap/openscap-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2012/05/22 20:51:55 hwoarang Exp $
+# $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
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	test? (
 		app-arch/unzip
+		dev-perl/XML-XPath
 		net-misc/ipcalc
 		sys-apps/grep )"
 
@@ -41,18 +42,25 @@ 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
-	#problem sent upstream  https://fedorahosted.org/openscap/ticket/45
-	sed -i 's,unzip,\$1,' tests/test_common.sh || die
-	#problem sent upstream https://fedorahosted.org/openscap/ticket/46
-	epatch ${FILESDIR}/test_probes_interface.patch || die
-	# runlevel isnt supported on gentoo
+
+	#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
+	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
@@ -64,6 +72,8 @@ src_prepare() {
 	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
 }