gentoo resync : 04.05.2021

5 files changed, 108 insertions, 27 deletions

diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 31ca851de7d5..0eba74209447 100644
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -1,5 +1,6 @@
-AUX ovaldi-5.10.1.7-disable-acl.patch 1231 BLAKE2B 2f434497f12b52be3f18a4a35dc9b22dc6c93c5c3db9c0a46ef4a85753c6262f553b9c4aabddf55ff534f99f43b7667f65e758111a570e4102ca1a27cc03ce15 SHA512 e71a2899b0eb0a9abd6ba2a3a00ef67d6480597defa3390cfd4706e801aa6383c7a6ff5e02e4472b5a707bab35f398b6b9d00377adbd82673b6cf5c9961370a8
-AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 834 BLAKE2B 8e4cc626d97ee2f80c40913b09550693437ac6cc9b3ad0491962b8c3b78cd6e060ba4c5c0f3bc18be10348ec31fcd9e0e35108bb80425764a7d4f75412b8f0b0 SHA512 f05a797252a2006384f450afd2c0c2b8cd894abc2409b21a3df9cec57af39ff81dc2b007b0e3c460e3ce85855a1b37fe18b5a4b79408969019332300d0c1ed47
+AUX ovaldi-5.10.1.7-disable-acl.patch 1159 BLAKE2B e7c477fdfa53bc0ed8866d39c58b1ed1e28789db1b663b4b2c22e99d2a41474f2f684581b81dd4123ad5f2d49b45acbaff82da38d3d61881f01b5d202684a089 SHA512 85dcd92468641294f132ffbdd4cc23bfcb4a96fd6db52322cf1abca086617b83798323e6bd2e4447467530a2c8f8b681ffabef3f193ea7a09cdbca93e33d2f6e
+AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 762 BLAKE2B 3d1018ee87b8a15ec2b8b487a8e5eb9bfa17be265e3ec1c84a17b877ccaa38605127539e410772c23474395db984427780d4bb28ebb5223c1785f1cd7b161c58 SHA512 b597ee411d478758f5d5de0bb486b75190cf7ac2a9297c407016f66bc28ddbd6692b25c83adaed0abf9931c86909c61fbff7a834f82e5f0bd0068a04659f8f36
+AUX ovaldi-5.10.1.7-gcc11.patch 2378 BLAKE2B 8e0256c20f50748840457e16b5e9e1150917c7015b72873007db90a6294b31b485776bfcb8c44eae9bfe23a774e8a5c4ba7aa6fa6d3ef98a8080354d5d0b0df0 SHA512 41932b423992f4cb698db2af7fed0ecf21c77986eee2d284b631dcb89175e040850ba52fa91218a39b468f7eab0ac336327d5b31e5bcf0b5d4a1d58e3b2e0e9c
 DIST ovaldi-5.10.1.7-src.tar.bz2 20391784 BLAKE2B 7e2c719f0819f967c6aee533bb881c29ffac756461460d73e3231f1cffd254d88a26e716f0334d023daa7fa6f9c314bf7a42b6c13e2a90daa558e589d135479c SHA512 22c373436889b03ffb5d479bd322703bbd8b5b335f116a3b38a3d206ddaaf3115961ab89597c3907b6e5d745eb302a042c135c73cde0eaae10e51f5d6e3e55ec
-EBUILD ovaldi-5.10.1.7.ebuild 2916 BLAKE2B d1c7d381477c84ba07ea021298ebc684fe96f7a937f7451bef627f9e8c1d6a2feacb632a3357071b06d718f49de9130917c73c1ee731c83a5b270c96d93d66c3 SHA512 42daad2522fd1e723670ccbce842a291536985405c58d4b1885ac0f948973c2225e75ac83b3a564bfe67846c1fedf2f1f2ff4ee73c18136d1614ac55d81fad03
+EBUILD ovaldi-5.10.1.7.ebuild 3022 BLAKE2B bc1edf77501d106025ac90fc4c7f57f9395447957801a0275eaac13fe11bf7babfab96564e95f6dad63c6285aa26c2baa85dab475cf0052b1e512cdd772ecf9f SHA512 a59ba2fd5c0d1ff00102288f29ece3fd4106862e01e2f208b4093cc92afcd47e833c1e3bc5b0363a7f636ff407625f4ffb2e238b81cb6281afb836b406f35012
 MISC metadata.xml 243 BLAKE2B 72d65d0abc045838e84adb103b2ce4ae4ec3bfc3f4e9843f3f10aadc5f20f6a13b9997d491bcc69cadfa6db8e2b6640f127db6406b734883292c27a8180a61f1 SHA512 36f385a96e0808f3d6a13c7f1376b62754012dc345671d1404460b74f58e33356cbfef5b8d61cf7c0801c9afd45b1b801d87e2e540a5c0f508b41ca5a7591b97
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 ".."
diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
index 5241a7f739bd..2007c6737d5a 100644
--- a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
@@ -1,34 +1,32 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Free implementation of OVAL"
 HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl ldap selinux"
 
-CDEPEND="dev-libs/libgcrypt:0
-	dev-libs/libpcre
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	sys-apps/util-linux
+DEPEND="
+	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 )
+	acl? ( sys-apps/acl:= )
 	ldap? ( net-nds/openldap )"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sys-libs/libselinux )"
 
-S="${WORKDIR}/${P}-src"
-
 src_prepare() {
 	if ! use ldap ; then
 		einfo "Disabling LDAP probes"
@@ -42,7 +40,7 @@ src_prepare() {
 
 	if ! use acl ; then
 		sed -i 's,.*libacl,//&,' src/probes/unix/FileProbe.h || die
-		epatch "${FILESDIR}"/${P}-disable-acl.patch
+		eapply "${FILESDIR}"/${P}-disable-acl.patch
 		sed -i 's, -lacl , ,' project/linux/Makefile || die
 	fi
 
@@ -58,7 +56,7 @@ src_prepare() {
 		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_RetrieveSelinuxDomainLabel.patch
+		eapply "${FILESDIR}"/${P}-disable_RetrieveSelinuxDomainLabel.patch
 		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.cpp || die
 		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.cpp || die
 		sed -i 's,.*selinux.*.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
@@ -70,11 +68,19 @@ src_prepare() {
 	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/NetworkInterfaces.cpp || die
 	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/SystemInfo.cpp || die
 
-	# respect CXXFLAGS and CXX
-	sed -i -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' project/linux/Makefile || die
+	# respect CXX, CXXFLAGS and LDFLAGS
+	sed -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' \
+		-e 's/$(CXX) $^/$(CXX) $(LDFLAGS) $^/g' \
+		-i project/linux/Makefile || die
 
 	# no such library on linux
 	sed -i 's,-lxalanMsg,,' project/linux/Makefile || die
+
+	eapply "${FILESDIR}"/${P}-gcc11.patch
+	eapply_user
+}
+
+src_configure() {
 	tc-export CXX
 }
 
@@ -85,9 +91,11 @@ src_compile() {
 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/*
+	dodir /var/log/ovaldi
+
+	insinto /usr/share/ovaldi
+	doins -r xml/.
+
 	dodoc docs/{README.txt,version.txt}
 	doman docs/ovaldi.1
 }