Version bump. Bug #451694 thanks to clabbe.montjoie@gmail.com

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

7 files changed, 518 insertions, 11 deletions

diff --git a/app-forensics/ovaldi/ChangeLog b/app-forensics/ovaldi/ChangeLog
index ad4f177d881b..fe91d6aa5527 100644
--- a/app-forensics/ovaldi/ChangeLog
+++ b/app-forensics/ovaldi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/ovaldi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.3 2012/05/22 20:54:50 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.4 2013/01/30 18:53:05 hwoarang Exp $
+
+*ovaldi-5.10.1.4 (30 Jan 2013)
+
+  30 Jan 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/ovaldi-5.10.1.4-disable-selinux-probes.patch,
+  +files/ovaldi-5.10.1.4-strnicmp.patch, +files/ovaldi-5.10.1.4-xerces3.patch,
+  +ovaldi-5.10.1.4.ebuild, metadata.xml:
+  Version bump. Bug #451694 thanks to clabbe.montjoie@gmail.com
 
 *ovaldi-5.10.1.2 (22 May 2012)
 
@@ -24,4 +32,3 @@
   +files/rpmdb.patch, +files/use_local_rpmdb.patch, +metadata.xml:
   Initial commit. Moved from sunrise. Thanks to Anton Bolshakov for the
   original ebuild and LABBE Corentin for proxy-maintaining it. Bug #225065
-
diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 2f74799a52cf..2ccbe86dccd4 100644
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -1,17 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ovaldi-5.10.1.2-add-selinux-libs.patch 494 SHA256 7b2cc39e80170bb2418df7c98e3f46757f452f372f33b40adad8a3081a04bca8 SHA512 0c0c19b791d95c0117735539885529338e380881ec4ab49d19efad96726d65b7e54abce302d80847eccde97a285bb7fc9c1d67dbebd80b82c7063b142b2a1dbc WHIRLPOOL ad0ab14e3a2e2c391aacdd50632b08569e2ba12b0f2ab26a68810305f1d01fff8b9cb2aff2078bfb57714cf254818ea2d5f736ee337c53918aebc1561c12554d
 AUX ovaldi-5.10.1.2-disable-ldap-probes.patch 514 SHA256 fab78dc2e49a642337c85537199db797ebcc8d5dfe6bd2f977a7d3d43c2f646b SHA512 ad8874da919ce6f227ee9a1c3b1e4f25b43179440f0bd7f1adb60af6377a3953f59a4f0a11f9eafdb6bc7facee5d77f0ff55925ead8b6c7a72f367ab211a9e4b WHIRLPOOL 896aee7ecce5332a0388e2f84e15eb0550db8257d7a5119d093934e6f143b723c58785407eaa641029e8b9ddb2432a05dddafd1cec09d332e58faf3150f534fd
 AUX ovaldi-5.10.1.2-disable-selinux-probes.patch 3418 SHA256 0852abf008d39827dff195005df718233c122cfa86a47be27592ecbee1cb08fa SHA512 ce824c08a45c65721f8a4f8ef23074108710f8deaf08171a8a0204dd99af94b2f072fe07c68a10cae9dc7ec4fa5ef63227a631b389d0343ca05d006d76418315 WHIRLPOOL 2db1297f482568fe1642915f84ea906ef056181382d0cdef5d5baa116a92510471aff3d9b8dd2023fd6c4cb391e4285d221c3c43ddd9ff70065eb148d0226cd6
 AUX ovaldi-5.10.1.2-missing-memory-header.patch 703 SHA256 145ba83c3000de0204d6b892702b490c1c592c0f47b4c8d20138a53623abfc1f SHA512 6c414fff0b8d262bbaf8ee7325269fab1bc82b0c8fa1f13f15bb2dc9b91e732510d202d1fcc507aa9b923339c1feeabe49aebb6bef8c86336f6b704155d15af5 WHIRLPOOL 827a274d9ff13bead1e9a4d04e273d37db84753a9012f96943a4c65204e95da54da83ca54b6a3f4322c3b81892a882bafbd6977bc7d0d54eb6ffef2f9c7fc105
 AUX ovaldi-5.10.1.2-strnicmp.patch 292 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54 SHA512 498ce005a56cbe16377653a25da783e96fc7871cb114d19e3695579263403ecb3a917abe637965bc6ee62dd36e927ad564c83d253b3a6467651e9ad57f9bf1f1 WHIRLPOOL 9f6859f543749c45d98e5fbfbe45a7e5fa341e590a705afe2b7f477f76fa569e0b220b8f0af6d5fd2bdde0183a3f6ce8be93aca3ffe2bfee852da95ec9dcd556
 AUX ovaldi-5.10.1.2-xerces3.patch 13510 SHA256 7818b08cb2fe965b14a7732f26f36d4a2a67da70fdf050751b42834e95cac39e SHA512 0b95bc164fbf236c317a4c0d9057c8ba2085931d51eace7148a4de4983690dda9721c3accfad02950d7aac244562d208fb7d48210efd5135d33e4e762e2f3da3 WHIRLPOOL 95b2c5d2b806531c99aef415754152a9dedb5df0021fb1eaac6f94f3bbedf3cf17f4204d56b1a95bd406c701368399a866052232b4339a7179b8ec9560066b33
