From a8e469522810fe99f87fa9751c3fa7e574c47db2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 Jul 2024 12:16:09 +0200 Subject: [PATCH] app-containers/conmon: Sync with Gentoo It's from Gentoo commit f00ca9cb6ab0e751862feb29ddc38b09ed14a534. --- .../app-containers/conmon/Manifest | 3 + .../conmon/conmon-2.1.11.ebuild | 59 +++++++++++++++++ .../app-containers/conmon/conmon-2.1.8.ebuild | 63 +++++++++++++++++++ .../app-containers/conmon/conmon-9999.ebuild | 46 ++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.11.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.8.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/conmon/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/conmon/Manifest index 93eb5c5fb9..defd6003ff 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/conmon/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/conmon/Manifest @@ -1 +1,4 @@ DIST conmon-2.1.10.tar.gz 121047 BLAKE2B 14b4c2d541607eac0af6b335f35bd506c9a6c3d2b4e4e3ad79f32550385e90b6f7533f505565f90fb4bb1f42d528c41e9ddc7ec275c16ee982a6d0afe1c65bff SHA512 ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18 +DIST conmon-2.1.11-make-docs-target-not-depend-on-install.tools.patch 985 BLAKE2B f2f34ca9a6f067f88f39726b52c5d476946413e84a93bfff2b9d4e9a0b9b117bf25a903455c3a762895746c5bca6eb93bf2ac7c2c6123d7b9bca9c345aba6230 SHA512 a9716057b0127d2b5aaca303e6d26484a5dbe91b9114259b2fded2a0c803568749b725e816004c80cb8b47ddff7a2fbcc231edd2df1d78a56ecaf6d3020c7fd7 +DIST conmon-2.1.11.tar.gz 121573 BLAKE2B 600a3e13eee5f71ef5f7aa21d9cf0184dd01c8e5e68d31aa35efcb08c3cf4305313fcfcf0aba3eedb243fe36f0e1e27f68a71627e2050c8ed4a73de273b98131 SHA512 47952f6cbbb810591d78c67856100be0edbf96d30328a10f22c3ec927bc6d1187540824c388d1fc7f3bb16fb7414339f3f20311d1baffb1fae1e38c4d5e7249c +DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.11.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.11.ebuild new file mode 100644 index 0000000000..13d3d6c215 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.11.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An OCI container runtime monitor" +HOMEPAGE="https://github.com/containers/conmon" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/conmon.git" +else + SRC_URI=" + https://github.com/containers/conmon/archive/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/Flowdalic/conmon/commit/ff8794c5bc0805cc430229728befde16da47b68c.patch + -> ${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch + " + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+seccomp systemd" +RESTRICT="test" + +RDEPEND="dev-libs/glib:= + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd:= )" +DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" + +PATCHES=( + # https://github.com/containers/conmon/pull/507 + "${DISTDIR}"/${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch +) + +src_prepare() { + # https://github.com/containers/conmon/pull/505 + echo "${PV}" > VERSION || die + + default + sed -i -e "s|shell.*--exists libsystemd.* && echo \"0\"|shell echo $(usex systemd 0 1)|g;" Makefile || die + echo -e "#!/usr/bin/env bash\necho $(usex seccomp 0 1)" > hack/seccomp-notify.sh || die +} + +src_compile() { + tc-export CC PKG_CONFIG + export PREFIX="${EPREFIX}/usr" GOMD2MAN=$(command -v go-md2man) + default +} + +src_install() { + default + dodir /usr/libexec/podman + dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}" +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.8.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.8.ebuild new file mode 100644 index 0000000000..1acfecb843 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-2.1.8.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An OCI container runtime monitor" +HOMEPAGE="https://github.com/containers/conmon" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/conmon.git" +else + SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" + GIT_COMMIT="00e08f4a9ca5420de733bf542b930ad58e1a7e7d" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+seccomp systemd" +RESTRICT="test" + +RDEPEND="dev-libs/glib:= + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd:= )" +DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" +PATCHES=( + "${FILESDIR}/conmon-2.1.8-Makefile.patch" +) + +src_prepare() { + default + if use systemd; then + sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "0"|g;' Makefile || die + else + sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "1"|g;' Makefile || die + fi + + if use seccomp; then + echo -e '#!/usr/bin/env bash\necho "0"' > hack/seccomp-notify.sh || die + else + echo -e '#!/usr/bin/env bash\necho "1"' > hack/seccomp-notify.sh || die + fi +} + +src_compile() { + tc-export CC PKG_CONFIG + export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man + if [[ ${PV} == *9999* ]]; then + default + else + emake GIT_COMMIT="${GIT_COMMIT}" + fi +} + +src_install() { + default + dodir /usr/libexec/podman + dosym ../../bin/"${PN}" /usr/libexec/podman/conmon +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-9999.ebuild new file mode 100644 index 0000000000..bed057cb8f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/conmon/conmon-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An OCI container runtime monitor" +HOMEPAGE="https://github.com/containers/conmon" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/conmon.git" +else + SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+seccomp systemd" +RESTRICT="test" + +RDEPEND="dev-libs/glib:= + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd:= )" +DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" + +src_prepare() { + default + sed -i -e "s|shell.*--exists libsystemd.* && echo \"0\"|shell echo $(usex systemd 0 1)|g;" Makefile || die + echo -e "#!/usr/bin/env bash\necho $(usex seccomp 0 1)" > hack/seccomp-notify.sh || die +} + +src_compile() { + tc-export CC PKG_CONFIG + export PREFIX="${EPREFIX}/usr" GOMD2MAN=$(command -v go-md2man) + default +} + +src_install() { + default + dodir /usr/libexec/podman + dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}" +}