summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-11-11 09:07:43 +0100
committerMichał Górny <mgorny@gentoo.org>2017-11-11 09:28:08 +0100
commitbfdf7b42980cc1eaa029fd803a1b7eba31549993 (patch)
tree121faf96ac6245708c053e461f68e22a5d18e287 /dev-util
parentdev-util/sysdig: Allow building against LibreSSL (diff)
downloadgentoo-bfdf7b42980cc1eaa029fd803a1b7eba31549993.tar.gz
gentoo-bfdf7b42980cc1eaa029fd803a1b7eba31549993.tar.bz2
gentoo-bfdf7b42980cc1eaa029fd803a1b7eba31549993.zip
dev-util/sysdig: Prune old
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/sysdig/Manifest2
-rw-r--r--dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch53
-rw-r--r--dev-util/sysdig/sysdig-0.17.0-r1.ebuild97
-rw-r--r--dev-util/sysdig/sysdig-0.18.0.ebuild91
4 files changed, 0 insertions, 243 deletions
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index fe6593c47c08..77a8c639d57e 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 465be572b1fe..000000000000
--- 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 d886e9c22e5d..000000000000
--- 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 ebc9e98519ac..000000000000
--- 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
-}