From 74f563e3af75b6eaa95b3738e7663b48b042005a Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 4 Jul 2024 12:16:09 +0200
Subject: [PATCH] app-containers/containers-common: Sync with Gentoo

It's from Gentoo commit 66816cd56141b5e1090a3ca21a54ce1fa17baaf5.
---
 .../app-containers/containers-common/Manifest |  2 +
 ...ild => containers-common-0.57.0-r1.ebuild} | 14 ++--
 .../containers-common-0.58.0-r1.ebuild        |  2 +-
 .../containers-common-0.59.1.ebuild           | 75 +++++++++++++++++++
 .../containers-common-9999.ebuild             | 75 +++++++++++++++++++
 .../containers-common/files/default.yaml      | 28 -------
 .../containers-common/files/policy.json       | 14 ----
 7 files changed, 160 insertions(+), 50 deletions(-)
 rename sdk_container/src/third_party/portage-stable/app-containers/containers-common/{containers-common-0.58.0.ebuild => containers-common-0.57.0-r1.ebuild} (85%)
 create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.59.1.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/default.yaml
 delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/policy.json

diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest
index 8eb921d5d6..09300934cd 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest
@@ -1 +1,3 @@
+DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
 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/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
similarity index 85%
rename from sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0.ebuild
rename to sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
index c4d53773f1..3cb764cb31 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
@@ -12,16 +12,17 @@ if [[ ${PV} == 9999* ]]; 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"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
-	app-containers/containers-image
+	>=app-containers/containers-image-5.29.2
 	app-containers/containers-storage
 	app-containers/containers-shortnames
+	!<app-containers/podman-4.5.0-r1
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
 	|| ( app-containers/crun app-containers/runc )
@@ -32,18 +33,17 @@ RDEPEND="
 "
 
 BDEPEND="
-	>=dev-go/go-md2man-2.0.3
+	>=dev-go/go-md2man-2.0.2
 "
 
-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/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
index c575546027..4a0427e20d 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; 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"
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.59.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.59.1.ebuild
new file mode 100644
index 0000000000..c575546027
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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} == 9999* ]]; 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 <rootless user>\n
+usermod --add-subgids 1065536-1131071 <rootless user>\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
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild
new file mode 100644
index 0000000000..4a0427e20d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.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} == 9999* ]]; 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 <rootless user>\n
+usermod --add-subgids 1065536-1131071 <rootless user>\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
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/default.yaml b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/default.yaml
deleted file mode 100644
index a7f3d28231..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/default.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/policy.json b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/policy.json
deleted file mode 100644
index dffc54a626..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/files/policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "default": [
-        {
-            "type": "insecureAcceptAnything"
-        }
-    ],
-    "transports":
-        {
-            "docker-daemon":
-                {
-                    "": [{"type":"insecureAcceptAnything"}]
-                }
-        }
-}