From 8a60ccc0bb618fc402bc140a5cee6cf89addec51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Aug 2023 18:08:24 +0100 Subject: gentoo auto-resync : 12:08:2023 - 18:08:23 --- dev-util/Manifest.gz | Bin 68297 -> 68134 bytes dev-util/sysdig-kmod/Manifest | 4 -- .../files/0.27.1-fix-kmod-build-on-5.18+.patch | 63 --------------------- dev-util/sysdig-kmod/metadata.xml | 8 --- dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild | 36 ------------ 5 files changed, 111 deletions(-) delete mode 100644 dev-util/sysdig-kmod/Manifest delete mode 100644 dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch delete mode 100644 dev-util/sysdig-kmod/metadata.xml delete mode 100644 dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 5ffed8d631cd..63bbf02619c3 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest deleted file mode 100644 index 4f19df9e28fc..000000000000 --- a/dev-util/sysdig-kmod/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 0.27.1-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B ecd23377a65d2093c7d97158abe3417da2a45d7e10d692731ec3aa4cd1721e1294c516c61668aa30b6d290963a7126bd0a3f1df3da9e6b54d6ab4978bd14aac8 SHA512 a92592ce54b53be679ce094b578ce7c55366a8e3ef5680b83eb09b86b7fbcd3187f302e98424deb4fdcc37c5898167a8309f98e6ec3dd81b0aa47774409d3121 -DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 -EBUILD sysdig-kmod-0.27.1-r1.ebuild 819 BLAKE2B 024cf63364ab61a8376a415c4794407fdca0cee8c34b45cb5de318b089ef4e5ba29d2b265e950f830b4adf0e739f839289196783ebecd248a2e8b166da411bf7 SHA512 daa895f04e2644b2a8b138f00fc4e92b95a5b0a8487f07abbf84781a27b262e22ef7891ed74827176d5faaa8980adbf48a4f0cac1f5d2bb3df42fafc478d2f0b -MISC metadata.xml 246 BLAKE2B 35cfb0369ed2d389a18f9df8c6ffa8d61a2ffd51a358d720686706b6e694696fd1c46eab08be11e3733bf11edccb3734869b12612829858131072cae4fa98095 SHA512 113c52a3246e912aa3d5369eef4952e480d8f5a45b6656676fae8b10d3125d7a55430c87680b9f985f11fa58b3f29c1d13b3fdf94896c2f61c0451d0ca6a44a9 diff --git a/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch b/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch deleted file mode 100644 index 8c3ade53fb07..000000000000 --- a/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch +++ /dev/null @@ -1,63 +0,0 @@ - -Bug: https://bugs.gentoo.org/852314 -Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d - -From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001 -From: Federico Di Pierro -Date: Mon, 20 Jun 2022 14:26:39 +0200 -Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18. - -Signed-off-by: Federico Di Pierro ---- - driver/main.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/driver/main.c b/driver/main.c -index 6b5ae461a..e606cc2f8 100644 ---- a/driver/main.c -+++ b/driver/main.c -@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors"); - #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args) - #endif - --#ifndef pgprot_encrypted --#define pgprot_encrypted(x) (x) -+// Allow build even on arch where PAGE_ENC is not implemented -+#ifndef _PAGE_ENC -+#define _PAGE_ENC 0 - #endif - - struct ppm_device { -@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; -@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - while (mlength > 0) { - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; -@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) - while (mlength > 0) { - pfn = vmalloc_to_pfn(vmalloc_area_ptr); - -+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; - ret = remap_pfn_range(vma, useraddr, pfn, -- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); -+ PAGE_SIZE, vma->vm_page_prot); - if (ret < 0) { - pr_err("remap_pfn_range failed (1)\n"); - goto cleanup_mmap; diff --git a/dev-util/sysdig-kmod/metadata.xml b/dev-util/sysdig-kmod/metadata.xml deleted file mode 100644 index 6e469632db79..000000000000 --- a/dev-util/sysdig-kmod/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - draios/sysdig - - diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild deleted file mode 100644 index b08faed2f3e3..000000000000 --- a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-mod-r1 - -MY_P=${P/-kmod} -DESCRIPTION="Kernel module for dev-util/sysdig" -HOMEPAGE="https://sysdig.com/" -SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="|| ( MIT GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch -) - -CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" - -src_prepare() { - cmake_src_prepare - - # cmake is only used to generate the Makefile for modules - sed -i '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die -} - -src_compile() { - local modlist=( sysdig-probe=:"${BUILD_DIR}"/driver/src ) - local modargs=( KERNELDIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} -- cgit v1.2.3