From 1774f0a748546cbd792bf1eb44757b63be2e0114 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jan 2024 06:53:44 +0000 Subject: gentoo auto-resync : 06:01:2024 - 06:53:44 --- app-containers/Manifest.gz | Bin 8897 -> 8898 bytes app-containers/conmon/Manifest | 10 ++-- app-containers/conmon/conmon-2.1.10.ebuild | 49 +++++++++++++++++++ app-containers/conmon/conmon-2.1.6.ebuild | 49 ------------------- app-containers/conmon/conmon-2.1.7.ebuild | 49 ------------------- app-containers/conmon/conmon-9999.ebuild | 28 +++-------- .../conmon/files/conmon-2.1.8-Makefile.patch | 53 +++++++++++++++++++-- 7 files changed, 109 insertions(+), 129 deletions(-) create mode 100644 app-containers/conmon/conmon-2.1.10.ebuild delete mode 100644 app-containers/conmon/conmon-2.1.6.ebuild delete mode 100644 app-containers/conmon/conmon-2.1.7.ebuild (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 612f13e4c654..9e0ae7f10227 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest index f8e4310fdee7..f518b0aff34e 100644 --- a/app-containers/conmon/Manifest +++ b/app-containers/conmon/Manifest @@ -1,9 +1,7 @@ -AUX conmon-2.1.8-Makefile.patch 579 BLAKE2B 29c8d059cd863fe8e04a374ad99ad6e804696ae9095f3a495cc7afd09c58c1b5c7872c0a9d4645fc1e664bfdd556b43fcb450d912b660b8ac9930235fa7c5a47 SHA512 06d5d0779093ebc8b3b5ee93197c0199a146a043a3f895f1c871bba0a60505476e018685be89c1c52ac8cc2243ada4a769b4a360e598b257b2160ada5d577d34 -DIST conmon-2.1.6.tar.gz 157838 BLAKE2B 319a170ab048c14f3be998391da403799171c5d0e342ac4214a6456398ab872cb6a77cb4d67dbb97a0bc47008c6fa657ba2a166eea4c56ee65db545b08e032bd SHA512 0b5d7f33745766f4f1646e79554e16e1d6c977fd08c5a86c72068aec9f28110b5981c38972134741281c8470c295b6195843f3dbb78e1e9da34b8d577ea41d65 -DIST conmon-2.1.7.tar.gz 158201 BLAKE2B 2f159177cfa78ecafef0217d21c9c56942c5498022d3777368d8caf81c2503aafabf002c0f9ec0537936eca34c156ed9bdd037b5543eca1edd5489d9bc1ac215 SHA512 95d394b399a19a62b894cdd03937ab79b81051eea1db461b1bf957ddd7626d6ca4aa108b8319ed8c08adbdf99fd960c5ba29146e8b0673b5c920708912a72973 +AUX conmon-2.1.8-Makefile.patch 2294 BLAKE2B 7c80598c80fe68246ff1745091df7a95a31b990d5e473253b2f879e4bf2e610305985f3a654944fcb0bc8ce6a22790a7a48c6974c1cc6d954ae4932f6efdad94 SHA512 8c703ff19461a456d8097f14cdd0b8f222e727b7b132ea9d614587f6d8af3c9d44523fc3ff4aa465072ceaf3dd0869e9d355bb82c9f63caf43e668628cfd2d55 +DIST conmon-2.1.10.tar.gz 121047 BLAKE2B 14b4c2d541607eac0af6b335f35bd506c9a6c3d2b4e4e3ad79f32550385e90b6f7533f505565f90fb4bb1f42d528c41e9ddc7ec275c16ee982a6d0afe1c65bff SHA512 ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18 DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3 -EBUILD conmon-2.1.6.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712 -EBUILD conmon-2.1.7.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712 +EBUILD conmon-2.1.10.ebuild 1175 BLAKE2B 2618e38081f3d3923fd90ca1b9d3aca99030de051ae9736a45c52fef0d4f6836de12b4da7cabb82bc11cd6d339369b30c884c4c52dfc4c7a7ceeb891a264ee9e SHA512 fc55388d936190ad53957f6bcb79cdc6e4fa501ab4ed92c6b85984e1f5d33e181341a8f5d5e0359aaf26fd2a5261a98c99e10f2a4c2f67541f50398611551bb7 EBUILD conmon-2.1.8.ebuild 1528 BLAKE2B ad4eaf787c5aaf86a1211c15c99a1feef0108dc007ecbe7c5e2802abe165343a15a6584193accefd704cc252219f9b093d935a40c8f5ce79694bf94a436bc0ab SHA512 d394e22f4398fe2f7dc034e3e136a163cdc9c476f0294ddbc2022b953bff5b1b3343cb49772804349b9cd3a3f869174b7a9f823d11612d5c897099e8be698746 -EBUILD conmon-9999.ebuild 1530 BLAKE2B c4dfd90eb0dccd81f071bb8a842686cfee9682611e904205bdaba7fd027df0db0fe969a745998d93d55e2cf883190480beac1563cf546007069796b0b0392170 SHA512 8c8aec1dadb0081dd4d1f3d656647e31f1b2676b809ae70bec4c0263111de50e88c53ea67e4a1a63fff51392860c29c216324f5b8fa641dd49d0a2ef9da88e3e +EBUILD conmon-9999.ebuild 1175 BLAKE2B 2618e38081f3d3923fd90ca1b9d3aca99030de051ae9736a45c52fef0d4f6836de12b4da7cabb82bc11cd6d339369b30c884c4c52dfc4c7a7ceeb891a264ee9e SHA512 fc55388d936190ad53957f6bcb79cdc6e4fa501ab4ed92c6b85984e1f5d33e181341a8f5d5e0359aaf26fd2a5261a98c99e10f2a4c2f67541f50398611551bb7 MISC metadata.xml 715 BLAKE2B 90d22c010d0f541ce8b15c23027c5ce0683eee92ad263fbe9e877797f724f1c226dc4499ca147919aafcafe14c0dc8083daef946cf9e5ca74114e7d21c1f531f SHA512 f17ce6cdd2215bc4a047c9eb62282407d7b39932affea659ef100f7972c9b4db176e0dcd036d731bf870bc149d6afcb4be0dda03e8f4c411c8c828f166a995d4 diff --git a/app-containers/conmon/conmon-2.1.10.ebuild b/app-containers/conmon/conmon-2.1.10.ebuild new file mode 100644 index 000000000000..c41813b997a1 --- /dev/null +++ b/app-containers/conmon/conmon-2.1.10.ebuild @@ -0,0 +1,49 @@ +# 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" +PATCHES=( + "${FILESDIR}/conmon-2.1.8-Makefile.patch" +) + +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=go-md2man + default +} + +src_install() { + default + dodir /usr/libexec/podman + dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}" +} diff --git a/app-containers/conmon/conmon-2.1.6.ebuild b/app-containers/conmon/conmon-2.1.6.ebuild deleted file mode 100644 index 5460a4aebb3e..000000000000 --- a/app-containers/conmon/conmon-2.1.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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" -SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv" -IUSE="systemd" -RESTRICT="test" - -RDEPEND="dev-libs/glib:= - sys-libs/libseccomp - systemd? ( sys-apps/systemd:= )" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -src_prepare() { - default - - if ! use systemd; then - sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \ - -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \ - -i Makefile || die - fi - sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die - sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die -} - -src_compile() { - tc-export CC - emake GIT_COMMIT="v${PV}" \ - all -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - install - dodir /usr/libexec/podman - ln "${ED}/usr/"{bin,libexec/podman}/conmon || die - dodoc README.md -} diff --git a/app-containers/conmon/conmon-2.1.7.ebuild b/app-containers/conmon/conmon-2.1.7.ebuild deleted file mode 100644 index 5460a4aebb3e..000000000000 --- a/app-containers/conmon/conmon-2.1.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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" -SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv" -IUSE="systemd" -RESTRICT="test" - -RDEPEND="dev-libs/glib:= - sys-libs/libseccomp - systemd? ( sys-apps/systemd:= )" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -src_prepare() { - default - - if ! use systemd; then - sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \ - -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \ - -i Makefile || die - fi - sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die - sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die -} - -src_compile() { - tc-export CC - emake GIT_COMMIT="v${PV}" \ - all -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - install - dodir /usr/libexec/podman - ln "${ED}/usr/"{bin,libexec/podman}/conmon || die - dodoc README.md -} diff --git a/app-containers/conmon/conmon-9999.ebuild b/app-containers/conmon/conmon-9999.ebuild index 073e0db942c9..c41813b997a1 100644 --- a/app-containers/conmon/conmon-9999.ebuild +++ b/app-containers/conmon/conmon-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,13 +8,12 @@ inherit toolchain-funcs DESCRIPTION="An OCI container runtime monitor" HOMEPAGE="https://github.com/containers/conmon" -if [[ ${PV} == *9999* ]]; then +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" @@ -33,31 +32,18 @@ PATCHES=( 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 + 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=go-md2man - if [[ ${PV} == *9999* ]]; then - default - else - emake GIT_COMMIT="${GIT_COMMIT}" - fi + export PREFIX="${EPREFIX}/usr" GOMD2MAN=go-md2man + default } src_install() { default dodir /usr/libexec/podman - dosym ../../bin/"${PN}" /usr/libexec/podman/conmon + dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}" } diff --git a/app-containers/conmon/files/conmon-2.1.8-Makefile.patch b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch index 3c3aa0def57f..8730f4cde59c 100644 --- a/app-containers/conmon/files/conmon-2.1.8-Makefile.patch +++ b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch @@ -1,15 +1,60 @@ +# https://github.com/containers/conmon/pull/482 +# https://github.com/containers/conmon/pull/456 +From 26f8263a2e5c7bff1e2d5985a8a3d5f07ab3b0b0 Mon Sep 17 00:00:00 2001 +From: Rahil Bhimjiani +Date: Tue, 26 Sep 2023 03:21:49 +0530 +Subject: [PATCH] Remove checks for (long)deprecated libsystemd-journal in + favor of libsystemd + +https://bugzilla.redhat.com/show_bug.cgi?id=1350301#c2 + +Signed-off-by: Rahil Bhimjiani +--- + Makefile | 5 +---- + meson.build | 5 +---- + 2 files changed, 2 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 5e6c0d39..40df8e3d 100644 --- a/Makefile +++ b/Makefile -@@ -41,4 +41 @@ +@@ -38,10 +38,7 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) -DVERSION=\"$(VERSIO + # "pkg-config --exists" will error if the package doesn't exist. Make can only compare + # output of commands, so the echo commands are to allow pkg-config to error out, make to catch it, + # and allow the compilation to complete. -ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0) - override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal) - override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal) -D USE_JOURNALD=1 -else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0) +ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0) -@@ -127 +123,0 @@ -- $(MAKE) -C tools + override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd) + override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D USE_JOURNALD=1 + endif +diff --git a/meson.build b/meson.build +index 336e48f3..b454e349 100644 +--- a/meson.build ++++ b/meson.build +@@ -47,10 +47,7 @@ else + libdl = cc.find_library('dl') + endif + +-sd_journal = dependency('libsystemd-journal', required : false) +-if not sd_journal.found() +- sd_journal = dependency('libsystemd', required : false) +-endif ++sd_journal = dependency('libsystemd', required : false) + if sd_journal.found() + add_project_arguments('-DUSE_JOURNALD=1', language : 'c') + endif +diff --git a/docs/Makefile b/docs/Makefile +index af20d2b8..25987664 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -4 +4 @@ +@@ -1,6 +1,6 @@ + PREFIX ?= /usr/local + DATADIR := ${PREFIX}/share + MANDIR := $(DATADIR)/man -GOMD2MAN = ../tools/build/go-md2man +GOMD2MAN ?= ../tools/build/go-md2man + + docs: $(patsubst %.md,%,$(wildcard *.8.md)) -- cgit v1.2.3