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

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

7 files changed, 159 insertions, 147 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 333b03b72ef4..dcd068451bb0 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/openscap
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.15 2011/12/28 14:01:19 swift Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.16 2012/05/22 20:51:55 hwoarang Exp $
+
+*openscap-0.8.2 (22 May 2012)
+
+  22 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/test_probes_interface.patch, +files/test_probes_process.patch,
+  +openscap-0.8.2.ebuild, -openscap-0.7.3.ebuild, -openscap-0.7.4.ebuild:
+  Version bump. Remove old thanks to LABBE Corentin <corentin.labbe@geomatys.fr>
 
   28 Dec 2011; <swift@gentoo.org> openscap-0.8.0.ebuild, metadata.xml:
   Fix build failure with RPM probes (bug #396263) by Corentin Labbe
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index aa5f54bf4bdd..bc848b7ab2d8 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX openscap-0.7.1-sql-fix.patch 1122 RMD160 0a98b86f864b3990c97769141a12f78557046883 SHA1 0058400cf127afd688d065c43b5ff22d6cf0f1c6 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2
-DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
-DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
+AUX test_probes_interface.patch 387 RMD160 39a9774aefff83c14c4ab2a68d7fa1a02a57f140 SHA1 e16f915682595b21e0edac2c02ab37275e29ca29 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c
+AUX test_probes_process.patch 458 RMD160 61212bbd50306c7cdcb986ee786f0f00d11857e5 SHA1 1fead6859ded04f27abd07f7c999045be5606c74 SHA256 44b47dfce6b0ac96e29430ad3e43257e4797dc8937bb9b63ecc8e1c979c0ba59
 DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
-EBUILD openscap-0.7.3.ebuild 1747 RMD160 4bea04b6c700c84594fccfa89e68097b8037865a SHA1 8c4c88a16bcd6912183602dc0a830b9a7b4dda14 SHA256 c477d1381da5be52b9ac41ca44d58fd4c99e242e31de98091f30a47ea288a888
-EBUILD openscap-0.7.4.ebuild 1747 RMD160 c464d7db1152e71d261c132daabb9565b7528288 SHA1 322fd66a4cc67b6a7133fd9349850a036e264833 SHA256 93c8bd09f8a8bc0bf884da3f9a6a98d25d0e861a007b45937ad1ae7d5b8b9e03
+DIST openscap-0.8.2.tar.gz 4524453 RMD160 06f4a08c9145a09f35b7c82e855922f547a247cb SHA1 a0a6e2b805497cb8ae9879674dd591e8bec90fa9 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11
 EBUILD openscap-0.8.0.ebuild 2482 RMD160 f5cfc2dbeedba684363c8f20e9483c1dbe90b625 SHA1 643c59e571efc6ccf069e79bdfaa472edc7233c0 SHA256 5de57427c774574ae719652f084ac072a6c4c0eb177025e8b56a7cd8540af9e5
-MISC ChangeLog 2444 RMD160 df4094ed6d6b1b09963d2bff2405fecb16c7164f SHA1 f73e92081f6e0935d585bba7ead782798851a61e SHA256 e9b11335ffbc45939d24ae60dbac8a4b2fafb9a98feba5973db4289b12a1ae0f
+EBUILD openscap-0.8.2.ebuild 3522 RMD160 e84b9941ef9d5eacdfcf391ecc80b9e0ae345105 SHA1 b3d552e8805a1f1b023bfee5029c98892f1fe436 SHA256 3cba73aa789f38ed97b700ed598172c06f2e771ce4c34d8846ff8d993dba0d2e
+MISC ChangeLog 2759 RMD160 58b4400a83accd450cb2d6f523c44229733a1020 SHA1 8a68705137c88f0bd4411b498b3077d4d06d7835 SHA256 e134dcf1f64516c56d1f71a3196fd2e45253556277ecccc007fbe3bcee37626f
 MISC metadata.xml 690 RMD160 70288627b4da157c34d478ef77a331037be21428 SHA1 c0950ee1c531d606fbfaabfb71d6c3dd71dc045b SHA256 c826790db1cf53df236c92afe8bfbf530a6352195aebe16036eaa58366abbeb5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPu/xwAAoJEPqDWhW0r/LCSCEP/jJHVsikJ0FbUjYo2GHE+Lm5
+fm+XZZYvlUgFBqgb9p/dcuS2+erMW0Kg3hXcGAXMpz0uVDZtInCHO+2TMaltDZRw
+1rTP+tgq2to44rQXSNZ24nahpglvptmKtodwuRr+GRKYgDwDH1mk6sBvXT2T0035
+tl1MVm9BFYk3X//b+7z7y5w60xxsXCDVvifLBQ4YdS0qFOUbik4fhRdSYsraeat1
+qg5vL26RzqLYx7M5u9ZpELCaYRtbpg80lhOIrxOQCmQXuneYyJO5eqWJYAylYlrB
+y8sUQcPu29Y4r3zQ4LHrnW1spmj09ZMadbfYBzApM3Re1Ym1TT8JjYBUE1guj1yf
+LZlJU5ZCLcuEPcgLt6O81JCAVBlUZuf+ZPuG7FhSS6pUujNv4oZbHVddP7haXLxy
+6xK9VHaPyW2E/3OnoO2mrs23owO2SEmGe2gTpzpIJcBWAIdQkXeT+iaw1gXIXsYc
+R0A1jZLMEE/bT/3MmpFZY2ecICy2lk5+MzH/H4HW+jD/yTFBpK4CRw0L6/3YaOGv
+uQAwEjJGuGxIThpHGQ26yBCivUp0v081hlbOadGFT2Hwmd4V0fyvpHjcgEx7ptpb
+9Hl8/XzQauQ/ZlYSUqf4G40U+j3/5Gu8edDQ53mFzlWnZT8gfVl/PgevBh6bJbpr
+ItPVcDFhT9t1NFbUBKSk
+=1d8m
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/files/test_probes_interface.patch b/app-forensics/openscap/files/test_probes_interface.patch
new file mode 100644
index 000000000000..672426d7ca76
--- /dev/null
+++ b/app-forensics/openscap/files/test_probes_interface.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..98ac75857d46
--- /dev/null
+++ b/app-forensics/openscap/files/test_probes_process.patch
@@ -0,0 +1,10 @@
+--- 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 -v '\[' | awk '$1 != 2 && $2 != 2 {print $3}' | \
+         sed -n '2,30p'`)
+ 
+ COUNTER=1
diff --git a/app-forensics/openscap/openscap-0.7.3.ebuild b/app-forensics/openscap/openscap-0.7.3.ebuild
deleted file mode 100644
index d43ac2b0d606..000000000000
--- a/app-forensics/openscap/openscap-0.7.3.ebuild
+++ /dev/null
@@ -1,70 +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.7.3.ebuild,v 1.4 2011/08/21 03:40:45 phajdan.jr Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion
-
-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 sql"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	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_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
-		rm -rf "${D}"/etc/bash_completion.d || die
-	fi
-}
diff --git a/app-forensics/openscap/openscap-0.7.4.ebuild b/app-forensics/openscap/openscap-0.7.4.ebuild
deleted file mode 100644
index 80cae5c67d67..000000000000
--- a/app-forensics/openscap/openscap-0.7.4.ebuild
+++ /dev/null
@@ -1,70 +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.7.4.ebuild,v 1.1 2011/08/19 18:23:13 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion
-
-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 sql"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	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_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
-		rm -rf "${D}"/etc/bash_completion.d || die
-	fi
-}
diff --git a/app-forensics/openscap/openscap-0.8.2.ebuild b/app-forensics/openscap/openscap-0.8.2.ebuild
new file mode 100644
index 000000000000..7bb3862d272f
--- /dev/null
+++ b/app-forensics/openscap/openscap-0.8.2.ebuild
@@ -0,0 +1,104 @@
+# 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 $
+
+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
+	#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
+	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
+}