+AUX ovaldi-5.10.1.4-disable-selinux-probes.patch 3928 SHA256 5f473d56e7fb93b093b2e1b484d2b7b03ceea2b4e6014cd9a1ebc6a31aebd0f5 SHA512 e9d6f2bab3fd5d6fbb2b6bc6dc881bfb22c873c8856dc9da7c01d2992f74479177d82529df84b186da285aed8d943919b9bbbe59d7d1e0788c42351a3f895217 WHIRLPOOL fd74b7336132fc2296bb280c91428177847001beef8ed86005ac8be8da650a9f62e10164dc3dc7325a6535eb588e36dd5925d60503a7e922475927190b15cd82
+AUX ovaldi-5.10.1.4-strnicmp.patch 292 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54 SHA512 498ce005a56cbe16377653a25da783e96fc7871cb114d19e3695579263403ecb3a917abe637965bc6ee62dd36e927ad564c83d253b3a6467651e9ad57f9bf1f1 WHIRLPOOL 9f6859f543749c45d98e5fbfbe45a7e5fa341e590a705afe2b7f477f76fa569e0b220b8f0af6d5fd2bdde0183a3f6ce8be93aca3ffe2bfee852da95ec9dcd556
+AUX ovaldi-5.10.1.4-xerces3.patch 13354 SHA256 2ca9f980072333e320cdd5ffb55ccc78e033d1c98746292855439b56b8d42c7f SHA512 4f31d9b7fdbd31fb3228da1d3c637ff8a205395754fd9a27375a33b18d954bfb29b7365e7134e7ae8c93e867dba980f5a18255872d6c64e03f449b32349d2a99 WHIRLPOOL 271b28e3281ef027e41d649507d44c7d8c485de9d75a47c1447550b71a8d13f1dc5da5ded387200094fbbd743361d52635be210e01d5346036d1f844a5057629
 AUX ovaldi-5.9.1-disable-ldap-probes.patch 1237 SHA256 ca8846757488a75d434a4cc909a96de44cf4b8f6d8f7950c2938630668bbde6a SHA512 08b7c8768eaea0a4b0e96e1791609d8cfacc386fc821d0fa9e38e8d52c596d5eeb6d55eb0db619c9f441b4b4ef3e96e061a59f4c59320072dfc2aa869ac6bd6f WHIRLPOOL 4b026706c988a543f154e199f59a78bdf014e0e764df27db957d8a020f0fd3ecf56c88fff6d0332887ef4910e4e4775947c9e59f49d5ddeb81e2c640888c0e49
 AUX ovaldi-5.9.1-strnicmp.patch 292 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54 SHA512 498ce005a56cbe16377653a25da783e96fc7871cb114d19e3695579263403ecb3a917abe637965bc6ee62dd36e927ad564c83d253b3a6467651e9ad57f9bf1f1 WHIRLPOOL 9f6859f543749c45d98e5fbfbe45a7e5fa341e590a705afe2b7f477f76fa569e0b220b8f0af6d5fd2bdde0183a3f6ce8be93aca3ffe2bfee852da95ec9dcd556
 AUX ovaldi-5.9.1-xerces3.patch 12336 SHA256 70754174e4d390663b79b0dc070eba536d2868ce5b68aae1632e805a52b0e0f0 SHA512 40f75b885ac88b12cee7643f0a310f788c7c2109c3701ece5f2bb383ad7372599d03f4fbe125ae9cdf996786e1be9a525b5a209f60b6f25adc3b615aa44f6da3 WHIRLPOOL 30d8ed0611c2d46e8245a0281952f4de22eac3b7e80fe4a023262cfec8668d490356eb6a4f69d276113ed5488603a88ecf9af67345d02a95685e7f404c1d34a7
 AUX rpmdb.patch 2131 SHA256 d40775d272b8aed6062b983640cf4c0a330a9d318012b922099eeb04d4c1d131 SHA512 d802967812888ecd0db8fbf447c0ab1f6496409c1971fa3e36207c8be12fc99b9d61b0c7b312a5956dddddf15f50558f6cc36ee5f81fd1081579de9e3289f92c WHIRLPOOL f9af491f8df053337cf5fde99a983e1b03a275242195e0b839ddb824c74e93a8b37aca758c63f409af4857d2ea55ff34e99791fbc6061e4da01baccb218fee8a
 AUX use_local_rpmdb.patch 429 SHA256 e7956ab2c1de68b0c5284641a36136643aa5a6e12cfd8b6042f0484c1cba63cd SHA512 737dfccc3391e3bedc9fa284f5409dd481fd14f427f4aa9922e712dba2776db83d59b399ae77366bb75a37b8b04ae9cf81e7a2853fc463e4b6cc094609e92d97 WHIRLPOOL c3dae829cac66847140a5e5d8b6b84b9fa95b47544fabc6ecb1bef8077f536310f4b0335f7185b00afd70da0b1e4cb2f759afa26a7f66f9f72fc5c98a3e5493c
 DIST ovaldi-5.10.1.2-src.tar.bz2 14859172 SHA256 2d00a1bc730f6635beebd52611ee30c914169626ef5adf68ff313295c483d319 SHA512 77ffc04a8b33a43a9370b795e6af5e79e63ca59ec70c974408fffc163d487c654f153924494b14e1fc8b2ba2f33e96bc85e175fd8044e370a75a88f3f9c37fcb WHIRLPOOL 6c8e8da498c9f0c36be7a88a1293a984975e6fc90993fe6a860969af63cd8b9393e6adb4bf68893c6da468562322adb4b60a4894393bd7916047f900631f8296
