gentoo auto-resync : 16:01:2025 - 06:41:40

3 files changed, 0 insertions, 112 deletions

diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 29b8da3ec8c9..2bf02cf916e4 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,6 +1,4 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
-AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
-AUX prevent-downloading-mods-5.29.2.patch 322 BLAKE2B b3358abc9a9850a24153d188289068e3a8482a7b30e56b9440694ab78c04c37f10f5e3f31a24e82cbbe2f4c365d0df3dc5ccea1778df6dc9fe3dc12977169bf6 SHA512 1c78ae9dd35c7e8546984b32e149f29beaf955fe673264c0a3ea45b86046fa1628b5f74696f7224fcffbf54fc642d696848d0530beadf41be0084e4d77992a04
 DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
 DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
 EBUILD containers-image-5.30.0.ebuild 876 BLAKE2B 33c68c540357f5741622eadc8d6052a9fe916aebc4b490048eb0fe567f339534e3c4905b6a0549a3a24c2ac84438e9f80fff77d185846489df015e8ac58b7433 SHA512 0cda4908a4dd9e1c369053bd62cd78cf06b9e3e3286d4935e1359e2688b3428bd278961a54a09ad0584e565764a95f4cf0ce9b3d3baf8ed66ff0405c8cf059a2
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
deleted file mode 100644
index 1713839371a5..000000000000
--- a/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-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
diff --git a/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch b/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
deleted file mode 100644
index 8d70156bfb6f..000000000000
--- a/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,6 @@
- BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
- BUILDFLAGS := -tags "$(BUILDTAGS)"
- 
--PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
- SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
- 
- PREFIX ?= ${DESTDIR}/usr