gentoo resync : 04.05.2021

3 files changed, 76 insertions, 4 deletions

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
index 6d6fbf60178e..0a8b5fa6a188 100644
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
@@ -1,5 +1,5 @@
---- src/probes/unix/FileProbe.cpp.old	2014-10-08 09:15:37.000000000 +0200
-+++ src/probes/unix/FileProbe.cpp	2014-10-08 09:15:55.000000000 +0200
+--- a/src/probes/unix/FileProbe.cpp
++++ b/src/probes/unix/FileProbe.cpp
 @@ -386,18 +386,8 @@
  	   6) If a file has an ACL, the value will be 'true'.
  	*/
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
index 11d369022b03..9f0a0e05e401 100644
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
@@ -1,5 +1,5 @@
---- src/probes/unix/Process58Probe.cpp.old	2014-10-08 08:56:37.000000000 +0200
-+++ src/probes/unix/Process58Probe.cpp	2014-10-08 08:57:58.000000000 +0200
+--- a/src/probes/unix/Process58Probe.cpp
++++ b/src/probes/unix/Process58Probe.cpp
 @@ -743,26 +743,8 @@
  }
  
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
new file mode 100644
index 000000000000..1c71f7016d77
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
@@ -0,0 +1,72 @@
+--- a/src/AbsProbe.cpp
++++ b/src/AbsProbe.cpp
+@@ -52,7 +52,7 @@
+ 	// use const wherever it makes sense, to ensure const-correctness??
+ 	// Or maybe I should have implemented operator<() for items and
+ 	// used the default std::less template...?
+-	typedef set<Item*, std::less<const Item*> > ItemCache;
++	typedef set<Item*, std::less<Item*> > ItemCache;
+ 	ItemCache globalItemCache;
+ }
+ 
+--- a/src/ErrnoException.h
++++ b/src/ErrnoException.h
+@@ -49,10 +49,10 @@
+ 		SetErrorMessage(syscall+": "+std::strerror(errnoVal));
+ 	}
+ 
+-	virtual ~ErrnoException() throw () {
++	virtual ~ErrnoException() {
+ 	}
+ 
+-	virtual const char* what() const throw() {
++	virtual const char* what() const noexcept {
+ 		return errorMessage.c_str();
+ 	}
+ };
+--- a/src/OutOfMemoryException.h
++++ b/src/OutOfMemoryException.h
+@@ -47,10 +47,10 @@
+ 		: Exception(msg, severity, cause) {
+ 	}
+ 
+-	virtual ~OutOfMemoryException() throw () {
++	virtual ~OutOfMemoryException() {
+ 	}
+ 
+-	virtual const char* what() const throw() {
++	virtual const char* what() const noexcept {
+ 		return errorMessage.c_str();
+ 	}
+ };
+--- a/src/probes/unix/RunLevelProbe.cpp
++++ b/src/probes/unix/RunLevelProbe.cpp
+@@ -125,7 +125,7 @@
+ 
+ 
+ void
+-RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException ) {
++RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const {
+   
+   // check datatypes - only allow string
+   if( service_name->GetDatatype() != OvalEnum::DATATYPE_STRING ){
+--- a/src/probes/unix/RunLevelProbe.h
++++ b/src/probes/unix/RunLevelProbe.h
+@@ -76,7 +76,7 @@
+  */
+ struct ltrunlevel_item_comparator
+ {
+-  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 )
++  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 ) const
+   {
+     return r1.service_name.compare(r2.service_name) < 0;
+   }
+@@ -115,7 +115,7 @@
+       @param runlevel the runlevel runlevel_object entity
+       @throws ProbeException if invalid operations or datatypes are encountered
+     */
+-    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException );
++    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const;
+ 
+     /**
+       Checks to see if the given filename is either "." or ".."