+DIST ovaldi-5.10.1.4-src.tar.bz2 14868251 SHA256 92a22ad75ecdb02abb155e520cf249cc0f737c52b17380b1d58caf410f8c2560 SHA512 d7926a7416fe90013e203b333390e33d51c3eb0caa6ebba69dd593791a8377ac38f5db72fcff2d1ab2dd39a0f5d1b0d2a0d08f906d3e26740288532a27debb47 WHIRLPOOL b9e9142f3d51818c6fbdd12d036176a435bb7af4a75b39bd6bbaee9c542718f9058401ccdfb053a84bac97dfb9b5ba0acdbcf98c4085f6198ad51e94d6ea9d25
 DIST ovaldi-5.9.1-src.tar.bz2 14745625 SHA256 40161ac64fd221543a19f178de283919be2dd7f513a6fb354f1440fe1bfb98e1 SHA512 5ac3fb0b943aa6c650ae31131a41e059d2b338defe608b1a7b65ba776e249d005ccf4c3ff3ab64fb042a775c70467f4ca879de005f6bf78c19a4a0c782204d34 WHIRLPOOL d96fcf29bfbf301dde50e54a6d710db913520d7b0e47be8b17f2a202353f81eef94e2934d0aa84ca6ddd24dce8a0fdd9c4cfe6224f4757717c88317895ad12af
 EBUILD ovaldi-5.10.1.2.ebuild 2414 SHA256 a4cd65663769d4e699df17cd7a1945a3db0ac0c1b603e6ee59843ebf4041df44 SHA512 3270b5c004570e86b23fd3f797462387bf737869f0474d9076dc8f39c1c9f3fd1faadb5ae08b5a2290a8c195e25786513d7f1ac818bc0adb94e922b71acc859e WHIRLPOOL 0e3f8cec09d83c296abf7185ade3551dea97ef8175f2cc861c41b449784989316e5999aca9a394a52d8aeba68fe8ec6db787dd1446222cb3b1b49017b7ee5b48
