gentoo auto-resync : 28:08:2024 - 12:00:19

7 files changed, 102 insertions, 11 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 1507f9b760f8..6a310b81101c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 5adf33067286..bc05577394b6 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -2,6 +2,8 @@ AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e
 AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5b5d45216275715e3acffa8c0c98309d81298795ac007bde02d2f3afd466c7c54e58012a12f156198f SHA512 f31b088e988beb84ef029992255018561417c0e92803dffe35ec481515e1be79ba4611cc139bb5000b0ac79a437f1a6dec3516d6f9580d4b384f1e0f092d8370
 DIST containerd-1.7.15.tar.gz 10071827 BLAKE2B 91de9b7d777d53ecdab4af5bbb0d4ccbe755e4cf0fb7bc99a7bb15c66e0e11ad30aa2af685e0e8b0df80dbeef451704fa056a04b460d92adceebd290977febfc SHA512 84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f
 DIST containerd-1.7.19.tar.gz 10157428 BLAKE2B 3f51d63d4280a11ffe308c3e65df2fefdd91f543169501cf361bb8c6d5085b6b606cc3425508246ce872c86a475e2d195dd2473fee89a47548cfdfbd810307c2 SHA512 cb58bf5148381f9f0eba096e159592f294f887c5b17f8aaf6de8fed80c515abf4f08c849bbbd266dd85ede09fe709bf7d15a61a749f1136456329c47508dbe34
+DIST containerd-1.7.21.tar.gz 10188737 BLAKE2B 0a3eef5bd97b4249963d6e6b80652e2abef0ac7ece726d15efc3b1d364b3525ac7602afecfde3d376bdbec7d5ca39636e09dd8d2a96c420012ef4232afc2a6dd SHA512 fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75
 EBUILD containerd-1.7.15.ebuild 1976 BLAKE2B 038a302335d730a6b0c8b6caeb0672beabd7ef48d2a24ec3a317be6d15b41e00551cd95594d575b68fcec6f28757980f91ffbe41cb975bc220168e4963cacf48 SHA512 1fde07b64582f154e76728dd307b4fff449c368ab50c92f68750540ed4805aa383edf400aed1ea8fdc2e52f9a10b61efeddad9ed8f2412b205dfc443c53e771d
 EBUILD containerd-1.7.19.ebuild 1979 BLAKE2B 03d3bf66fc47d66746d96b00d83fc52912beff1e286bb7bbaefddcbeb2f6e6279cf0a51ac4d55d56be80dccc9b62183052e951f5f03e7584cfcb1f2172b72c82 SHA512 a4100422feedc666778ec6e284c1cb9f84704305b281c76ed2a9c012f92cbfa598d2ffac62d1fac57a9280f9d50606b6207e7bf9473d607e9bb58d894e904620
