Bump

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

3 files changed, 148 insertions, 24 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 5e8b161df3c5..46da7473c087 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-forensics/openscap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.34 2015/04/23 20:53:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.35 2015/07/10 04:25:16 patrick Exp $
+
+*openscap-1.2.5 (10 Jul 2015)
+
+  10 Jul 2015; Patrick Lauer <patrick@gentoo.org> +openscap-1.2.5.ebuild:
+  Bump
 
 *openscap-1.2.1 (23 Apr 2015)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index 636e7d8c2e78..37dba5275366 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,33 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST openscap-1.0.8.tar.gz 13576237 SHA256 5dc420eaf4202d09619abd9f6247ab6db4f7d520a69c27984ba53fcaf1e31b9e SHA512 58fcc90198f82572505fd907351edc9d9609bc036c0cd1c0ab433056eea70a0baf362c811ab7990b8766ef6090a2a0a600803a9c3537d1867c56304d91fe20ff WHIRLPOOL b9d55acf06413db7953ed1d6200856bce6c787d9eda31e76375da43bf886d9b025bc59368f5824e3c6431a4697095a61dc7f6f8a87cd888a774344f86b2a9e9d
 DIST openscap-1.1.1.tar.gz 13722034 SHA256 510489099242f655bdff9f8f6641692ed0d035bf05f00f4ed8072b2e028aaf99 SHA512 86cd695098a749fb0ef29233a7bafde6d76379fd891cfc0bcc90e222e228a6968d3a2755a71a0115ed208408ee2f8316fbaf9714de9e3bb0c6a6535407a043b9 WHIRLPOOL e28464332f8e78519519766ef9e1cba509d54cc78cf2e23b1de043d9d68ff641426496b25a02a0da5c363ebd5470af705772b7ad81abad7308eaef8d89e9f568
 DIST openscap-1.2.0.tar.gz 14308605 SHA256 88329ebf23e7c7d063cdb5615fe1f68b18fb436a0df81307c5acc3b5963d7cec SHA512 1c290e0c20382c45da7d1c12ae69d33a71c04b34db39843805401b74f6bc392b10e2b401e0e8f4a62deef19d99254eadcc3b9702c2d5c12967ca9616f02cf2ed WHIRLPOOL 8ae5791dbfd5e4602f8deab12ae28bd93ed1d96f20314a968fb26d925382169e3a9cbf550f14c6c6c24ca86b0cd2268e3ebd713da3b8dad2f5cd55a403d74564
 DIST openscap-1.2.1.tar.gz 14338019 SHA256 6f7fdc579c4c27554cc3ec99a4f16381b719faa8c9b3ea09575d872a2c46eedb SHA512 e5bafe18708c76f223ec69a22da0b06b68546fd3eb9b370784ebff984308b60d02c89d6af24eefea87d16764fee760b70b5bf9eab2e88e7285e8f0d1d60232c9 WHIRLPOOL acd6cd094cf90ed1d9c7270104186ddebfed17ff0480b137653ee8e644aa031985960ad072c7b9d3880d8461ecfd6855cc842cba7665befdb9751c639538646c