+EBUILD ovaldi-5.10.1.4.ebuild 3428 SHA256 a7cb7fe7b560201e89a7c56aee550a56df171a1e60ff84abf4aff83e2509621c SHA512 1ed8e31dff13c3e9ca2b61c5825de19c94f8a57c726cc35497b0189803ba236ebd71ada79d4852b3afc24099098e8e4f5fa13f730a4231d73f35d15862837d28 WHIRLPOOL 29c7bf1e9d5ffafe30876953e552a343c34fa8996490a5de9e9bd886a4b3e117dc70d204f9f29b0b6f034f1ff0ae0e4dc77c637aad4c90ab44d5a169c61f73fb
 EBUILD ovaldi-5.9.1.ebuild 1862 SHA256 d4c7a6cdfe1957bf958a2d553bfdde2a8dfc6dede51286170506c39259dd6632 SHA512 7ca41476c17481658262694f4a8df82e319e0ec12c7281455c2478bef6e4e755c769e4927f27a6e90dbe924061090f7346fdd7f8f34eb7ae86281c4d5d7453fc WHIRLPOOL ad8f5e16f41bde59f4805e790902154b872301277c23362a64abc2be5a273f8e44b7e031f356b434453e17d7f15b433d805a3811d71734dad686590fc087d27a
-MISC ChangeLog 1238 SHA256 cb8c5d1f55a316326f476a13e7e0769ba893007787c20f4c31c3277483d849bd SHA512 4927fc25d5f4a908f0e70617ad44562b44574d20cdca8f525a197e2e7a184953957dae76858a7f5875cbe663dac9d9f87a65a6a2d0c680b51059f43a31fb4608 WHIRLPOOL a223d7d1e2e8daa04361031cb393018dab1eaafcbdcadd3de77752dde9a5babd0dac90693cff22f237b1496fa7c03b4b22c9dae1b57527fcc869c1052f572d19
-MISC metadata.xml 565 SHA256 635243ac3f5b09dc36bd19708ba4e43152189bf63f19579b2f4ea5937a8569e6 SHA512 45ee8487e5d1f27bdb992135f7597ca197c217196068f9638a01997ce89385e835f240fe6d9762e7687ce54585f966c3dddb7876a8576621d543adc470c9df11 WHIRLPOOL b21500b69c2317fe33c43d9cba0c87f936f72126ae16d6ce779556f38d8df381c127e9ae8b9a3b500745d79c76506f79aefbc36eaa6f18a4ddeff73a57c60ed0
+MISC ChangeLog 1562 SHA256 1597cd9c31cc2b8b3c819c2c81e4b2ad9d6f0332cc74616edc0c16144488f5ef SHA512 bb8630fa8c2c74ba803edd846341fcc08acf6aa9ba264d377393147f3861851f568342c500373e4abd8fbfe0c732ca2adf40c8630cbfbd50b4fb6ff1d93b4548 WHIRLPOOL f59ecc44f631cc76340adfb6593ef4b4e84b11be52711b52d018e665dae045866431e54311b525ab08989dd9fc332368881a20a19d436c00ef78160e4b740802
+MISC metadata.xml 405 SHA256 67a89bb288b14af8da718917c178f80d34981812dc96755d33bf9a01e8056e58 SHA512 3c94f548cda20ae83f4107e81f1d8f51c12abfa5b8522d19898315256328927bd1b49129ecd48aa72bd07dc198a8c044e080da15fcb892c6c5eeaabb86a20b62 WHIRLPOOL 0a5febc0bc6e7a51ec9da457474ebf09eedc92fae9a05755ca2dbbff8b0ee259e8db4d201f9b0467d4dc9c8f0ffe2136a0fd6b6f9092b3594d2163e66b2971f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRCWwQAAoJEPqDWhW0r/LCtGQQAKXL0KDxOFSDamjGIsy08J19
+Nymp0h69A/8YL6zB/scWuVnGKEjMj/E92bC9ToHYVG5tisDYBpmTetSqqbhgISPC
+FYfB/qs8HWxbNrWvfDnlOw98o+IH1Jog4vNl9yPYjjuYaYlqlD355vekjzc6MeYF
+J4RKw+24J3TV767DH1a2UgF5/GLEceLYurnPwlzjs5glodJSZ0+zR578Jmoyv6Dj
+GABLQneymbkA+QBMxNQBhOBtb1QtMdND+HK1TdN5EExoKbpXkL99ie5frCIKCiwb
+/975l0kSnVKQL7+nsxu9zKmwUIHneNnf6e2neapOjav6xk9tr6E2/DAAyELQiBQm
+XIrperd14wdQ2GtY5zx5uPkJ9EBpsWgD/dquEAdfBC3rXCFzrDhycgqPg9xDfKRD
+u3Jf87Tbt61Q2971Fos9S4p97UmBrupz/p+nh5lDlKl16+46/t21Xu71bJ6SnCHA
+XImGx3p/CZS/5vAodueSkqQ/160JTDHSMN6g8GGu3kcJ28XbmcxHijn8ZtytTVTi
+ksydoMiD935sHGAdCKiWDtKhTcMqdFmYSdB4Pfiw3NCeXkMAzWAsGqiTEa2MUxrh
+2NHH4RYGGkTiAL5INxAotQWoCU+lOrsw3F7ODBxwwUoX/gNlOqJioQTO5heablce
+wO0L77R/mxUHSeO9IFlp
+=tL62
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch
new file mode 100644
index 000000000000..b9d02d763c61
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch
@@ -0,0 +1,84 @@
+--- src/probes/unix/Process58Probe.cpp.old	2013-01-14 16:05:18.000000000 +0100
++++ src/probes/unix/Process58Probe.cpp	2013-01-14 16:06:16.000000000 +0100
+@@ -29,8 +29,8 @@
+ //****************************************************************************************//

