* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/, dev-util/sysdig/files/
@ 2017-11-11 8:28 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2017-11-11 8:28 UTC (permalink / raw
To: gentoo-commits
commit: bfdf7b42980cc1eaa029fd803a1b7eba31549993
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 08:07:43 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 08:28:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdf7b42
dev-util/sysdig: Prune old
dev-util/sysdig/Manifest | 2 -
.../sysdig/files/sysdig-0.17.0-curlbuild.h.patch | 53 ------------
dev-util/sysdig/sysdig-0.17.0-r1.ebuild | 97 ----------------------
dev-util/sysdig/sysdig-0.18.0.ebuild | 91 --------------------
4 files changed, 243 deletions(-)
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index fe6593c47c0..77a8c639d57 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1 @@
-DIST sysdig-0.17.0.tar.gz 718719 SHA256 f009acc32f2b15fcb0d2267bde6f6de9b3445179003c979ba61a8836abdb78f9 SHA512 476e130151d1a8e9e782f074c45448becbef10397c0040e33febaf89c73f22c1716ebeeb2683f489a74c83f5d67174c9f21bb05d4327f35fb03ca1b9822889bc WHIRLPOOL a8f3e0aa45e00d9e6b02e0c26f3ec2f91cbf4d9a6caf955684617e2a1e7c9c0b92c0bdda3b2c254129008ea42bd2386710ef391714e13631e0e7d62fe9226ed0
-DIST sysdig-0.18.0.tar.gz 739774 SHA256 9caab6b4ef4a6d9f9ded8f79b1fcbe34a918c61b6f3b5a15d803f0f25e73497a SHA512 51649bc965d54b0e4b6c17d3b8f6a9c1710300b371c556193f04f25c71acbc96da1bfb6c636f8afdd8544de39d7bb1db0bd8ecc39d18d6f1f238d9e7819f0265 WHIRLPOOL de150a7254428edf88fbe34226ebb1bc96270fbb942d70cc483cef7c04e7a31e43e8efd070b44d78991bdeabc88bfd90370f0cfa7fcb71b41b72c4fd005f4e8c
DIST sysdig-0.19.1.tar.gz 742149 SHA256 480d5d8fd7e7373c08008c30bd8e2c7595d5c45d710bf07bd15a522021b560f6 SHA512 a3947ecd2019af75d787d956b3931dc1aac593279256a92fc02ff0d7e0a85f23786ab821da9bf3ec55430e4da56f70c8583d1b5d24782b426f7deb6f1fca69eb WHIRLPOOL 387aa58c56821b52c39229e8923486192c763c270c9c4d392dea6bef29c3b68d3a0d0aa229270736125ab18fd2fb2129499f77553897912be100a1b1b2a7a49d
diff --git a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
deleted file mode 100644
index 465be572b1f..00000000000
--- a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001
-From: Mark Stemm <mark.stemm@gmail.com>
-Date: Tue, 15 Aug 2017 17:49:53 -0700
-Subject: [PATCH] Don't include curlbuild.h
-
-It's not required to build and it's not present with some newer versions
-of libcurl, so removing it.
-
-Thanks to https://github.com/hhoffstaette for the tip.
-
-This fixes https://github.com/draios/sysdig/issues/895.
----
- userspace/libsinsp/marathon_http.cpp | 1 -
- userspace/libsinsp/mesos_http.cpp | 1 -
- userspace/sysdig.project | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp
-index f7937b681..2e4449ad9 100644
---- a/userspace/libsinsp/marathon_http.cpp
-+++ b/userspace/libsinsp/marathon_http.cpp
-@@ -7,7 +7,6 @@
- #include "marathon_http.h"
- #include "curl/curl.h"
- #include "curl/easy.h"
--#include "curl/curlbuild.h"
- #define BUFFERSIZE 512 // b64 needs this macro
- #include "b64/encode.h"
- #include "sinsp.h"
-diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp
-index 18ac9f5b5..c6bfb5810 100644
---- a/userspace/libsinsp/mesos_http.cpp
-+++ b/userspace/libsinsp/mesos_http.cpp
-@@ -7,7 +7,6 @@
- #include "mesos_http.h"
- #include "curl/curl.h"
- #include "curl/easy.h"
--#include "curl/curlbuild.h"
- #include "sinsp.h"
- #include "sinsp_int.h"
- #include "sinsp_curl.h"
-diff --git a/userspace/sysdig.project b/userspace/sysdig.project
-index 5d00f18f2..76a18f0a8 100644
---- a/userspace/sysdig.project
-+++ b/userspace/sysdig.project
-@@ -752,7 +752,6 @@
- </VirtualDirectory>
- <VirtualDirectory Name="include">
- <VirtualDirectory Name="curl">
-- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/>
- <File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/>
- <File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/>
- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/>
diff --git a/dev-util/sysdig/sysdig-0.17.0-r1.ebuild b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
deleted file mode 100644
index d886e9c22e5..00000000000
--- a/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- dev-libs/openssl:0=
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- # fix building against curl-7.55.0+
- # https://bugs.gentoo.org/627572
- "${FILESDIR}"/sysdig-0.17.0-curlbuild.h.patch
- )
-
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-
- if use modules; then
- cmake-utils_src_make configure_driver
-
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED%/}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.18.0.ebuild b/dev-util/sysdig/sysdig-0.18.0.ebuild
deleted file mode 100644
index ebc9e98519a..00000000000
--- a/dev-util/sysdig/sysdig-0.18.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- dev-libs/openssl:0=
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-
- if use modules; then
- cmake-utils_src_make configure_driver
-
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED%/}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED%/}"/usr/etc || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/, dev-util/sysdig/files/
@ 2019-06-02 6:40 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2019-06-02 6:40 UTC (permalink / raw
To: gentoo-commits
commit: c5b17d217cdfe33e2a00e842edffba97b5d5b542
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 06:32:38 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 06:38:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b17d21
dev-util/sysdig: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/sysdig/Manifest | 2 -
.../sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch | 34 --------
dev-util/sysdig/sysdig-0.24.2.ebuild | 99 ----------------------
dev-util/sysdig/sysdig-0.26.0.ebuild | 97 ---------------------
4 files changed, 232 deletions(-)
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 51871b43e56..8cff04f0f08 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1 @@
-DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
-DIST sysdig-0.26.0.tar.gz 892090 BLAKE2B ea80eacfedeca0348c86611d960c8e65eb31c4dfb2386813973d37a92cb186fd0b8b2597305c0617e59c7254b8507ed32c6f1fed37e920929e45a72fffb32cb7 SHA512 8f6ebcd0a0d14586b204b3fa90e27581082390b57d0547e531db258be341fd5e1b77c45c02018267836c867e291d842fcbd05bbe994d3e32a678a2926426e2b6
DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
diff --git a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
deleted file mode 100644
index 711eb182751..00000000000
--- a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2c8f0263382bf64800faec5fba5cc3e005d9fb1e Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Thu, 31 Jan 2019 10:54:00 +0000
-Subject: [PATCH] Update for change to access_ok in Linux 5.0
-
-Linux 5.0 removed the 1st argument 'type' from the access_ok macro.
-Update the ppm_access_ok() macro to cater for this change for Linux
-5.0
-
-Bug: https://github.com/draios/sysdig/issues/1299
-sysdig-CLA-1.0-signed-off-by: Colin Ian King <colin.king@canonical.com>
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
----
- driver/ppm_events.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/driver/ppm_events.c b/driver/ppm_events.c
-index 717590888..cc3eb98d2 100644
---- a/driver/ppm_events.c
-+++ b/driver/ppm_events.c
-@@ -46,7 +46,11 @@ or GPL2.txt for full copies of the license.
- #ifdef access_ok_noprefault
- #define ppm_access_ok access_ok_noprefault
- #else
--#define ppm_access_ok access_ok
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
-+#define ppm_access_ok(type, addr, size) access_ok(type, addr, size)
-+#else
-+#define ppm_access_ok(type, addr, size) access_ok(addr, size)
-+#endif
- #endif
-
- extern bool g_tracers_enabled;
diff --git a/dev-util/sysdig/sysdig-0.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
deleted file mode 100644
index abc1676d9a6..00000000000
--- a/dev-util/sysdig/sysdig-0.24.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
- modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-cpp/tbb:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- local PATCHES=(
- # compatibility with kernel 5.0.0
- # https://bugs.gentoo.org/680084
- "${FILESDIR}"/sysdig-0.24.2-kernel-5.0.0.patch
- )
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-
- if use modules; then
- cmake-utils_src_make configure_driver
-
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED%/}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.26.0.ebuild b/dev-util/sysdig/sysdig-0.26.0.ebuild
deleted file mode 100644
index a6c3bad4d48..00000000000
--- a/dev-util/sysdig/sysdig-0.26.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
- modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-cpp/tbb:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- dev-libs/protobuf:0=
- net-dns/c-ares:0=
- net-libs/grpc:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-
- if use modules; then
- cmake-utils_src_make configure_driver
-
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED}"/usr/etc || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/, dev-util/sysdig/files/
@ 2022-03-09 15:11 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-03-09 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 3c0d8e180e2f8a2a782b7a750193d7f1b91acd6d
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Wed Mar 9 14:05:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 15:10:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0d8e18
dev-util/sysdig: fix compatibility with luajit-2.1
Closes: https://bugs.gentoo.org/834664
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/24461
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../sysdig/files/sysdig-0.27.1-luajit-2.1.patch | 99 ++++++++++++++++++++++
dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 1 +
2 files changed, 100 insertions(+)
diff --git a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch b/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch
new file mode 100644
index 000000000000..b0d5c9dc724c
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch
@@ -0,0 +1,99 @@
+
+https://bugs.gentoo.org/834664
+https://github.com/draios/sysdig/pull/921
+
+Backport for 0.27.1 in lua_parser_api.cpp by:
+Holger Hoffstätte <holger@applied-asynchrony.com>
+
+From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni@golov.de>
+Date: Sun, 27 Aug 2017 13:51:19 +0200
+Subject: [PATCH] fix build with LuaJIT 2.1 betas
+
+LuaJIT 2.1 drops some compat symbols [1]. And while I think that this is
+wrong, as it breaks compatibility with Lua 5.1 [2], it is quite easy to
+adopt the code to work with both versions (2.0 and 2.1) of LuaJIT and
+remain Lua 5.1 compatible.
+
+[1] https://github.com/LuaJIT/LuaJIT/commit/dc320ca70f2c5bb3977b82853bcee6dad2523d01
+[2] https://github.com/LuaJIT/LuaJIT/issues/325
+
+Signed-off-by: Evgeni Golov <evgeni@golov.de>
+sysdig-CLA-1.0-signed-off-by: Evgeni Golov <evgeni@golov.de>
+---
+ CMakeLists.txt | 2 +-
+ userspace/libsinsp/chisel.cpp | 6 +++---
+ userspace/libsinsp/lua_parser.cpp | 2 +-
+ userspace/libsinsp/lua_parser_api.cpp | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8613a774d..4f27db9b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,7 +103,7 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system
+ option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS})
+
+ if(NOT USE_BUNDLED_LUAJIT)
+- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit)
++ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit-2.0 luajit)
+ find_library(LUAJIT_LIB NAMES luajit luajit-5.1)
+ if(LUAJIT_INCLUDE AND LUAJIT_LIB)
+ message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}")
+diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp
+index 048bedc4e..b2bb8e872 100644
+--- a/userspace/libsinsp/chisel.cpp
++++ b/userspace/libsinsp/chisel.cpp
+@@ -96,7 +96,7 @@ void lua_stackdump(lua_State *L)
+ // Lua callbacks
+ ///////////////////////////////////////////////////////////////////////////////
+ #ifdef HAS_LUA_CHISELS
+-const static struct luaL_reg ll_sysdig [] =
++const static struct luaL_Reg ll_sysdig [] =
+ {
+ {"set_filter", &lua_cbacks::set_global_filter},
+ {"set_snaplen", &lua_cbacks::set_snaplen},
+@@ -124,7 +124,7 @@ const static struct luaL_reg ll_sysdig [] =
+ {NULL,NULL}
+ };
+
+-const static struct luaL_reg ll_chisel [] =
++const static struct luaL_Reg ll_chisel [] =
+ {
+ {"request_field", &lua_cbacks::request_field},
+ {"set_filter", &lua_cbacks::set_filter},
+@@ -135,7 +135,7 @@ const static struct luaL_reg ll_chisel [] =
+ {NULL,NULL}
+ };
+
+-const static struct luaL_reg ll_evt [] =
++const static struct luaL_Reg ll_evt [] =
+ {
+ {"field", &lua_cbacks::field},
+ {"get_num", &lua_cbacks::get_num},
+diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp
+index 90a2c664f..55096d157 100644
+--- a/userspace/libsinsp/lua_parser.cpp
++++ b/userspace/libsinsp/lua_parser.cpp
+@@ -14,7 +14,7 @@ extern "C" {
+ #include "lauxlib.h"
+ }
+
+-const static struct luaL_reg ll_filter [] =
++const static struct luaL_Reg ll_filter [] =
+ {
+ {"rel_expr", &lua_parser_cbacks::rel_expr},
+ {"bool_op", &lua_parser_cbacks::bool_op},
+diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp
+index 7511814e3..90a3a9fb4 100644
+--- a/userspace/libsinsp/lua_parser_api.cpp
++++ b/userspace/libsinsp/lua_parser_api.cpp
+@@ -228,7 +228,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls)
+ string err = "Got non-table as in-expression operand\n";
+ throw sinsp_exception("parser API error");
+ }
+- int n = luaL_getn(ls, 4); /* get size of table */
++ int n = (int)lua_objlen(ls, 4); /* get size of table */
+ for (i=1; i<=n; i++)
+ {
+ lua_rawgeti(ls, 4, i);
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
index f5aa5dd67ea9..a31a6e8614d1 100644
--- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
@@ -41,6 +41,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch
+ "${FILESDIR}"/${PN}-0.27.1-luajit-2.1.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/, dev-util/sysdig/files/
@ 2023-01-03 11:20 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-03 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 7b1ac17f41162103ec26bfcb288e815eba879ee3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 11:20:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 11:20:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1ac17f
dev-util/sysdig: drop 0.27.1-r100
Bug: https://bugs.gentoo.org/889532
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/sysdig/Manifest | 1 -
.../files/sysdig-0.27.1-grpc-absl-sync.patch | 25 ------
.../sysdig/files/sysdig-0.27.1-luajit-2.1.patch | 99 ----------------------
dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 81 ------------------
4 files changed, 206 deletions(-)
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 9262fd7968f3..234cd960eb7a 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,2 @@
DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
diff --git a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
deleted file mode 100644
index eaf689a54d0d..000000000000
--- a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/817128
-https://github.com/hhoffstaette/portage/blob/master/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE)
- else()
- message(FATAL_ERROR "Couldn't find system grpc")
- endif()
-+ find_library(ABSL_SYNC_LIB NAMES absl_synchronization)
- find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
- if(NOT GRPC_CPP_PLUGIN)
- message(FATAL_ERROR "System grpc_cpp_plugin not found")
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -214,6 +214,10 @@ if(NOT WIN32)
- "${JQ_LIB}"
- "${B64_LIB}")
-
-+ if(ABSL_SYNC_LIB)
-+ target_link_libraries(sinsp "${ABSL_SYNC_LIB}")
-+ endif()
-+
- if(NOT MUSL_OPTIMIZED_BUILD)
- target_link_libraries(sinsp
- rt
diff --git a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch b/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch
deleted file mode 100644
index b0d5c9dc724c..000000000000
--- a/dev-util/sysdig/files/sysdig-0.27.1-luajit-2.1.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-
-https://bugs.gentoo.org/834664
-https://github.com/draios/sysdig/pull/921
-
-Backport for 0.27.1 in lua_parser_api.cpp by:
-Holger Hoffstätte <holger@applied-asynchrony.com>
-
-From 1147b9a4f6f1f9e97b43735e7980da387837de4a Mon Sep 17 00:00:00 2001
-From: Evgeni Golov <evgeni@golov.de>
-Date: Sun, 27 Aug 2017 13:51:19 +0200
-Subject: [PATCH] fix build with LuaJIT 2.1 betas
-
-LuaJIT 2.1 drops some compat symbols [1]. And while I think that this is
-wrong, as it breaks compatibility with Lua 5.1 [2], it is quite easy to
-adopt the code to work with both versions (2.0 and 2.1) of LuaJIT and
-remain Lua 5.1 compatible.
-
-[1] https://github.com/LuaJIT/LuaJIT/commit/dc320ca70f2c5bb3977b82853bcee6dad2523d01
-[2] https://github.com/LuaJIT/LuaJIT/issues/325
-
-Signed-off-by: Evgeni Golov <evgeni@golov.de>
-sysdig-CLA-1.0-signed-off-by: Evgeni Golov <evgeni@golov.de>
----
- CMakeLists.txt | 2 +-
- userspace/libsinsp/chisel.cpp | 6 +++---
- userspace/libsinsp/lua_parser.cpp | 2 +-
- userspace/libsinsp/lua_parser_api.cpp | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8613a774d..4f27db9b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,7 +103,7 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system
- option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS})
-
- if(NOT USE_BUNDLED_LUAJIT)
-- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit)
-+ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit-2.0 luajit)
- find_library(LUAJIT_LIB NAMES luajit luajit-5.1)
- if(LUAJIT_INCLUDE AND LUAJIT_LIB)
- message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}")
-diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp
-index 048bedc4e..b2bb8e872 100644
---- a/userspace/libsinsp/chisel.cpp
-+++ b/userspace/libsinsp/chisel.cpp
-@@ -96,7 +96,7 @@ void lua_stackdump(lua_State *L)
- // Lua callbacks
- ///////////////////////////////////////////////////////////////////////////////
- #ifdef HAS_LUA_CHISELS
--const static struct luaL_reg ll_sysdig [] =
-+const static struct luaL_Reg ll_sysdig [] =
- {
- {"set_filter", &lua_cbacks::set_global_filter},
- {"set_snaplen", &lua_cbacks::set_snaplen},
-@@ -124,7 +124,7 @@ const static struct luaL_reg ll_sysdig [] =
- {NULL,NULL}
- };
-
--const static struct luaL_reg ll_chisel [] =
-+const static struct luaL_Reg ll_chisel [] =
- {
- {"request_field", &lua_cbacks::request_field},
- {"set_filter", &lua_cbacks::set_filter},
-@@ -135,7 +135,7 @@ const static struct luaL_reg ll_chisel [] =
- {NULL,NULL}
- };
-
--const static struct luaL_reg ll_evt [] =
-+const static struct luaL_Reg ll_evt [] =
- {
- {"field", &lua_cbacks::field},
- {"get_num", &lua_cbacks::get_num},
-diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp
-index 90a2c664f..55096d157 100644
---- a/userspace/libsinsp/lua_parser.cpp
-+++ b/userspace/libsinsp/lua_parser.cpp
-@@ -14,7 +14,7 @@ extern "C" {
- #include "lauxlib.h"
- }
-
--const static struct luaL_reg ll_filter [] =
-+const static struct luaL_Reg ll_filter [] =
- {
- {"rel_expr", &lua_parser_cbacks::rel_expr},
- {"bool_op", &lua_parser_cbacks::bool_op},
-diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp
-index 7511814e3..90a3a9fb4 100644
---- a/userspace/libsinsp/lua_parser_api.cpp
-+++ b/userspace/libsinsp/lua_parser_api.cpp
-@@ -228,7 +228,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls)
- string err = "Got non-table as in-expression operand\n";
- throw sinsp_exception("parser API error");
- }
-- int n = luaL_getn(ls, 4); /* get size of table */
-+ int n = (int)lua_objlen(ls, 4); /* get size of table */
- for (i=1; i<=n; i++)
- {
- lua_rawgeti(ls, 4, i);
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
deleted file mode 100644
index a31a6e8614d1..000000000000
--- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-# Documentation says this might be needed but since the unmigrated ebuilds
-# did not enforce it, nor does this one.
-#LUA_REQ_USE="-lua52compat"
-
-inherit bash-completion-r1 cmake lua-single
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+modules test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}
- app-misc/jq:0=
- dev-cpp/tbb:0=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- dev-libs/protobuf:0=
- net-dns/c-ares:0=
- net-libs/grpc:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- dev-libs/openssl:0=
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- virtual/os-headers
- test? ( dev-cpp/gtest )"
-PDEPEND="
- modules? ( >=dev-util/sysdig-kmod-${PV} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch
- "${FILESDIR}"/${PN}-0.27.1-luajit-2.1.patch
-)
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCREATE_TEST_TARGETS=$(usex test)
-
- # done in dev-util/sysdig-kmod
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
-
- # explicitly set version
- -DSYSDIG_VERSION=${PV}
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # remove sources
- rm -r "${ED}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED}"/usr/etc || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-03 11:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-02 6:40 [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/, dev-util/sysdig/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-01-03 11:20 Andreas Sturmlechner
2022-03-09 15:11 Sam James
2017-11-11 8:28 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox