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

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

8 files changed, 544 insertions, 2 deletions

diff --git a/app-forensics/ovaldi/ChangeLog b/app-forensics/ovaldi/ChangeLog
index 1bfdec143eaf..ad4f177d881b 100644
--- a/app-forensics/ovaldi/ChangeLog
+++ b/app-forensics/ovaldi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-forensics/ovaldi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.2 2011/08/24 13:43:02 hwoarang Exp $
+# 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 $
+
+*ovaldi-5.10.1.2 (22 May 2012)
+
+  22 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/ovaldi-5.10.1.2-add-selinux-libs.patch,
+  +files/ovaldi-5.10.1.2-disable-ldap-probes.patch,
+  +files/ovaldi-5.10.1.2-disable-selinux-probes.patch,
+  +files/ovaldi-5.10.1.2-missing-memory-header.patch,
+  +files/ovaldi-5.10.1.2-strnicmp.patch, +files/ovaldi-5.10.1.2-xerces3.patch,
+  +ovaldi-5.10.1.2.ebuild:
+  Version bump thanks to LABBE Corentin <corentin.labbe@geomatys.fr>
 
   24 Aug 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Assign package to proxy-maintainers team
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-add-selinux-libs.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-add-selinux-libs.patch
new file mode 100644
index 000000000000..d390be2ed6ce
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-add-selinux-libs.patch
@@ -0,0 +1,11 @@
+--- project/linux/Makefile.orig	2012-01-02 12:08:20.400871287 +0100
++++ project/linux/Makefile	2012-01-02 12:08:48.966488826 +0100
+@@ -50,7 +50,7 @@
+ LIBDIR = -L/usr/local/lib -L/usr/lib

+ 

+ # What libraries do we need?

+-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt  -lblkid

++LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt  -lblkid -lsepol -lselinux

+ 

+ # Determine what package management system is being used 

+ #PACKAGE_RPM  = $(shell /usr/bin/env rpm  --version 2>/dev/null)

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-ldap-probes.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-ldap-probes.patch
new file mode 100644
index 000000000000..1a15ca25d62f
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-ldap-probes.patch
@@ -0,0 +1,11 @@
+--- src/linux/ProbeFactory.cpp	2010-12-10 13:37:00.019140703 +0100
++++ src/linux/ProbeFactory.cpp	2010-08-27 21:23:41.000000000 +0200
+@@ -61,8 +61,6 @@
+ 		probe = XmlFileContentProbe::Instance();

+ 	} else if(objectName.compare("textfilecontent54_object") == 0) {

+ 		probe = TextFileContent54Probe::Instance();

+-	} else if(objectName.compare("ldap_object") == 0) {

+-		probe = LDAPProbe::Instance();

+ 

+ // here are the objects defined in the unix schema

+ 	} else if(objectName.compare("file_object") == 0) {

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-selinux-probes.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-selinux-probes.patch
new file mode 100644
index 000000000000..f93304deb1b3
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-selinux-probes.patch
@@ -0,0 +1,94 @@
+--- ./src/linux/ProbeFactory.cpp.old	2011-08-18 14:45:11.314556346 +0200
++++ ./src/linux/ProbeFactory.cpp	2011-08-18 14:45:23.151011753 +0200
+@@ -101,10 +101,6 @@
+ #endif

+ 	} else if (objectName.compare("partition_object") == 0) {

+ 		probe = PartitionProbe::Instance();

+-	} else if (objectName.compare("selinuxsecuritycontext_object") == 0) {

+-		probe = SelinuxSecurityContextProbe::Instance();

+-	} else if (objectName.compare("selinuxboolean_object") == 0) {

+-		probe = SelinuxBooleanProbe::Instance();

+ 	} else if (objectName.compare("iflisteners_object") == 0) {

+ 		probe = IfListenersProbe::Instance();

+ 	} else {

+--- src/linux/ProbeFactory.h.old	2011-08-18 14:47:23.226501075 +0200
++++ src/linux/ProbeFactory.h	2011-08-18 14:47:34.183998019 +0200
+@@ -71,8 +71,6 @@
+ #include "InetdProbe.h"

+ 
+ #include "PartitionProbe.h"

+-#include "SelinuxSecurityContextProbe.h"

+-#include "SelinuxBooleanProbe.h"

+ #include "IfListenersProbe.h"

+ 

+ class AbsProbe;

+--- src/probes/unix/Process58Probe.cpp.old	2012-05-22 10:09:52.980828398 +0200
++++ src/probes/unix/Process58Probe.cpp	2012-05-22 10:11:06.266468168 +0200
+@@ -29,10 +29,10 @@
+ //****************************************************************************************//

+ 

+ #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>

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

+ #endif

+ 

+ #include <fstream>

+@@ -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

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

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

+ 

+-	if (selinuxDomainLabel.empty())

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

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

+-	else

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

++/*	else

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

+ 

+ 	if (statStatus == PROC_OK)

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

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

+ 	}

+ }

+-

++/*

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

+ 	security_context_t sctx;

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

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

+ 	return true;

+ }

+-

++*/

+ #elif defined SUNOS

+ 

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

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-missing-memory-header.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-missing-memory-header.patch
new file mode 100644
index 000000000000..3f5fcdba2450
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-missing-memory-header.patch
@@ -0,0 +1,20 @@
+--- src/CountFunction.cpp.old	2012-01-02 11:37:27.113604532 +0100
++++ src/CountFunction.cpp	2012-01-02 11:37:39.624998573 +0100
+@@ -29,6 +29,7 @@
+ //****************************************************************************************//
+ 
+ #include <cstddef>
++#include <memory>
+ #include "CountFunction.h"
+ #include "ComponentFactory.h"
+ 
+--- src/UniqueFunction.cpp.orig	2012-01-02 11:39:58.564269070 +0100
++++ src/UniqueFunction.cpp	2012-01-02 11:40:12.057615550 +0100
+@@ -29,6 +29,7 @@
+ //****************************************************************************************//
+ 
+ #include <set>
++#include <memory>
+ #include "Common.h"
+ #include "ComponentFactory.h"
+ #include "UniqueFunction.h"
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-strnicmp.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-strnicmp.patch
new file mode 100644
index 000000000000..fc127efd3cdb
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-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.2-xerces3.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-xerces3.patch
new file mode 100644
index 000000000000..b127ee44ed45
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-xerces3.patch
@@ -0,0 +1,306 @@
+--- src/XmlProcessor.cpp.old	2011-08-18 14:51:20.311616357 +0200
++++ src/XmlProcessor.cpp	2011-08-18 14:51:47.214381144 +0200
+@@ -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>

+@@ -53,8 +52,17 @@
+ //****************************************************************************************//

+ //			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();

+@@ -104,13 +112,19 @@
+ 

+     try  {

+         XMLPlatformUtils::Initialize();

++#if XERCES_VERSION_MAJOR < 3

++#define SetParameter(parser,n,v) parser->setFeature(n,v)

++#else

++#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)

++#endif

+ 

+ 		parser = makeParser();

+ 		parserWithCallerAdoption = makeParser();

+ 		// 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);

+ 

++#undef SetParameter

+     } catch (const XMLException& toCatch) {

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

+         errMsg.append(XmlCommon::ToString(toCatch.getMessage()));

+@@ -137,32 +151,55 @@
+ 

+ }

+ 

++#if XERCES_VERSION_MAJOR < 3

+ DOMBuilder *XmlProcessor::makeParser() {

++#else

++DOMLSParser *XmlProcessor::makeParser() {

++#endif

+     // Instantiate the DOM parser.

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

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

+ 

++#if XERCES_VERSION_MAJOR < 3

+ 	DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(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.

++#if XERCES_VERSION_MAJOR < 3

++#define SetParameter(parser,n,v) parser->setFeature(n,v)

++#else

++#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)

++#endif

++

++	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

++#if XERCES_VERSION_MAJOR < 3

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

++#else

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

++#endif

++	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.

++#undef SetParameter

+ 

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

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

+ //			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															  //	

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

+@@ -170,7 +207,11 @@
+ 	///////////////////////////////////////////////////////

+ 	//	Add an Error Handler

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

++#if XERCES_VERSION_MAJOR < 3

+ 	parser->setErrorHandler(&errHandler);

++#else

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

++#endif

+ 

+ 	return parser;

+ }

+@@ -250,24 +291,26 @@
+ 		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

++

++#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

+ 

+ 		// 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);

++		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);

+ 

++#undef SetParameter

+ 		//

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

+ 		// XML stream from the serializer.

+@@ -284,7 +327,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;

+--- 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);
+ };

+ 

+ /**

+@@ -135,7 +140,7 @@
+ 	/**

+ 	 * Has the common code for creating an XML parser.

+ 	 */

+-	xercesc::DOMBuilder *makeParser();

++	xercesc::DOMLSParser *makeParser();

+ 

+ 	static XmlProcessor* instance;

+ 

+@@ -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 = "";

+ 	}

diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
new file mode 100644
index 000000000000..9b93df19c839
--- /dev/null
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 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.2.ebuild,v 1.1 2012/05/22 20:54:50 hwoarang Exp $
+
+EAPI=3
+
+inherit eutils
+
+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="ldap rpm selinux"
+
+DEPEND="rpm? ( app-arch/rpm )
+	dev-libs/libgcrypt
+	dev-libs/libpcre
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	ldap? ( net-nds/openldap )
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xerces3.patch
+	epatch "${FILESDIR}"/${P}-strnicmp.patch
+	epatch "${FILESDIR}"/${P}-missing-memory-header.patch
+	if ! use ldap ; then
+		einfo "Disabling LDAP probes"
+		epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
+		sed -i 's/-lldap//' project/linux/Makefile || die
+		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
+		rm src/probes/independent/LDAPProbe.{cpp,h} || 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
+	else
+		epatch "${FILESDIR}"/${P}-add-selinux-libs.patch
+	fi
+}
+
+src_compile () {
+	emake -C project/linux || die
+}
+
+src_install () {
+	# no make install in Makefile
+	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
+	dodir /var/log/${PN} || die
+	insinto /usr/share/${PN}
+	doins xml/* || die
+	dodoc docs/{README.txt,version.txt} || die
+	doman docs/ovaldi.1 || die
+}