+ 

+ #ifdef LINUX

+-#  include <selinux/selinux.h>

+-#  include <selinux/context.h>

++/*#  include <selinux/selinux.h>

++#  include <selinux/context.h>*/

+ #  include <sys/capability.h>

+ #  include <SecurityContextGuard.h>

+ #endif

+@@ -328,7 +328,7 @@
+ 	pid_t sessionId;

+ 	uid_t loginuid;

+ 	uint64_t effCap, *effCapp=&effCap;

+-	string selinuxDomainLabel;

++/*	string selinuxDomainLabel;*/

+ 

+ 	Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;

+ 

+@@ -423,10 +423,10 @@
+ 	}

+ 

+ 	// this one doesn't require reading anything in /proc

+-	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {

++/*	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {

+ 		item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));

+ 		item->SetStatus(OvalEnum::STATUS_ERROR);

+-	}

++	}*/

+ 

+ 	// The Linux start time is represented as the number of jiffies (1/100 sec)

+ 	// that the application was started after the last system reboot.  To get an

+@@ -522,10 +522,10 @@
+ 		// aren't any.

+ 		item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_ERROR));

+ 

+-	if (selinuxDomainLabel.empty())

++/*	if (selinuxDomainLabel.empty())

+ 		item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_ERROR));

+ 	else

+-		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));

++		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/

+ 

+ 	if (statStatus == PROC_OK)

+ 		item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));

+@@ -740,7 +740,7 @@
+ 											   capMap[capEnum]));

+ 	}

+ }

+-

++/*

+ bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {

+ 	security_context_t sctx;

+ 	int ec = getpidcon(pid, &sctx);

+@@ -763,7 +763,7 @@
+ 	*label = tmp;

+ 	return true;

+ }

+-

++*/

+ #elif defined SUNOS

+ 