+EBUILD containerd-1.7.21.ebuild 2022 BLAKE2B aeb92d5514daca7ccca74f5b5a7fc7d0bc75e3de1aa705ebc09b4fd038ad3f9059807862abfb5850988c60b3f4999eb4bcb4cd9d9366ec6f640e233b548ccb2b SHA512 da76549087389711ca3af88b162ff1c95f225ee60bd3150b8565b4d65aadbaf9ea86f002d0ec332500ed48ea26cf90643b2b685297c709ade8f476d85dad0ca5
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-1.7.21.ebuild b/app-containers/containerd/containerd-1.7.21.ebuild
new file mode 100644
index 000000000000..f558099e86a6
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.21.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=472731909fa34bd7bc9c087e4c27943f9835f111
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+COMMON_DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="
+${COMMON_DEPEND}
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${COMMON_DEPEND}
+	~app-containers/runc-1.1.13[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	rm "${D}"/bin/gen-manpages
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 49dec4f39e01..ba606d013141 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,7 +1,7 @@
 DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101bf457f7fc1c24dff195ce8b478268335419fba5ff51a7b77bb8c0a6e0e6077d83ddb50f2ecf08bf069be89fc4849afd6e SHA512 36297ee3cbf096112ec41db2cd1d06796ddd27a57c4323e71a727e17d3930102710f643a77df9e68cd9b3294a6bb0fdf5565379e9fae7331e25afcd147b0084f
 DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87
-DIST docker-cli-27.0.3-man.tar.xz 79132 BLAKE2B e2c9082c964333ebd221056308f01dd64437a46abdf2be6e4e6dba798a89d04a1dfcc15378f5730140edad8e4235f0c3cc735a0be2efc73b9743174f1cf0d6ae SHA512 966764bfbba457dfed10caebd6509ff3aa452c3b3b9382a321d0dacba62fa13ba494c1561bf95651f92c59084f79cd4b300e10b4d2185edcaaaae1e1e914d5b2
-DIST docker-cli-27.0.3.tar.gz 7107193 BLAKE2B cb00392d5afac1503ed07a9462f3d311fc3f3a5ef6d51c7c49995d8cb234a3b7a3c838fc486cc1fa0b1406774f82c2c1ef7c7b041e398be555c7e030e40f490c SHA512 0f7b0ae0f92f8f91b8141292ee8a86a40f4da18d96772c9107d295a30fe06be08b1673da3a49e9c2d3fd67d55f41696b732451b44aecc863fdd4c55578c201db
+DIST docker-cli-27.1.2-man.tar.xz 79028 BLAKE2B 7813a44dd4625b9b446f4e2250bae472f994427f26c4c403d9140b2ab11e569e1244e44eb56564bd1ff7becb9a72f3bedb7804a9f10ad6c2250aea5ae572caf3 SHA512 a45f6d4785880203a147e26397ad22ad06384b2f7ee0d8598993a77d7ec145175be7fac3d47f826da1c1425885c720edee77f6ddd65986c116907b34a73771c9
+DIST docker-cli-27.1.2.tar.gz 7142511 BLAKE2B ddfe471dd9628660d56ebaf7cdde4ed6c2047b91725c9f9d4bff08cfa8a51637d45dc3b6c0a08fa98c636c2b6c32759bd53e9db6e606c5e77cd21fa409ab12fd SHA512 5c75d32c8e9598282de32ac8a2ebbc2eda712a010449edbd6e66f0652c4e02b124df70596d9f1076de3c4a95920b4cc16c35fb343624de1363557ab48976e153
 EBUILD docker-cli-26.1.0.ebuild 1938 BLAKE2B 34cc509b6258248dd831f0ae25b27b24af357aa97a19a6ec5dd1a6dc1889faf239a69c01cb0ed2b4eabf943aca92f57176fca21614cc29095dddfd9463d1672d SHA512 6e599bcf0ef5e076e722a6c1af9c1c18eb5b9a805201630223dcbd99bd4cc62fe21d1c91c328c930555b3842728ac7eccb1522bb9b5c7c44cae0e0c10ee4a2a0
-EBUILD docker-cli-27.0.3.ebuild 1941 BLAKE2B b64c42bd7261152830b0386bbde68685d8cd91f39b6e5c74e4aea0d4fee9775e7fa59fe09fc8d2ba379dfd259b2db6dc3fa16fe27cd5beaefa469b28dde9878d SHA512 9bb98f90975797aaa26304205792577493d645979f7fe0c8242e74b8bc2711ea1663daf973d8954efc27838fa45c29f1fd27e3bc42eb2ae8280969c0eb4fbb6b
+EBUILD docker-cli-27.1.2.ebuild 1941 BLAKE2B 58e23d7b770b365f1eecabe6328dda37ce3b847353e75f1e4de7665a452c21d4925d915c8a9ecb2110dd97f03e95364d14ef6c55a71bd3850fd5d2eba623061f SHA512 80d53747dc728245c06a908233ff92bebfc7ceeae45e08be8825cd01d63198aef5b8a3c5a089ecb42df3035478b7802ac11138d9ba138ea83534e3e8e5c9e426
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
diff --git a/app-containers/docker-cli/docker-cli-27.0.3.ebuild b/app-containers/docker-cli/docker-cli-27.1.2.ebuild
index 22062e03bf72..c4e3c0432957 100644
--- a/app-containers/docker-cli/docker-cli-27.0.3.ebuild
+++ b/app-containers/docker-cli/docker-cli-27.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-GIT_COMMIT=7d4bcd863a4c863e650eed02a550dfeb98560b83
+GIT_COMMIT=d01f264bccd8bed2e3c038054a04b99533478ab8
 
 EGO_PN="github.com/docker/cli"
 MY_PV=${PV/_/-}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 17676cbb5d69..45735b70ba2d 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,7 +1,7 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 AUX docker-26.1.0-automagic-systemd.patch 355 BLAKE2B 95d2367d5450a15214939c0a080b81a07d3ea3fdaaee921b2fc221949f3737652182366e54af499da5a1597fb1353a29d8935ed0a5e60a805920d3375aa594a1 SHA512 ba694ac1ca135fadc39d1afe0b8fdfaef8d6b9c75cbe4177a51422f972022f3502625c5e5467cd54fe33b2e83acdfe2c524da2a4d37f74376f365d7baaa12bec
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.0.3.tar.gz 16523895 BLAKE2B a86b2bf7ed85216f6a033a2fdb6cb0d545822570463b6b5f218052bf8e9ca3dde0e15ba4872da6370502a985e84ce704f810386b806e7dfb9d40d6d7b497d629 SHA512 bff7084f1bbe7fd6e4241d7172d3445b8ea36ef68ec5ee429a8ee27e1dfa81c1810d8ce07cb4c77f78037725c53d1de565e587d7f96994a653a09ce33e9bc344
+DIST docker-27.1.2.tar.gz 16608463 BLAKE2B 27d8ab2e917c838007f8bc286899ed65e9f9a16d67d77034845ec5b04ef2733887dec3a18c224130823516738fb40c6c731962538b61603e94746e2c32d721a5 SHA512 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92
 EBUILD docker-26.1.0-r1.ebuild 7522 BLAKE2B 9b02ddf1d1a68847be4541e93a01cddbe486907e68eef51c3a87e6012ed5be52c4e31af675ed718ad0e911acbdb856fdc9b127edeaec92f879c778b4bff79bcf SHA512 a3e351d6c33cdea4584c4444902b0277543b7f6f573716225ed0ed8f68aa50422902d03958cce3b1a2ca0d128d1d1edd94247e8d32e063f75990985fa18726f3
-EBUILD docker-27.0.3.ebuild 7525 BLAKE2B e2ab599758ec672eec3ddbdcc4e62ce40f098b1f103d9b7af2cf5fb369964f372f9b7593fa37769c59921a47af91068accc24f134a5cc571e9419d3ca61b601c SHA512 6ed932a7df84fa6bdd930c3be9791cd2ebcab606635434fcc674acad20e4ab7b955c399b1f80b1fe9bd73dd6bd117c9ed0eb6881e5389d395147366abf18869d
+EBUILD docker-27.1.2.ebuild 7498 BLAKE2B 32ea90a0d76fe0441b198708f9a8daac0561d9158eeb01098310bcb977369181224c7877e70a02d746d0390f427a402f5d2ed6db1859c0c57f153f85be068eba SHA512 e8db487f04d11f9b42ff2d1aa124ccda8c75a5f9d101f609266ef1461d4f296b22772a903ffb33514c844b0dd77a733fdae2e786980a6490e18bbc3bf58c2cc8
 MISC metadata.xml 1100 BLAKE2B d7a5f93051eb7d087cadd9788a1607f115deb9e7bb73929efad1815a25633f7c9f66c6e797e0283ba975f573e7a8729b48a70d1b2384c392fab1f7b1e4842a17 SHA512 7637097ccfdcc4d07099d54de4eacbac42cfc0f84aa7da78aa5547fe9c42b3c77e853d15492d0fea467c0c53514068b35c0d34dbe6668c285212d8e2bb5371dc
diff --git a/app-containers/docker/docker-27.0.3.ebuild b/app-containers/docker/docker-27.1.2.ebuild
index 14960218fa63..8b5a0a425043 100644
--- a/app-containers/docker/docker-27.0.3.ebuild
+++ b/app-containers/docker/docker-27.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 EGO_PN=github.com/docker/docker
 MY_PV=${PV/_/-}
 inherit golang-vcs-snapshot linux-info systemd udev
-GIT_COMMIT=662f78c0b1bb5114172427cfcb40491d73159be2
+GIT_COMMIT=f9522e5e96c3ab5a6b8a643d15a92700ca864da6
 
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
 HOMEPAGE="https://www.docker.com/"
@@ -33,8 +33,8 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.15[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.12[apparmor?,seccomp?]
+	>=app-containers/containerd-1.7.20[apparmor?,btrfs?,seccomp?]
+	>=app-containers/runc-1.1.13[apparmor?,seccomp?]
 	!app-containers/docker-proxy
 	container-init? ( >=sys-process/tini-0.19.0[static] )
 	selinux? ( sec-policy/selinux-docker )
@@ -54,7 +54,6 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
 # https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
 PATCHES=(
 	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-	"${FILESDIR}/docker-26.1.0-automagic-systemd.patch"
 )
 
 pkg_setup() {
@@ -259,7 +258,7 @@ src_compile() {
 		fi
 	done
 
-	export SYSTEMD=$(usex systemd 1 0)
+	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
 
 	# build binaries
 	./hack/make.sh dynbinary || die 'dynbinary failed'