From d4d7098dcb2f9dd257109bbcb55fd40beda1b78d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Dec 2022 19:52:06 +0000 Subject: gentoo auto-resync : 20:12:2022 - 19:52:06 --- app-forensics/Manifest.gz | Bin 4881 -> 4712 bytes app-forensics/ovaldi/Manifest | 6 -- .../ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch | 23 ----- ...10.1.7-disable_RetrieveSelinuxDomainLabel.patch | 31 ------- .../ovaldi/files/ovaldi-5.10.1.7-gcc11.patch | 72 --------------- app-forensics/ovaldi/metadata.xml | 8 -- app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild | 101 --------------------- 7 files changed, 241 deletions(-) delete mode 100644 app-forensics/ovaldi/Manifest delete mode 100644 app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch delete mode 100644 app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch delete mode 100644 app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch delete mode 100644 app-forensics/ovaldi/metadata.xml delete mode 100644 app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild (limited to 'app-forensics') diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz index d0fc6939bc80..01fcd4d2d716 100644 Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest deleted file mode 100644 index a25a44a5b209..000000000000 --- a/app-forensics/ovaldi/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -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-r1.ebuild 3024 BLAKE2B 29609cff8c0433059cb943ecb7ea9fca7263be79e45d5de6f884469ba6e332bc035df66fbe729b0e982a17c94d08a46e1c62d515433baaf3b4c3dfdaa7a6bbd0 SHA512 08eb28897db991f47c082081bdf72c8db6f4b1ce39f5d927eb4bcb65f457b4400a412a1fde8e2ea97a40bbe9c176b583c99ab8724a751f0f6f5343fad51114ca -MISC metadata.xml 244 BLAKE2B 1e98392617c2226a41348e7fbdd2e5f83cf42f4e683b5f0df82b16746bd3b095e52bedd1ce0c066e7a55fe1f62dfea39b603fbe5054003fbfded557d83a08482 SHA512 074eaa2c5c5145f60ec5b93c7aef02a8f9e4b9b85676f5663034f41f60e3dacf38f7c8f0f0909dc43e4b085ae779e67b61395b0a35f251bc23abbb281de0360c 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 deleted file mode 100644 index 0a8b5fa6a188..000000000000 --- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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'. - */ - -- int hasExtendedAcl = acl_extended_file(filePath.c_str()); -- if(hasExtendedAcl > -1){ // behavior 4, 5, and 6 -- item->AppendElement(new ItemEntity("has_extended_acl",Common::ToString(hasExtendedAcl),OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_EXISTS,0)); -- }else{ -- if(errno == EOPNOTSUPP){ // behavior 3 -- item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_DOES_NOT_EXIST,0)); -- }else{ // behavior 2 -- item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_ERROR,0)); -- item->AppendMessage(new OvalMessage(string("Error reading ACL data: ") + strerror(errno))); -- } -- } -- -+ // behavior 1 -+ item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0)); - # else - // behavior 1 - item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0)); 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 deleted file mode 100644 index 9f0a0e05e401..000000000000 --- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/probes/unix/Process58Probe.cpp -+++ b/src/probes/unix/Process58Probe.cpp -@@ -743,26 +743,8 @@ - } - - bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) { -- security_context_t sctx; -- int ec = getpidcon(pid, &sctx); -- if (ec == -1) { -- // getpidcon man page doesn't say errno is set... so we can't get a -- // reason for the error. -- *err = "getpidcon() failed"; -- return false; -- } -- -- SecurityContextGuard scg(sctx); -- ContextGuard cg(sctx); -- -- const char *tmp = context_type_get(cg); -- if (!tmp) { -- *err = string("context_get_type(")+sctx+"): "+strerror(errno); -- return false; -- } -- -- *label = tmp; -- return true; -+ *err = string("context_get_type(NotImplmented)"); -+ return false; - } - - #elif defined SUNOS 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 deleted file mode 100644 index 1c71f7016d77..000000000000 --- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 > ItemCache; -+ typedef set > 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/metadata.xml b/app-forensics/ovaldi/metadata.xml deleted file mode 100644 index 0011ef603d31..000000000000 --- a/app-forensics/ovaldi/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - ovaldi - - diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild deleted file mode 100644 index 50a05b8d222f..000000000000 --- a/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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:= ) - ldap? ( net-nds/openldap:= ) - selinux? ( sys-libs/libselinux )" -RDEPEND="${DEPEND}" - -src_prepare() { - 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 - eapply "${FILESDIR}"/${P}-disable-acl.patch - sed -i 's, -lacl , ,' project/linux/Makefile || die - fi - - einfo "Disabling rpm probes" - sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die - - # 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 - 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 - sed -i 's,.*SecurityContextGuard.h.*,//&,' src/probes/unix/Process58Probe.cpp || die - sed -i 's, -lselinux,,' project/linux/Makefile || die - fi - - # missing header for realloc and free - sed -i 's,#include ,&\n#include ,' src/linux/NetworkInterfaces.cpp || die - sed -i 's,#include ,&\n#include ,' src/linux/SystemInfo.cpp || 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 -} - -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/ovaldi - - insinto /usr/share/ovaldi - doins -r xml/. - - dodoc docs/{README.txt,version.txt} - doman docs/ovaldi.1 -} -- cgit v1.2.3