+ void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {

+@@ -830,7 +830,7 @@
+ 	item->AppendElement(new ItemEntity("exec_shield", "", OvalEnum::DATATYPE_BOOLEAN, OvalEnum::STATUS_NOT_COLLECTED));

+ 	item->AppendElement(new ItemEntity("loginuid", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

+  	item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

+- 	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

++/* 	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));*/

+ 	item->AppendElement(new ItemEntity("session_id", Common::ToString(info.pr_sid), OvalEnum::DATATYPE_INTEGER));

+ 

+ 	items->push_back(item);

+@@ -988,7 +988,7 @@
+ 	item->AppendElement(new ItemEntity("exec_shield", "", OvalEnum::DATATYPE_BOOLEAN, OvalEnum::STATUS_NOT_COLLECTED));

+ 	item->AppendElement(new ItemEntity("loginuid", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

+ 	item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

+-	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

++/*	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));*/

+ 	item->AppendElement(new ItemEntity("session_id", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

+     

+     items->push_back(item);

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch
new file mode 100644
index 000000000000..fc127efd3cdb
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch
@@ -0,0 +1,11 @@
+--- src/Main.h.old	2010-10-22 14:59:13.000000000 +0200
++++ src/Main.h	2010-10-22 14:59:38.000000000 +0200
+@@ -38,7 +38,7 @@
+ #endif

+ 

+ #ifdef LINUX

+-#  define STRNICMP strnicmp

++#  define STRNICMP strncasecmp

+ #elif defined SUNOS

+ #  define STRNICMP strncasecmp

+ #elif defined DARWIN

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch
new file mode 100644
index 000000000000..9350029312c4
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch
@@ -0,0 +1,283 @@
+--- src/XmlProcessor.h.old	2011-08-18 14:35:41.608703233 +0200
++++ src/XmlProcessor.h	2011-08-18 14:39:21.835597094 +0200
+@@ -38,14 +38,17 @@
+ #include <string>

+ 

+ //	required xerces	includes

+-#include <xercesc/dom/DOMBuilder.hpp>

+ #include <xercesc/dom/DOMDocument.hpp>

+ #include <xercesc/dom/DOMErrorHandler.hpp>

+ #include <xercesc/dom/DOMError.hpp>

+ 

+ // for entity resolver

+-#include <xercesc/dom/DOMEntityResolver.hpp>

+-#include <xercesc/dom/DOMInputSource.hpp>

++

++#include <xercesc/dom/DOMImplementationRegistry.hpp>

++#include <xercesc/dom/DOMLSParser.hpp>

++#include <xercesc/sax/EntityResolver.hpp>

++#include <xercesc/sax/InputSource.hpp>

++#include <xercesc/sax2/SAX2XMLReader.hpp>

+ 

+ #include "Exception.h"

+ 

+@@ -53,12 +56,14 @@
+ 	This class extends the default DOMEntityResolver and implments the resolve entity method 

+ 	to support 

+ */

+-class DataDirResolver : public xercesc::DOMEntityResolver {

++class DataDirResolver : public xercesc::EntityResolver {

+ public:

+ 	/**

+      *     

+ 	*/

+-	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);

++//	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
++	xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
++	xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+ };

+ 

+ /**

+@@ -144,7 +149,7 @@
+ 	 * owns the documents it builds.  Users must manually destroy

+ 	 * those documents.

+ 	 */

+-	xercesc::DOMBuilder *parserWithCallerAdoption;

++	xercesc::DOMLSParser *parserWithCallerAdoption;

+ 

+ 	/**

+ 	 * This parser doesn't have user-adoption switched on, so it

+@@ -156,7 +161,7 @@
+ 	 * appear to ever be switched off.  So to make sure this isn't

+ 	 * leaking memory, I have created separate parsers.

+ 	 */

+-	xercesc::DOMBuilder *parser;

++	xercesc::DOMLSParser *parser;

+ 

+ 	/** The entity resolver for both parsers. */

+ 	DataDirResolver resolver;

+--- src/probes/independent/XmlFileContentProbe.cpp.old	2010-10-22 14:49:22.000000000 +0200
++++ src/probes/independent/XmlFileContentProbe.cpp	2010-10-22 14:51:39.000000000 +0200
+@@ -419,12 +419,24 @@
+     return new DummyEntityResolver::DoNothingBinInputStream();

+ }

+ 

++#if XERCES_VERSION_MAJOR < 3

+ unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const

++#else

++const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const

++{

++    return NULL;

++}

++XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const

++#endif

+ {

+     return 0;

+ }

+ 

++#if XERCES_VERSION_MAJOR < 3

+ unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)

++#else

++XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)

++#endif

+ {

+     return 0;

+ }

+--- src/probes/independent/XmlFileContentProbe.h.old	2010-10-22 14:55:47.000000000 +0200
++++ src/probes/independent/XmlFileContentProbe.h	2010-10-22 14:57:00.000000000 +0200
+@@ -134,8 +134,14 @@
+     class DoNothingBinInputStream : public BinInputStream

+     {

+     public:

++#if XERCES_VERSION_MAJOR < 3

+         virtual unsigned int curPos() const;

+         virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);

++#else

++	virtual XMLFilePos curPos() const;

++	virtual const XMLCh* getContentType() const;

++	virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);

++#endif

+     };

+ };

+ 

+--- src/XmlCommon.cpp.old
++++ src/XmlCommon.cpp
+@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
+ string XmlCommon::GetNamespace(DOMElement *element) {

+ 

+ 	string xmlns = "";

++#if XERCES_VERSION_MAJOR < 3

+ 	xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());

++#else

++	xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());

++#endif

+ 	if (xmlns.compare("") == 0) {

+ 		xmlns = "";

+ 	}

+--- src/XmlProcessor.cpp.old	2013-01-14 15:16:14.000000000 +0100
++++ src/XmlProcessor.cpp	2013-01-14 15:19:20.000000000 +0100
+@@ -35,7 +35,6 @@
+ // for dom Writer