+DIST openscap-1.2.5.tar.gz 14513153 SHA256 7e0c56c108ff3042fd6a6650a808553de15e4dfc7ccc9fcdd6a839de827c47ed SHA512 abeafafeaedd60ca08b52b981f83d458bc972894fc466d7cff29170b578a023f314bd330d7c812d838e09cad567ddc5daafa7e46e4b9a0db76451114d98d17ca WHIRLPOOL 703c6467aa19384f6c50bf0cb465ad2a21c724892e8d7db1f1439992dff939933ff4c48d049bddfddd97599618aee0b27c51596e2f84778707257092273897db
 EBUILD openscap-1.0.8-r1.ebuild 4402 SHA256 e87916e77bbcd28f6365b853ad7c2175dd0b8fb37608dfd9c056dfc529e331a2 SHA512 d096065a9ec982b83f8fee444a864e87a3ab6585f31afe826e5a3287903499cd2c491c8013b83ca6fea3c331653fc97d505d6c6ec478ce8b7c17e7e25b310891 WHIRLPOOL 2cc2bd309770c2e29d026945be2d5bce4b7ba5db1fac2e5effe12660031dc29b9c4adda1bfff1c8c6910daf5bf9648edb2b00c01b97eb90bf06caa8f576fd221
 EBUILD openscap-1.1.1.ebuild 4399 SHA256 5750f55824f3940e6f4b60b6a29146b3f832716a16c86898855b51b14b1035e2 SHA512 f267ecce58a633f07765e5bb0b1087a3314780ed0efd7f85dbdc2dafabe4a58f4abb104645881d434ec566e352c18fea23b9755071d16b0eb863633793d6ee0d WHIRLPOOL 8d4eb125dfc236150deddaf206a809d08852b7556f8f05bd1444c4a1d3bea92c9ec6ded1508e267714527f92f9906518b593910899790315560652ea6e4403fb
 EBUILD openscap-1.2.0.ebuild 4399 SHA256 f03851dc0b1fbe3c9943e785f182d298632eba4a38fd542918a5d0b2d701f5ff SHA512 4252df3bcac735137d0bb9b7bddc4554472049c8887098fd53fa4ee7e9c6e85d5c0387bc6d483e92f08920c311bef715f84384bc68b86dd1b35097c622734b16 WHIRLPOOL f262712a11b18f2d4da9874f44a663d8ab59d7e30c2f8a8c53924e95a1fcded35b35b2b33876379a5673de4192621f24f2d854c4cc385a043ac1fe2a452a3d6e
 EBUILD openscap-1.2.1.ebuild 4400 SHA256 c7b456237b68a5ad1e75b5aaca23182432b5f6f8e472b0fcb8f3d69d9926388b SHA512 05e729647d32b7cfe27597e55804ef930a557334d33b9a9821fd99156e20417aa9bf68d0331a50fff7d3aeb0c866779b99f83f52bdf2b268815877c65ca9a1b9 WHIRLPOOL 932c49bb241a9adbf7153b28de659133aa5d7bf06aa5d01eb8ad2bb19094482dd24dc18bacf3535398475bb6a28980aba1a0587a2e10acb3d98ca1ed2c2cb7db
+EBUILD openscap-1.2.5.ebuild 4399 SHA256 3272d66fa17da473423860d43232819cb7e3f51110460c59d506f8478cee7b09 SHA512 8f97d93b844b9ce04c1c2bd212dda77f874fa82c2e21c29338602cf7e61368cbc97db01d0a67bd9647af64f0ae320e848c9d0967eb821844a4d7f2ff5090af45 WHIRLPOOL 42b8c6f4474f1d1b51f6222e9a78ecedd1f56b8c4aed876dada2b4204d9d1849b3150fa23fdfe7aa94d82a02ec46d4364b6f6db3b0c2e71b89f7a940fba3db06
 EBUILD openscap-9999.ebuild 4715 SHA256 acbb9f07057769967013395b6119ef877bcd046a48e9b271fa85e12bae320de1 SHA512 5e34d6bba17b81c7237a69de4f9b909a05fe0c2ba78253a2ba4f0ceb9a3c1ea886dbaee08adbb158a966bfdd9d64bf86fdcf2518e0decaaa523b850e24d876ee WHIRLPOOL 91f1cce3fd46451efa634b612ae6f43d734c093afe6b2c37edb0282e165758e1eb50725662c48d21bcb832166fe781d2aa11422c231dac649e065ec29b25c2d1
