gentoo auto-resync : 02:02:2024 - 11:45:20

4 files changed, 146 insertions, 9 deletions

diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index f180b84b69db..a82b30a10f63 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,7 +1,10 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
+AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
 DIST containers-image-5.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf
 DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0 SHA512 5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869
+DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
 EBUILD containers-image-5.28.0.ebuild 806 BLAKE2B 0e8bc9c407a1d6951ccc8faa053a8c2634c013a3c556f970bb2d6e16e5dce371cdaf9c343c533c455ce856d25d50b8c48bbb3744c06ee326d92ba9049cb34b70 SHA512 cb5c1ab825791ed3e856c87394fbe827e3dec8c40857201a5f02f6d50a32859cceb18e073455670f28e2b5ad6b7c7fe966eec2c2166bbb516b15d3ac0f100281
 EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
-EBUILD containers-image-9999.ebuild 742 BLAKE2B 15567e62ad04fa2605ddef7edb2a4e356235ef664bced96eff5f6e8a90197e4678e2ed7fabf826bf0e56a6a85953484e76930c6b214d100b0c214de4343e59c8 SHA512 5eeb9b83dde0647458f5614c711fbb8865357a926a7527f31659d500af8152599989507f4a5a949e21f7ca261fb84c27768c993524156962f75868af000b1201
+EBUILD containers-image-5.29.2.ebuild 837 BLAKE2B d1db62b98283a3fe71401ed0b1c79303b2c2cd99da409f67566158ba691e48f88da6f7114d64f114d3da3361528da935ce484ccf80504119b5ae753157af52c0 SHA512 e7eb31c64c498cdeff6b08ad0e688c3d712ed072b28420441aa9dd9e124dc2430fb233c316816b1a14a96f24d136570ad48c1b51d9396b6df16fe4b7993dba99
+EBUILD containers-image-9999.ebuild 772 BLAKE2B 9f5e2c2e4fa8e9cdc001100ea888e6dba211492b98ba4ba5fbe540611ba386f27f97141634b697185e0fdb9b10d0e39d1482392c8376be8aff6a06bcac027cc8 SHA512 766acfad54db8b4e902947f6dbad65eda12bc15ce4fc1f8e151fe71b2f6748611462228455149efa2da4345c10964d8db84b391478b2d2903d01fc5dab3bf203
 MISC metadata.xml 627 BLAKE2B 3853a7a5cd67aa9162b4e6a198369680070780508e03dadd3e90e7551d94e1bcd1c1220281905f8fb99611ef55bc171eab5e8c15be89e26c553f1b3299bc9d1a SHA512 f1d276a06c7af474488bfa76cc2cab6fa96fa7f4d3938c3016d9b6692dfeb943e3fad8f29310de26d475077b73457739d84ff90eb61bf532abd5c330bf61b91c
diff --git a/app-containers/containers-image/containers-image-5.29.2.ebuild b/app-containers/containers-image/containers-image-5.29.2.ebuild
new file mode 100644
index 000000000000..0a3bb536ab4f
--- /dev/null
+++ b/app-containers/containers-image/containers-image-5.29.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Default config and docs related to Containers' images"
+HOMEPAGE="https://github.com/containers/image"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/image.git"
+else
+	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
+PATCHES=(
+	"${FILESDIR}"/moving-policy-json-default-yaml.patch
+)
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index 7e9e9b9dad81..4fb96c1222c3 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-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
@@ -12,18 +12,15 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/fix-warnings.patch"
-}
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
 
 src_compile() {
 	emake docs
diff --git a/app-containers/containers-image/files/moving-policy-json-default-yaml.patch b/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
new file mode 100644
index 000000000000..1713839371a5
--- /dev/null
+++ b/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
@@ -0,0 +1,100 @@
+From 45441676e34e6410ae8af6dbb46b6161c5c81a7c Mon Sep 17 00:00:00 2001
+From: Rahil Bhimjiani <me@rahil.website>
+Date: Thu, 7 Dec 2023 14:12:26 +0530
+Subject: [PATCH] Moving policy.json and default.yaml from containers/skopeo
+
+It makes more sense to keep these 2 files along with their man
+pages...in c/image
+https://github.com/containers/common/pull/1757
+
+Signed-off-by: Rahil Bhimjiani <me@rahil.website>
+---
+ Makefile            | 11 +++++++++++
+ default-policy.json | 14 ++++++++++++++
+ default.yaml        | 27 +++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+)
+ create mode 100644 default-policy.json
+ create mode 100644 default.yaml
+
+diff --git a/Makefile b/Makefile
+index f329ef083..5e9799b19 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,6 +24,13 @@ GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man')
+ MANPAGES_MD = $(wildcard docs/*.5.md)
+ MANPAGES ?= $(MANPAGES_MD:%.md=%)
+ 
++ifeq ($(shell uname -s),FreeBSD)
++CONTAINERSCONFDIR ?= /usr/local/etc/containers
++else
++CONTAINERSCONFDIR ?= /etc/containers
++endif
++REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
++
+ # N/B: This value is managed by Renovate, manual changes are
+ # possible, as long as they don't disturb the formatting
+ # (i.e. DO NOT ADD A 'v' prefix!)
+@@ -46,6 +53,10 @@ install-docs: docs
+ 	install -m 644 docs/*.5 ${MANINSTALLDIR}/man5/
+ 
+ install: install-docs
++	install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
++	install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
++	install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
++	install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
+ 
+ cross:
+ 	GOOS=windows $(MAKE) build BUILDTAGS="$(BUILDTAGS) $(BUILD_TAGS_WINDOWS_CROSS)"
+diff --git a/default-policy.json b/default-policy.json
+new file mode 100644
+index 000000000..dffc54a62
+--- /dev/null
++++ b/default-policy.json
+@@ -0,0 +1,14 @@
++{
++    "default": [
++        {
++            "type": "insecureAcceptAnything"
++        }
++    ],
++    "transports":
++        {
++            "docker-daemon":
++                {
++                    "": [{"type":"insecureAcceptAnything"}]
++                }
++        }
++}
+diff --git a/default.yaml b/default.yaml
+new file mode 100644
+index 000000000..9e892d760
+--- /dev/null
++++ b/default.yaml
+@@ -0,0 +1,27 @@
++# This is a default registries.d configuration file.  You may
++# add to this file or create additional files in registries.d/.
++#
++# lookaside: for reading/writing simple signing signatures
++# lookaside-staging: for writing simple signing signatures, preferred over lookaside
++#
++# lookaside and lookaside-staging take a value of the following:
++#   lookaside:  {schema}://location
++#
++# For reading signatures, schema may be http, https, or file.
++# For writing signatures, schema may only be file.
++
++# The default locations are built-in, for both reading and writing:
++# /var/lib/containers/sigstore for root, or
++# ~/.local/share/containers/sigstore for non-root users.
++default-docker:
++#  lookaside: https://…
++#  lookaside-staging: file:///…
++
++# The 'docker' indicator here is the start of the configuration
++# for docker registries.
++#
++# docker:
++#
++#   privateregistry.com:
++#    lookaside: https://privateregistry.com/sigstore/
++#    lookaside-staging: /mnt/nfs/privateregistry/sigstore