+ #include <xercesc/dom/DOMImplementation.hpp>

+ #include <xercesc/dom/DOMImplementationLS.hpp>

+-#include <xercesc/dom/DOMWriter.hpp>

+ #include <xercesc/framework/StdOutFormatTarget.hpp>

+ #include <xercesc/framework/LocalFileFormatTarget.hpp>

+ #include <xercesc/util/XMLUni.hpp>

+@@ -50,11 +49,26 @@
+ using namespace std;

+ using namespace xercesc;

+ 

++#if XERCES_VERSION_MAJOR < 3

++#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)

++#else

++#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)

++#endif

++

+ //****************************************************************************************//

+ //			DataDirResolver Class                                   					  //	

+ //****************************************************************************************//

+-

++#if XERCES_VERSION_MAJOR < 3

+ DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {

++#else

++InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)

++{

++	return NULL;

++	//return DataDirResolver::resolveEntity (publicId, systemId, NULL);

++}

++

++DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {

++#endif

+ 	string path = "";

+ 	size_t last;

+ 	string schemapath = Common::GetSchemaPath();

+@@ -127,7 +141,7 @@
+ 		parserWithCallerAdoption = makeParser(schemaLocation);

+ 		// add one extra feature on this parser to prevent it from

+ 		// taking ownership of its documents.

+-		parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);

++		SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);

+ 

+     } catch (const XMLException& toCatch) {

+         string errMsg = "Error:  An error occured durring initialization of the xml utilities:\n";

+@@ -156,32 +170,40 @@
+ 	XMLPlatformUtils::Terminate();

+ }

+ 

+-DOMBuilder *XmlProcessor::makeParser(const string &schemaLocation) {

++DOMLSParser *XmlProcessor::makeParser(const string &schemaLocation) {

+     // Instantiate the DOM parser.

+ 	static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };

+ 	DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);

+ 

+-	DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

++#if XERCES_VERSION_MAJOR < 3

++	DOMLSParser *parser = ((DOMImplementationLS*)impl)->createDOMLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

++#else

++	DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

++#endif

+ 

+ 	///////////////////////////////////////////////////////

+ 	//	Set features on the builder

+ 	///////////////////////////////////////////////////////

+ 

+-	parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 

+-	parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  

+-	parser->setFeature(XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing

+-	parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.  

+-	parser->setFeature(XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.

+-	parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  

+-	parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  

+-	parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.

++	SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 

++	SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  

++	SetParameter(parser, XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing

++	SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.  

++	SetParameter(parser, XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.

++	SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  

++	SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  

++	SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.

+ 

+ 	///////////////////////////////////////////////////////

+ //****************************************************************************************//

+ //			The following code was added to handle air-gap operation					  //	

+ //****************************************************************************************//

+ 	/* Look for XML schemas in local directory instead of Internet */

++#if XERCES_VERSION_MAJOR < 3

+ 	parser->setEntityResolver (&resolver);

++#else

++	parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);

++#endif

+ //****************************************************************************************//

+ //			End of air-gap code															  //	

+ //****************************************************************************************//

+@@ -189,7 +211,11 @@
+ 	///////////////////////////////////////////////////////

+ 	//	Add an Error Handler

+ 	///////////////////////////////////////////////////////

++#if XERCES_VERSION_MAJOR < 3

+ 	parser->setErrorHandler(&errHandler);

++#else

++	parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);

++#endif

+ 

+ 	// Fix a schema location if possible, so instance documents don't

+ 	// have to set the schemaLocation attribute.  And if they do, this

+@@ -197,7 +223,7 @@
+ 	// overriding of the value in instance documents.

+ 	if (!schemaLocation.empty()) {

+ 		XMLCh *schemaLocationCstr = XMLString::transcode(schemaLocation.c_str());

+-		parser->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation, schemaLocationCstr);

++		SetParameter(parser, XMLUni::fgXercesSchemaExternalSchemaLocation, schemaLocationCstr);

+ 		XMLString::release(&schemaLocationCstr);

+ 	}

+ 

+@@ -279,23 +305,19 @@
+ 		XMLCh tempStr[100];

+ 		XMLString::transcode("LS", tempStr, 99);

+ 		DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);

++#if XERCES_VERSION_MAJOR < 3

+ 		DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();

++#else

++		DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();

++#endif

+ 