-MISC ChangeLog 6824 SHA256 a327559a3fa328f4a2ed59b5c76d5f5eb2ee8078e5941b45659fa4cb4e5ffced SHA512 221239377d38d21529f69c2e9ee4ab09446aa299267f873c8d776376312f4ade42815ad8e10d903f30742bae9273b016457d6a8a8b3d46cfbb3272772e680b3e WHIRLPOOL 245c74cf68a539d1874e3b6152ae58131b55cfe7f757c84821a9b27e4ef3026cbc7721a782a6e46d8c4eb5f132600fc24a2a4c1bc15c5f5ae7b12c93f43c7541
+MISC ChangeLog 6936 SHA256 c9e46a16a9ee91920b327cb29206828f76bd452cc37a6e4eefce61cb3db2550e SHA512 6e5a04d108605a94c3e27b2825afcec8bd3c44f6aab96c17229028d554b0e942c386656bcb1bfe7e2aa53b02ecbd347fb9da6d35f7d6f556f3af9142352cce1e WHIRLPOOL c912d58c9da17d975b5925fb683511ffc7f744f0ca1ef829c9a4e3c14756485cedd657764fcd07d9eadb678a8d693059d24b4b3c216b74e2f65e56fab707bf6e
 MISC metadata.xml 679 SHA256 8db139f8e51200a7422a764af7fee8bf530d69262af1e0de9ed30512f9492cb7 SHA512 2c7c81d31042b64673a01dae7e4a24df139f3bc066ecb7af73b91a60d22f8d8ee9f448bf31ec9d1ac26a41bc66e467855a61fe56e35fe7c7e06bd89fbb83b971 WHIRLPOOL c8a2efbe37a7d02161f49b29dc3b4bc823887d31cffe0d54baeb5b10cdc882bb0b3a03d45d286ed8176e96d63cd8f1022671833bb6abbb55dccb9009098a9392
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVOVvUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88OqEP/0e7B/thH0OpPlFmr9o0vAEf
-PRSJPFhfqAZ11chzQcqpeVCekzuvH1VnlXY9jERZZe+bM4afBdABVnZ2hI+5mrci
-0+1GKOu6YlOfIQ+rL8AXe5tlT+JcKZuQUiouZxs4l65413NGzVRb/BGmrKonLJxZ
-vgpMI8qy5LJpzD6O8RWYaZq/w9ok7MA30nLYzn2sjZEdzhilP4OulIo3BnIMr7Ft
-edbtIMDlQFrQTcTxX+g4xi/ttaX8uyjSXQXmM3rZsm3K7ujUXUKJn8ckJbtt1CW7
-ZvcLG30BK1ja93ApF9ezZblE7PZ9BdpKKfRuP059pmymGn49pLNYTbdlJRNLY8tO
-M1vKGm7qhZj7Za50elMD415ii1jiIZzVhKZzK81bwI+kF4PA3vZ/y0X58/bsGGI7
-UiTqDVa6BhSGgFtyPAN3+ulGhyFr0lNDTV0F+yfpnKiKbqAQ+SSZRdfZkSfa+mVP
-tpo5UiDGManTbjAHjqlO3wlWbQLCvXUTMRzE5O8Nmuo/yh4Anu1aB8sQTq7YPple
-Hn78xLqYbP2boriWGna2zRuad1bJ6dsBF8h9mo/nyCvADA8ladAaKOPe1EaiD0Hg
-m3uwMfw5/3u0fT7nPucI7fLlXHbCVmWYPNFdjIXhwzTGEHe/g7fNEKT+iYKT9i2H
-kEfzLw2YqvAwcH5mpaml
-=EskD
------END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/openscap-1.2.5.ebuild b/app-forensics/openscap/openscap-1.2.5.ebuild
new file mode 100644
index 000000000000..625e553f2c64
--- /dev/null
+++ b/app-forensics/openscap/openscap-1.2.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.2.5.ebuild,v 1.1 2015/07/10 04:25:16 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 eutils multilib python-single-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="acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
+RESTRICT="test"
+
+RDEPEND="!nss? ( dev-libs/libgcrypt:0 )
+	nss? ( dev-libs/nss )
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	gconf? ( gnome-base/gconf )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+	rpm? ( >=app-arch/rpm-4.9 )
+	sql? ( dev-db/opendbx )
+	xattr? ( sys-apps/attr )
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-misc/curl
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	test? (
+		app-arch/unzip
+		dev-perl/XML-XPath
+		net-misc/ipcalc
+		sys-apps/grep )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+#	uncoment for debugging test
+#	sed -i 's,set -e,&;set -x,'	tests/API/XCCDF/unittests/test_remediate_simple.sh || die
+#	sed -i 's,^    bash,    LC_ALL=C bash,'	tests/probes/process/test_probes_process.sh || die
+
+	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() {
+	python_setup
+	local myconf
+	if use debug ; then
+		myconf+=" --enable-debug"
+	fi
+	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
+	if use sce ; then
+		myconf+=" --enable-sce"
+	else
+		myconf+=" --enable-sce=no"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		cd docs && doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	prune_libtool_files --all
+	if use doc ; then
+		dohtml -r docs/html/.
+		dodoc docs/examples/.
+	fi
+	dobashcomp "${D}"/etc/bash_completion.d/oscap
+	rm -rf "${D}"/etc/bash_completion.d || die
+}