gentoo auto-resync : 12:10:2024 - 04:04:10

3 files changed, 85 insertions, 8 deletions

diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 7b6816067da7..c63b2f9db8cb 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -2,8 +2,10 @@ AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46
 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
+DIST containers-common-0.60.4.tar.gz 13106900 BLAKE2B 1afb428044bc8eebd002b884f2a2072971cd83fca561fd509b83088ccdf82b3a62d63ff32ec5ef856c3d0ee0ffac316201fa8f1d7956153ce30e2244cc860f02 SHA512 5d61415d4959486223a36ff98304363a558e6da9ccbdca94f976649a37d404ac00c8454019f60a79360029c91c9565d22868b109dbb84c19f13377e0e23dcc4d
 EBUILD containers-common-0.57.0-r1.ebuild 1469 BLAKE2B f83e531ffd457701110bac047423efc64de104efb3fe8343bd572f7742b2c340a2c11528ddadca19da6e98dcc4549ad458be3e76a587f46efede14b199c5af54 SHA512 4c7edd8ea8580e080ab96e8a833f37be236db8d7fb6370e0a8b205daac659947d27d549f0038ee7908cdbd8bcdc0e91f93ee7338d85a396d38b2e0dc1bfd1e53
 EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-0.59.1.ebuild 1836 BLAKE2B 0b728de99ccc6f80ae8f2709d3a3362faa39467023e87b552a020f42efac3a8c7dc36d408df091eed96655ad50fcd84afe53be3525a53e92065b2f0825542152 SHA512 f2c79608f8737cfdfd76aa6607feffada0db5dfd208218aca536d6789e456ed420a71a4a72a2b9383a782b22276c0a5c89b00cb6ca40132005ece4a9abcc4532
-EBUILD containers-common-9999.ebuild 1838 BLAKE2B 8453c4b4e7c46157c7118aab83658720b3695f70ad78d16c258f85463aa008efeaec4b2824410c7070912367bd963f67b4c58bedb71f1197a2737e030acc8238 SHA512 6ec92807a3f7343150cdec8906b95e60f32c1c5719c5f79a866ccd64c9fce9ad4401c4d0c05b350838233f0f50afffdf0063ad9ad9aea3057a57f0c6ed04792c
+EBUILD containers-common-0.60.4.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
+EBUILD containers-common-9999.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.60.4.ebuild b/app-containers/containers-common/containers-common-0.60.4.ebuild
new file mode 100644
index 000000000000..985ebb5c0ca4
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.60.4.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 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	>=app-containers/aardvark-dns-1.12.0
+	>=app-containers/crun-1.17
+	>=app-containers/containers-image-5.32.0
+	>=app-containers/containers-storage-1.55.0
+	app-containers/containers-shortnames
+	>=app-containers/netavark-1.12.0
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	>=net-misc/passt-2024.09.06
+	>=sys-fs/fuse-overlayfs-1.14
+"
+
+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/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index deb362fc0d3b..985ebb5c0ca4 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -21,16 +21,16 @@ 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/aardvark-dns-1.12.0
+	>=app-containers/crun-1.17
+	>=app-containers/containers-image-5.32.0
+	>=app-containers/containers-storage-1.55.0
 	app-containers/containers-shortnames
-	>=app-containers/netavark-1.10.3
+	>=app-containers/netavark-1.12.0
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
-	>=net-misc/passt-2024.03.20
-	>=sys-fs/fuse-overlayfs-1.13
+	>=net-misc/passt-2024.09.06
+	>=sys-fs/fuse-overlayfs-1.14
 "
 
 BDEPEND="