+-		// set feature if the serializer supports the feature/mode

+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))

+-			theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);

+ 

+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))

+-			theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);

+-

+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))

+-			theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);

+-

+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))

+-			theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);

+-

+-		//if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))

+-		//	theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);

++		// set feature if the serializer supports the feature/mode

++		SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);

++		SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);

++		SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);

++		SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);

++		//SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);

+ 

+ 		//

+ 		// Plug in a format target to receive the resultant

+@@ -313,7 +335,13 @@
+ 		//

+ 		// do the serialization through DOMWriter::writeNode();

+ 		//

++#if XERCES_VERSION_MAJOR < 3

+ 		theSerializer->writeNode(myFormTarget, *doc);

++#else

++		DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();

++		output->setByteStream(myFormTarget);

++		theSerializer->write(doc, output);

++#endif

+ 

+ 		theSerializer->release();

+ 		delete myFormTarget;

diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml
index a89b9c05336f..31f959c293de 100644
--- a/app-forensics/ovaldi/metadata.xml
+++ b/app-forensics/ovaldi/metadata.xml
@@ -3,12 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-	<maintainer>
-		<email>corentin.labbe@geomatys.fr</email>
+		<email>clabbe.montjoie@gmail.com</email>
 		<name>LABBE Corentin</name>
 		<description>Upstream and Maintainer. Assign bugs to him</description>
 	</maintainer>
diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
new file mode 100644
index 000000000000..c143ea85a638
--- /dev/null
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild,v 1.1 2013/01/30 18:53:05 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Free implementation of OVAL"
+HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl ldap rpm selinux"
+
+RDEPEND="dev-libs/libgcrypt
+	dev-libs/libpcre
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	sys-apps/util-linux
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	ldap? ( net-nds/openldap )
+	rpm? ( app-arch/rpm )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+S="${WORKDIR}/${P}-src"
+
+src_prepare() {
+	#Ovaldi do not support xerces 3, but portage have only that
+	epatch "${FILESDIR}"/${P}-xerces3.patch
+	sed -i 's,xercesc::DOMBuilder,xercesc::DOMLSParser,' src/XmlProcessor.h || die
+	sed -i 's,DOMBuilder,DOMLSParser,' src/XmlProcessor.cpp || die
+
+	epatch "${FILESDIR}"/${P}-strnicmp.patch
+
+	if ! use ldap ; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,.*ldap,//&,' src/linux/ProbeFactory.cpp || die
+		sed -i 's,.*LDAP,//&,' src/linux/ProbeFactory.cpp || die
+		sed -i 's/-lldap//' project/linux/Makefile || die
+		sed -i 's/-llber//' project/linux/Makefile || die
+		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
+		rm src/probes/independent/LDAPProbe.{cpp,h} || die
+	fi
+
+	if ! use acl ; then
+		sed -i 's,.*libacl,//&,' src/probes/unix/FileProbe.h || die
+		epatch "${FILESDIR}"/disable-acl.patch
+		sed -i 's, -lacl , ,' project/linux/Makefile || die
+	fi
+
+	# rpm probes support is build dependant only on the presence of the rpm binary
+	if use rpm ; then
+		#Same problems as bug 274679, so i do a local copy of the header and patch it
+		cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
+		epatch "${FILESDIR}"/use_local_rpmdb.patch
+		epatch "${FILESDIR}"/rpmdb.patch
+	else
+		einfo "Disabling rpm probes"
+		sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
+	fi
+	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
+	einfo "Disabling dpkg probes"
+	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
+
+	#Disabling SELinux support
+	if ! use selinux ; then
+		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
+		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
+		rm src/probes/linux/SelinuxBooleanProbe.h || die
+		epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
+		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.cpp || die
+		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.cpp || die
+		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.h || die
+		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.h || die
+		sed -i 's,.*SecurityContextGuard.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
+		rm src/linux/SecurityContextGuard.h || die
+		sed -i 's, -lselinux,,' project/linux/Makefile || die
+	fi
+	# respect CXXFLAGS and CXX
+	sed -i -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' project/linux/Makefile || die
+	tc-export CXX
+}
+
+src_compile () {
+	emake -C project/linux
+}
+
+src_install () {
+	# no make install in Makefile
+	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh
+	dodir /var/log/${PN}
+	insinto /usr/share/${PN}
+	doins xml/*
+	dodoc docs/{README.txt,version.txt}
+	doman docs/ovaldi.1
+}