[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 73c4de08800950341a83df38134b1405278fbf21 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Wed Jun 12 17:11:48 2024 + Commit: Zac Medico gentoo org> CommitDate: Thu Jun 13 19:10:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c4de08 app-containers/containers-common: cleanup Signed-off-by: Rahil Bhimjiani rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/37135 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/Manifest | 1 - .../containers-common-0.57.0.ebuild| 68 -- .../containers-common-0.57.3.ebuild| 59 --- .../containers-common-0.58.0.ebuild| 60 --- 4 files changed, 188 deletions(-) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index 1ef18a9a70a8..09300934cd25 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,4 +1,3 @@ DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 -DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928 DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8 DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B 5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0 SHA512 452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32 diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild deleted file mode 100644 index 2d56b46669f2.. --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Common config files and docs for Containers stack" -HOMEPAGE="https://github.com/containers/common; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/common.git; -else - SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="amd64 ~arm64 ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" -RESTRICT="test" -RDEPEND=" - =app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) -" - -BDEPEND=" - >=dev-go/go-md2man-2.0.2 -" - -src_prepare() { - default - - [[ -f docs/Makefile && -f Makefile ]] || die - sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die - - # add comments to mounts.conf - eapply "${FILESDIR}/examplify-mounts-conf.patch" -} - -src_compile() { - emake docs -} - -src_install() { - emake DESTDIR="${ED}" install - - insinto /etc/containers - # https://github.com/containers/skopeo/raw/main/default-policy.json - doins pkg/config/containers.conf "${FILESDIR}/policy.json" - - insinto /etc/containers/registries.d - # https://github.com/containers/skopeo/raw/main/default.yaml - doins "${FILESDIR}/default.yaml" - - insinto /usr/share/containers - doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf - - keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore -} diff --git a/app-containers/containers-common/containers-common-0.57.3.ebuild b/app-containers/containers-common/containers-common-0.57.3.ebuild deleted file mode 100644 index 5a0aa2f26d0b.. --- a/app-containers/containers-common/containers-common-0.57.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Common config files and docs for Containers stack" -HOMEPAGE="https://github.com/containers/common; - -if [[ ${PV} == * ]]; then - inherit git-r3 -
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: bcce5c501435ae84101c63093467f02a32bd274b Author: Rahil Bhimjiani rahil rocks> AuthorDate: Wed Jun 12 17:10:33 2024 + Commit: Zac Medico gentoo org> CommitDate: Thu Jun 13 19:10:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcce5c50 app-containers/containers-common: update to 0.59.1 Signed-off-by: Rahil Bhimjiani rahil.rocks> From: https://github.com/gentoo/gentoo/pull/37135 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/Manifest | 1 + .../containers-common-0.59.1.ebuild| 75 ++ 2 files changed, 76 insertions(+) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index d683aa50a470..1ef18a9a70a8 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,3 +1,4 @@ DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928 DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8 +DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B 5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0 SHA512 452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32 diff --git a/app-containers/containers-common/containers-common-0.59.1.ebuild b/app-containers/containers-common/containers-common-0.59.1.ebuild new file mode 100644 index ..4a0427e20df7 --- /dev/null +++ b/app-containers/containers-common/containers-common-0.59.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 + +DESCRIPTION="Common config files and docs for Containers stack" +HOMEPAGE="https://github.com/containers/common; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git; +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RESTRICT="test" +RDEPEND=" + >=app-containers/aardvark-dns-1.10.0 + >=app-containers/crun-1.14.3 + >=app-containers/containers-image-5.30.0 + >=app-containers/containers-storage-1.53.0 + app-containers/containers-shortnames + >=app-containers/netavark-1.10.3 + net-firewall/nftables + net-firewall/iptables[nftables] + >=net-misc/passt-2024.03.20 + >=sys-fs/fuse-overlayfs-1.13 +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.3 +" + +PATCHES=( + "${FILESDIR}/examplify-mounts-conf.patch" +) + +DOC_CONTENTS="\n +For rootless operations, one needs to configure subuid(5) and subgid(5)\n +See /etc/sub{uid,gid} to check whether rootless user is already configured\n +If not, quickly configure it with:\n +usermod --add-subuids 1065536-1131071 \n +usermod --add-subgids 1065536-1131071 \n +" + +src_prepare() { + default + + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die +} + +src_compile() { + emake docs +} + +src_install() { + emake DESTDIR="${ED}" install + readme.gentoo_create_doc + + insinto /usr/share/containers + doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf + + keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore +} + +pkg_postinst() { + readme.gentoo_print_elog +}
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 4764a9acb220d0c847225c35d76ce86f5cc6ecab Author: Zac Medico gentoo org> AuthorDate: Sun Apr 14 20:31:29 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Apr 14 20:39:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4764a9ac app-containers/containers-common: destabilize 0.57.0 for ~arm64 (resolve NonsolvableDepsInStable) This version requires containers-image-5.29.0 in order to avoid a file collsion, but that version was never stabilized for arm64. Fixes: 4ad1a02c2fa3 ("app-containers/containers-common: Make 0.57.0 require older containers-image") Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild index 3a6fabe29163..2d56b46669f2 100644 --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="amd64 arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 4ad1a02c2fa34c183bf564623d5bc4ca7ad7bd10 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 14 19:59:04 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Apr 14 20:06:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad1a02c app-containers/containers-common: Make 0.57.0 require older containers-image This version requires a version of containers-image less than 5.29.2 which provides these files that collide with newer versions of containers-common: /etc/containers/policy.json /etc/containers/registries.d/default.yaml Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild index 0643011c3d6e..3a6fabe29163 100644 --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.ebuild @@ -19,7 +19,7 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image +
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: e85fee1101fc083159109f10a6cdf9a242280e4f Author: Zac Medico gentoo org> AuthorDate: Sun Apr 14 19:27:45 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Apr 14 19:42:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85fee11 app-containers/containers-common: 0.57.0-r1 stable revbump resolves file collisions Use a 0.57.0-r1 stable revbump to resolve file collisions with app-containers/containers-image-5.29.2-r1 which was stabilized for bug 921771. These files have migrated to containers-image: /etc/containers/policy.json /etc/containers/registries.d/default.yaml This file is no longer installed but there is another copy installed in /usr/share/containers: /etc/containers/containers.conf Closes: https://bugs.gentoo.org/930027 Bug: https://bugs.gentoo.org/921771 Signed-off-by: Zac Medico gentoo.org> .../containers-common-0.57.0-r1.ebuild | 60 ++ 1 file changed, 60 insertions(+) diff --git a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild new file mode 100644 index ..3cb764cb31ce --- /dev/null +++ b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Common config files and docs for Containers stack" +HOMEPAGE="https://github.com/containers/common; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git; +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="amd64 arm64 ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RESTRICT="test" +RDEPEND=" + >=app-containers/containers-image-5.29.2 + app-containers/containers-storage + app-containers/containers-shortnames + !=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) + >=app-containers/cni-plugins-0.9.1 + ) +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.2 +" + +src_prepare() { + default + + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die + + # add comments to mounts.conf + eapply "${FILESDIR}/examplify-mounts-conf.patch" +} + +src_compile() { + emake docs +} + +src_install() { + emake DESTDIR="${ED}" install + + insinto /usr/share/containers + doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf + + keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore +}
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 761d7abab7f427b3c361991518ee751a2ab5f860 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Wed Mar 20 20:34:50 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 23 08:29:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761d7aba app-containers/containers-common: 0.58.0-r1 aligning with Podman 5 Podman 5 drops support for CNI, runc and slirp4netns Signed-off-by: Rahil Bhimjiani rahil.rocks> Signed-off-by: Sam James gentoo.org> ...9.ebuild => containers-common-0.58.0-r1.ebuild} | 29 -- .../containers-common-.ebuild | 29 -- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild similarity index 63% copy from app-containers/containers-common/containers-common-.ebuild copy to app-containers/containers-common/containers-common-0.58.0-r1.ebuild index c4d53773f1d9..4a0427e20df7 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common; @@ -19,16 +21,16 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image - app-containers/containers-storage + >=app-containers/aardvark-dns-1.10.0 + >=app-containers/crun-1.14.3 + >=app-containers/containers-image-5.30.0 + >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames + >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] - || ( app-containers/crun app-containers/runc ) - || ( - ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) + >=net-misc/passt-2024.03.20 + >=sys-fs/fuse-overlayfs-1.13 " BDEPEND=" @@ -39,6 +41,14 @@ PATCHES=( "${FILESDIR}/examplify-mounts-conf.patch" ) +DOC_CONTENTS="\n +For rootless operations, one needs to configure subuid(5) and subgid(5)\n +See /etc/sub{uid,gid} to check whether rootless user is already configured\n +If not, quickly configure it with:\n +usermod --add-subuids 1065536-1131071 \n +usermod --add-subgids 1065536-1131071 \n +" + src_prepare() { default @@ -52,9 +62,14 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install + readme.gentoo_create_doc insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore } + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index c4d53773f1d9..4a0427e20df7 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common; @@ -19,16 +21,16 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image - app-containers/containers-storage + >=app-containers/aardvark-dns-1.10.0 + >=app-containers/crun-1.14.3 + >=app-containers/containers-image-5.30.0 + >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames + >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] - || ( app-containers/crun app-containers/runc ) - || ( - ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) + >=net-misc/passt-2024.03.20 + >=sys-fs/fuse-overlayfs-1.13 " BDEPEND=" @@ -39,6 +41,14 @@ PATCHES=( "${FILESDIR}/examplify-mounts-conf.patch" ) +DOC_CONTENTS="\n +For rootless operations, one needs to configure subuid(5) and subgid(5)\n +See /etc/sub{uid,gid} to check whether rootless user is already configured\n +If not, quickly configure it with:\n +usermod --add-subuids 1065536-1131071 \n +usermod --add-subgids 1065536-1131071 \n +" + src_prepare() { default @@ -52,9 +62,14 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install + readme.gentoo_create_doc insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf keepdir
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: d3607794794a591c28d03310bc2307cc18ed8c3d Author: Rahil Bhimjiani rahil rocks> AuthorDate: Wed Mar 6 21:46:05 2024 + Commit: Zac Medico gentoo org> CommitDate: Tue Mar 19 00:59:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3607794 app-containers/containers-common: add 0.58.0 1. Use PATCHES variable instead of eapply Signed-off-by: Rahil Bhimjiani rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/35642 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/Manifest | 1 + ...ntainers-common-.ebuild => containers-common-0.58.0.ebuild} | 7 --- app-containers/containers-common/containers-common-.ebuild | 7 --- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index ac07f9c98804..d683aa50a470 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,2 +1,3 @@ DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928 +DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8 diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-0.58.0.ebuild similarity index 94% copy from app-containers/containers-common/containers-common-.ebuild copy to app-containers/containers-common/containers-common-0.58.0.ebuild index 5a0aa2f26d0b..c4d53773f1d9 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-0.58.0.ebuild @@ -35,14 +35,15 @@ BDEPEND=" >=dev-go/go-md2man-2.0.3 " +PATCHES=( + "${FILESDIR}/examplify-mounts-conf.patch" +) + src_prepare() { default [[ -f docs/Makefile && -f Makefile ]] || die sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die - - # add comments to mounts.conf - eapply "${FILESDIR}/examplify-mounts-conf.patch" } src_compile() { diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index 5a0aa2f26d0b..c4d53773f1d9 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.ebuild @@ -35,14 +35,15 @@ BDEPEND=" >=dev-go/go-md2man-2.0.3 " +PATCHES=( + "${FILESDIR}/examplify-mounts-conf.patch" +) + src_prepare() { default [[ -f docs/Makefile && -f Makefile ]] || die sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die - - # add comments to mounts.conf - eapply "${FILESDIR}/examplify-mounts-conf.patch" } src_compile() {
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 26e58d9fae5c78c0625960dcf483bacb2547e1f8 Author: Zac Medico gentoo org> AuthorDate: Mon Mar 18 03:46:35 2024 + Commit: Zac Medico gentoo org> CommitDate: Mon Mar 18 15:40:36 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26e58d9f app-containers/containers-common: add myself as a maintainer Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/app-containers/containers-common/metadata.xml b/app-containers/containers-common/metadata.xml index 85ca6e13f914..21378d94d99f 100644 --- a/app-containers/containers-common/metadata.xml +++ b/app-containers/containers-common/metadata.xml @@ -5,6 +5,10 @@ me@rahil.rocks Rahil Bhimjiani + +zmed...@gentoo.org +Zac Medico + proxy-ma...@gentoo.org Proxy Maintainers
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/files/, app-containers/containers-common/
commit: 704bbe917fe5ea0edd5a6e40c7ae130bf63aecb0 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Wed Jan 10 19:21:16 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Feb 23 12:53:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704bbe91 app-containers/containers-common: drop 0.56.0 Signed-off-by: Rahil Bhimjiani rahil.rocks> Signed-off-by: Joonas Niilola gentoo.org> app-containers/containers-common/Manifest | 1 - .../containers-common-0.56.0-r1.ebuild | 68 -- .../containers-common/files/fix-warnings.patch | 24 3 files changed, 93 deletions(-) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index ec4699ca6425..ac07f9c98804 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,3 +1,2 @@ -DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928 diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild deleted file mode 100644 index e1dbb2b90daa.. --- a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Common config files and docs for Containers eco-system" -HOMEPAGE="https://github.com/containers/common; - -if [[ ${PV} == ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/common.git; -else - SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="amd64 arm64 ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" -RESTRICT="test" -RDEPEND=" - app-containers/containers-image - app-containers/containers-storage - app-containers/containers-shortnames - !=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) -" - -BDEPEND=" - >=dev-go/go-md2man-2.0.2 -" - -src_prepare() { - default - - [[ -f docs/Makefile ]] || die - sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die - - eapply "${FILESDIR}/fix-warnings.patch" - eapply "${FILESDIR}/examplify-mounts-conf.patch" -} - -src_compile() { - emake docs -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc/containers - # https://github.com/containers/skopeo/raw/main/default-policy.json - doins pkg/config/containers.conf "${FILESDIR}/policy.json" - - insinto /etc/containers/registries.d - # https://github.com/containers/skopeo/raw/main/default.yaml - doins "${FILESDIR}/default.yaml" - - insinto /usr/share/containers - doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf - - keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore -} diff --git a/app-containers/containers-common/files/fix-warnings.patch b/app-containers/containers-common/files/fix-warnings.patch deleted file mode 100644 index 7f9cfe4e196c.. --- a/app-containers/containers-common/files/fix-warnings.patch +++ /dev/null @@ -1,24 +0,0 @@ a/Makefile -+++ b/Makefile -@@ -4,20 +4,5 @@ - DESTDIR ?= --PREFIX := /usr/local -+PREFIX := /usr - CONFIGDIR := ${PREFIX}/share/containers - --define go-build -- CGO_ENABLED=0 \ -- GOOS=$(1) GOARCH=$(2) $(GO) build -tags "$(3)" ./... --endef -- --ifeq ($(shell uname -s),Linux) --define go-build-c -- CGO_ENABLED=1 \ -- GOOS=$(1) GOARCH=$(2) $(GO) build -tags "$(3)" ./... --endef --else --define go-build-c --endef --endif -- - .PHONY:
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: da4f4f93bcfc2b31d18dbf4460fc6693f59cccea Author: Rahil Bhimjiani rahil rocks> AuthorDate: Thu Jan 25 15:30:41 2024 + Commit: Zac Medico gentoo org> CommitDate: Fri Feb 2 06:37:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4f4f93 app-containers/containers-common: add 0.57.3 Signed-off-by: Rahil Bhimjiani rahil.rocks> Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/Manifest | 1 + .../{containers-common-.ebuild => containers-common-0.57.3.ebuild} | 3 +-- app-containers/containers-common/containers-common-.ebuild | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index 0ea2e1ba8627..ec4699ca6425 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,2 +1,3 @@ DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 +DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928 diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-0.57.3.ebuild similarity index 95% copy from app-containers/containers-common/containers-common-.ebuild copy to app-containers/containers-common/containers-common-0.57.3.ebuild index 5eca915dd606..5a0aa2f26d0b 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-0.57.3.ebuild @@ -22,7 +22,6 @@ RDEPEND=" app-containers/containers-image app-containers/containers-storage app-containers/containers-shortnames - !
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 3564a689658ef0dd2e4cd8b92aaea9d3a4d21446 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Thu Jan 11 09:48:19 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jan 20 13:27:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3564a689 app-containers/containers-common: update live Because of upstream changes policy.json and default.yaml has to be moved from containers-common to containers-image Upstream commit: https://github.com/containers/image/commit/45441676e34e6410ae8af6dbb46b6161c5c81a7c Signed-off-by: Rahil Bhimjiani rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/34743 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-.ebuild | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index f96e1c184a69..5eca915dd606 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.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 @@ -53,14 +53,6 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install - insinto /etc/containers - # https://github.com/containers/skopeo/raw/main/default-policy.json - doins pkg/config/containers.conf "${FILESDIR}/policy.json" - - insinto /etc/containers/registries.d - # https://github.com/containers/skopeo/raw/main/default.yaml - doins "${FILESDIR}/default.yaml" - insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 177cedf30549eb97711328f72bf95d23058b2355 Author: Joonas Niilola gentoo org> AuthorDate: Sun Jan 7 06:51:21 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jan 7 06:51:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177cedf3 app-containers/containers-common: Stabilize 0.57.0 amd64, #921435 Signed-off-by: Joonas Niilola gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild index 17c6b0ad0ee3..0643011c3d6e 100644 --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 arm64 ~riscv" + KEYWORDS="amd64 arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 8818f981a898065e933f259f59950c887469cb6c Author: Sam James gentoo org> AuthorDate: Sun Jan 7 06:11:53 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 06:11:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8818f981 app-containers/containers-common: Stabilize 0.57.0 arm64, #921435 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild index f96e1c184a69..17c6b0ad0ee3 100644 --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.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 @@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="~amd64 arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 0c50e695a8fd905fad1dfb26690403aa607114ba Author: Rahil Bhimjiani gmail com> AuthorDate: Fri Nov 17 09:51:06 2023 + Commit: Zac Medico gentoo org> CommitDate: Wed Nov 29 06:16:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c50e695 app-containers/containers-common: add 0.57.0 and update live 1. Removing fix-warnings.patch as I don't see any warnings anymore 2. Add EPREFIX while installing 3. Misc Signed-off-by: Rahil Bhimjiani gmail.com> Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/Manifest| 1 + ...rs-common-.ebuild => containers-common-0.57.0.ebuild} | 12 ++-- .../containers-common/containers-common-.ebuild | 12 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index 6c7325fe1c77..0ea2e1ba8627 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1 +1,2 @@ DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c +DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild similarity index 84% copy from app-containers/containers-common/containers-common-.ebuild copy to app-containers/containers-common/containers-common-0.57.0.ebuild index 8963de7d6a47..f96e1c184a69 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.ebuild @@ -3,10 +3,10 @@ EAPI=8 -DESCRIPTION="Common config files and docs for Containers eco-system" +DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common; -if [[ ${PV} == ** ]]; then +if [[ ${PV} == * ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/containers/common.git; else @@ -39,10 +39,10 @@ BDEPEND=" src_prepare() { default - [[ -f docs/Makefile ]] || die - sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die - eapply "${FILESDIR}/fix-warnings.patch" + # add comments to mounts.conf eapply "${FILESDIR}/examplify-mounts-conf.patch" } @@ -51,7 +51,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install insinto /etc/containers # https://github.com/containers/skopeo/raw/main/default-policy.json diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index 8963de7d6a47..f96e1c184a69 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.ebuild @@ -3,10 +3,10 @@ EAPI=8 -DESCRIPTION="Common config files and docs for Containers eco-system" +DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common; -if [[ ${PV} == ** ]]; then +if [[ ${PV} == * ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/containers/common.git; else @@ -39,10 +39,10 @@ BDEPEND=" src_prepare() { default - [[ -f docs/Makefile ]] || die - sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die - eapply "${FILESDIR}/fix-warnings.patch" + # add comments to mounts.conf eapply "${FILESDIR}/examplify-mounts-conf.patch" } @@ -51,7 +51,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install insinto /etc/containers # https://github.com/containers/skopeo/raw/main/default-policy.json
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: a73df3325ab8dded0b518e9faabcb584086903a4 Author: Sam James gentoo org> AuthorDate: Tue Oct 31 19:52:47 2023 + Commit: Sam James gentoo org> CommitDate: Tue Oct 31 19:52:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73df332 app-containers/containers-common: Stabilize 0.56.0-r1 amd64, #916561 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-0.56.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild index 5041b8771c40..e1dbb2b90daa 100644 --- a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild +++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 arm64 ~riscv" + KEYWORDS="amd64 arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: de28369251924ce2aae434dfd2083525f4d707a5 Author: Sam James gentoo org> AuthorDate: Tue Oct 31 19:20:22 2023 + Commit: Sam James gentoo org> CommitDate: Tue Oct 31 19:20:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de283692 app-containers/containers-common: Stabilize 0.56.0-r1 arm64, #916561 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-0.56.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild index 8963de7d6a47..5041b8771c40 100644 --- a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild +++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="~amd64 arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/, app-containers/containers-common/files/
commit: ad3eecb3f2690c328de4a539d915299c309af7fc Author: Rahil Bhimjiani gmail com> AuthorDate: Tue Oct 31 16:00:53 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 31 17:18:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3eecb3 app-containers/containers-common: drop 0.56.0, fix metadata.xml Signed-off-by: Rahil Bhimjiani gmail.com> Signed-off-by: Mike Gilbert gentoo.org> .../containers-common-0.56.0.ebuild| 76 -- .../containers-common-.ebuild |2 +- app-containers/containers-common/files/mounts.conf |3 - .../containers-common/files/seccomp.json | 1051 app-containers/containers-common/metadata.xml |8 +- 5 files changed, 5 insertions(+), 1135 deletions(-) diff --git a/app-containers/containers-common/containers-common-0.56.0.ebuild b/app-containers/containers-common/containers-common-0.56.0.ebuild deleted file mode 100644 index f2bba24b1975.. --- a/app-containers/containers-common/containers-common-0.56.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Common config files and docs for Containers eco-system" -HOMEPAGE="https://github.com/containers/common; - -if [[ ${PV} == ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/common.git; -else - SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND=" - app-containers/containers-image - app-containers/containers-storage - app-containers/containers-shortnames - net-firewall/nftables - net-firewall/iptables[nftables] - || ( app-containers/crun app-containers/runc ) - || ( - ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) -" - -BDEPEND=" - >=dev-go/go-md2man-2.0.2 -" - -src_prepare() { - default - - [[ -f docs/Makefile ]] || die - sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die - - eapply "${FILESDIR}/fix-warnings.patch" -} - -src_configure() { - return -} - -src_compile() { - emake docs -} - -src_test() { - return -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc/containers - # https://github.com/containers/skopeo/raw/main/default-policy.json - doins pkg/config/containers.conf "${FILESDIR}/policy.json" - - insinto /etc/containers/registries.d - # https://github.com/containers/skopeo/raw/main/default.yaml - doins "${FILESDIR}/default.yaml" - - insinto /usr/share/containers - # https://github.com/containers/common/raw/main/pkg/seccomp/seccomp.json - # https://github.com/containers/common/raw/main/pkg/subscriptions/mounts.conf - doins "${FILESDIR}/seccomp.json" "${FILESDIR}/mounts.conf" - - keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore -} diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index 73407d6e4994..8963de7d6a47 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="Apache-2.0" diff --git a/app-containers/containers-common/files/mounts.conf b/app-containers/containers-common/files/mounts.conf deleted file mode 100644 index 281e1d687f94.. --- a/app-containers/containers-common/files/mounts.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Refer to containers-mounts.conf(5) -# Example: -# /usr/share/rhel/secrets:/run/secrets diff --git a/app-containers/containers-common/files/seccomp.json b/app-containers/containers-common/files/seccomp.json deleted file mode 100644 index 18674db4d62e.. --- a/app-containers/containers-common/files/seccomp.json +++ /dev/null @@ -1,1051 +0,0 @@ -{ - "defaultAction": "SCMP_ACT_ERRNO", - "defaultErrnoRet": 38, - "defaultErrno": "ENOSYS", - "archMap": [ - { - "architecture": "SCMP_ARCH_X86_64", - "subArchitectures": [ - "SCMP_ARCH_X86", - "SCMP_ARCH_X32" - ] - }, - { - "architecture": "SCMP_ARCH_AARCH64", -
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 96a0b66a3c991459a237790ff54b3c62d2a5edf8 Author: Yixun Lan gentoo org> AuthorDate: Wed Sep 27 14:59:07 2023 + Commit: Yixun Lan gentoo org> CommitDate: Wed Sep 27 15:00:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a0b66a app-containers/containers-common: Keyword 0.56.0-r1 riscv, #914624 Signed-off-by: Yixun Lan gentoo.org> app-containers/containers-common/containers-common-0.56.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild index a0b2b2c3a20d..8963de7d6a47 100644 --- a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild +++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 742bb6e3d49024dc351d9e29cbf3704850ee2690 Author: Sam James gentoo org> AuthorDate: Mon Sep 25 04:48:05 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 25 04:48:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742bb6e3 app-containers/containers-common: Keyword 0.56.0-r1 arm64, #914624 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-0.56.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild index 73407d6e4994..a0b2b2c3a20d 100644 --- a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild +++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then else SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/, app-containers/podman/
commit: 275aeff423d63b6cdde5b508f59d5af5248f16c0 Author: Rahil Bhimjiani gmail com> AuthorDate: Sun Sep 24 10:49:19 2023 + Commit: Zac Medico gentoo org> CommitDate: Mon Sep 25 03:45:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275aeff4 app-containers/podman: add 4.5.0-r1 few improvements to ebuild. 1) use shell-completion.eclass replacing bash-completino-r1 2) add app-containers/containers-common as dep & adjust other deps 3) dont install seccomp.json,policy.json,registries.conf as it is installed by containers-common 4) removed non-amd64 keywords as containers-common is only available on amd64 for now I'll soon be working on podman version bump with live version too. Closes: https://github.com/gentoo/gentoo/pull/33030 Closes: https://bugs.gentoo.org/902569 Closes: https://bugs.gentoo.org/849863 Closes: https://bugs.gentoo.org/914597 Signed-off-by: Rahil Bhimjiani gmail.com> Signed-off-by: Zac Medico gentoo.org> .../containers-common-0.56.0-r1.ebuild | 68 ++ app-containers/podman/podman-4.5.0-r1.ebuild | 149 + 2 files changed, 217 insertions(+) diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild new file mode 100644 index ..73407d6e4994 --- /dev/null +++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Common config files and docs for Containers eco-system" +HOMEPAGE="https://github.com/containers/common; + +if [[ ${PV} == ** ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git; +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RESTRICT="test" +RDEPEND=" + app-containers/containers-image + app-containers/containers-storage + app-containers/containers-shortnames + !=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) + >=app-containers/cni-plugins-0.9.1 + ) +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.2 +" + +src_prepare() { + default + + [[ -f docs/Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die + + eapply "${FILESDIR}/fix-warnings.patch" + eapply "${FILESDIR}/examplify-mounts-conf.patch" +} + +src_compile() { + emake docs +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc/containers + # https://github.com/containers/skopeo/raw/main/default-policy.json + doins pkg/config/containers.conf "${FILESDIR}/policy.json" + + insinto /etc/containers/registries.d + # https://github.com/containers/skopeo/raw/main/default.yaml + doins "${FILESDIR}/default.yaml" + + insinto /usr/share/containers + doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf + + keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore +} diff --git a/app-containers/podman/podman-4.5.0-r1.ebuild b/app-containers/podman/podman-4.5.0-r1.ebuild new file mode 100644 index ..8d2ad1f49bc1 --- /dev/null +++ b/app-containers/podman/podman-4.5.0-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +EGIT_COMMIT="75e3c12579d391b81d871fd1cded6cf0d043550a" + +inherit shell-completion flag-o-matic go-module tmpfiles + +DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" +HOMEPAGE="https://github.com/containers/podman/ https://podman.io/; +MY_PN=podman +MY_P=${MY_PN}-${PV} +SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux" +RESTRICT="test" + +COMMON_DEPEND=" + app-crypt/gpgme:= + >=app-containers/containers-common-0.56.0 + >=app-containers/conmon-2.0.0 + cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) + !cgroup-hybrid? ( app-containers/crun ) + dev-libs/libassuan:= + dev-libs/libgpg-error:= + sys-apps/shadow:= + sys-fs/lvm2 + sys-libs/libseccomp:= + + apparmor? ( sys-libs/libapparmor ) + btrfs? ( sys-fs/btrfs-progs ) + init? ( app-containers/catatonit ) + rootless? ( app-containers/slirp4netns ) + selinux? ( sys-libs/libselinux:= ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-md2man" +RDEPEND="${COMMON_DEPEND} + fuse? ( sys-fs/fuse-overlayfs ) + selinux? (
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/, app-containers/containers-common/files/
commit: 9b045bfa3778f78b53823fb54511ac39f981a67e Author: Rahil Bhimjiani gmail com> AuthorDate: Mon Sep 25 02:36:17 2023 + Commit: Zac Medico gentoo org> CommitDate: Mon Sep 25 03:45:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b045bfa app-containers/containers-common: update live add blocker for podman, use upstream files as much as possible, remove redundant functions Closes: https://github.com/gentoo/gentoo/pull/33044 Signed-off-by: Rahil Bhimjiani gmail.com> Signed-off-by: Zac Medico gentoo.org> .../containers-common/containers-common-.ebuild | 16 .../containers-common/files/examplify-mounts-conf.patch | 7 +++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild index f2bba24b1975..73407d6e4994 100644 --- a/app-containers/containers-common/containers-common-.ebuild +++ b/app-containers/containers-common/containers-common-.ebuild @@ -17,11 +17,12 @@ fi LICENSE="Apache-2.0" SLOT="0" - +RESTRICT="test" RDEPEND=" app-containers/containers-image app-containers/containers-storage app-containers/containers-shortnames + !https://github.com/containers/common/raw/main/pkg/seccomp/seccomp.json - # https://github.com/containers/common/raw/main/pkg/subscriptions/mounts.conf - doins "${FILESDIR}/seccomp.json" "${FILESDIR}/mounts.conf" + doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore } diff --git a/app-containers/containers-common/files/examplify-mounts-conf.patch b/app-containers/containers-common/files/examplify-mounts-conf.patch new file mode 100644 index ..eeaca09d5f1e --- /dev/null +++ b/app-containers/containers-common/files/examplify-mounts-conf.patch @@ -0,0 +1,7 @@ +--- a/pkg/subscriptions/mounts.conf a/pkg/subscriptions/mounts.conf +@@ -1 +1,3 @@ +-/usr/share/rhel/secrets:/run/secrets ++# Refer to containers-mounts.conf(5) ++# Example: ++# /usr/share/rhel/secrets:/run/secrets
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/, app-containers/containers-common/files/
commit: 2941140a0760ca358eecc44391a79479f024a3de Author: Rahil Bhimjiani gmail com> AuthorDate: Thu Sep 21 18:34:24 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 21 22:16:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2941140a app-containers/containers-common: add 0.56.0 and live Common configs & docs for Containers eco-system (i.e. podman buildah skopeo...) Go realm, executables are all in compiled, static, tidy in one binary but docs & configs...OMG all over the place. Spent whole day coding all these (such noob, I know), but was fun & fulfilling. Once this is merged the foundation of podman-stack is built, so will proceed to update frontend packages of eco-system. Closes: https://bugs.gentoo.org/907805 Closes: https://bugs.gentoo.org/904433 Closes: https://bugs.gentoo.org/914456 Closes: https://bugs.gentoo.org/907804 Signed-off-by: Rahil Bhimjiani gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32976 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/Manifest |1 + .../containers-common-0.56.0.ebuild| 76 ++ .../containers-common-.ebuild | 76 ++ .../containers-common/files/default.yaml | 28 + .../containers-common/files/fix-warnings.patch | 24 + app-containers/containers-common/files/mounts.conf |3 + app-containers/containers-common/files/policy.json | 14 + .../containers-common/files/seccomp.json | 1051 app-containers/containers-common/metadata.xml | 17 + 9 files changed, 1290 insertions(+) diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest new file mode 100644 index ..6c7325fe1c77 --- /dev/null +++ b/app-containers/containers-common/Manifest @@ -0,0 +1 @@ +DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c diff --git a/app-containers/containers-common/containers-common-0.56.0.ebuild b/app-containers/containers-common/containers-common-0.56.0.ebuild new file mode 100644 index ..f2bba24b1975 --- /dev/null +++ b/app-containers/containers-common/containers-common-0.56.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Common config files and docs for Containers eco-system" +HOMEPAGE="https://github.com/containers/common; + +if [[ ${PV} == ** ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git; +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + app-containers/containers-image + app-containers/containers-storage + app-containers/containers-shortnames + net-firewall/nftables + net-firewall/iptables[nftables] + || ( app-containers/crun app-containers/runc ) + || ( + ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) + >=app-containers/cni-plugins-0.9.1 + ) +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.2 +" + +src_prepare() { + default + + [[ -f docs/Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die + + eapply "${FILESDIR}/fix-warnings.patch" +} + +src_configure() { + return +} + +src_compile() { + emake docs +} + +src_test() { + return +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc/containers + # https://github.com/containers/skopeo/raw/main/default-policy.json + doins pkg/config/containers.conf "${FILESDIR}/policy.json" + + insinto /etc/containers/registries.d + # https://github.com/containers/skopeo/raw/main/default.yaml + doins "${FILESDIR}/default.yaml" + + insinto /usr/share/containers + # https://github.com/containers/common/raw/main/pkg/seccomp/seccomp.json + # https://github.com/containers/common/raw/main/pkg/subscriptions/mounts.conf + doins "${FILESDIR}/seccomp.json" "${FILESDIR}/mounts.conf" + + keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore +} diff --git a/app-containers/containers-common/containers-common-.ebuild b/app-containers/containers-common/containers-common-.ebuild new file mode 100644 index ..f2bba24b1975 --- /dev/null +++ b/app-containers/containers-common/containers-common-.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the