From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- app-containers/Manifest.gz | Bin 8737 -> 8727 bytes app-containers/containers-common/Manifest | 2 - .../containers-common/files/default.yaml | 28 ----------- app-containers/containers-common/files/policy.json | 14 ------ app-containers/distrobox/Manifest | 4 -- app-containers/distrobox/distrobox-1.7.1.ebuild | 35 -------------- app-containers/distrobox/distrobox-1.7.2.0.ebuild | 35 -------------- app-containers/lxd/Manifest | 1 - .../files/lxd-5.0.3-btrfs-quota-group-fix.patch | 52 --------------------- 9 files changed, 171 deletions(-) delete mode 100644 app-containers/containers-common/files/default.yaml delete mode 100644 app-containers/containers-common/files/policy.json delete mode 100644 app-containers/distrobox/distrobox-1.7.1.ebuild delete mode 100644 app-containers/distrobox/distrobox-1.7.2.0.ebuild delete mode 100644 app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 1e0fe883643b..0bee59fa7b32 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest index 43839f44d2ac..acf32fdb91c7 100644 --- a/app-containers/containers-common/Manifest +++ b/app-containers/containers-common/Manifest @@ -1,6 +1,4 @@ -AUX default.yaml 978 BLAKE2B ab316e77c296f0ea9e51788bd62cf3abbbc0fb5b3f630acfd8d138f61802477f3d1bc75bd538200bebadd11637baf88e5ecc602db459bfa335d77704bae437e2 SHA512 84c9e1dab4d071d74a6dc8e1f02dae948e81a7e7af1810860a320c8857cf69e354e3d8c87ead2e4c15f80a1ca144116c08b0715bdd97ffc5ae2bfea3883d73e5 AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46b8581a062729bd90792bea8ea3a9549c4cc4d445198eda05ef4673391aa8bff6616918fab427fb2c9973e81484e1 SHA512 2f1aaadca8644c6e7062ac7d79864297b3bcd34c4c84a6d2651ac24e159fae8773cc240d0916f27354e394ab701a4339c15d5dde6957d61f5b153677a5bebca1 -AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914ec52904dadded467ff131d90b337bf7534d533e478420a0c81599858a9012668bc4d1815144f SHA512 120f43f579f48758af6b8292fc2cfbcb5ecc46564d2d16afb74dbd1c043de44daec6633ff585b0046c55fd48aed6dbc2901623c753ec13670d3fdcecb19a42c5 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/app-containers/containers-common/files/default.yaml b/app-containers/containers-common/files/default.yaml deleted file mode 100644 index a7f3d2823136..000000000000 --- a/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/app-containers/containers-common/files/policy.json b/app-containers/containers-common/files/policy.json deleted file mode 100644 index dffc54a62647..000000000000 --- a/app-containers/containers-common/files/policy.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "default": [ - { - "type": "insecureAcceptAnything" - } - ], - "transports": - { - "docker-daemon": - { - "": [{"type":"insecureAcceptAnything"}] - } - } -} diff --git a/app-containers/distrobox/Manifest b/app-containers/distrobox/Manifest index 6e59afc51d7e..b82d14ba7757 100644 --- a/app-containers/distrobox/Manifest +++ b/app-containers/distrobox/Manifest @@ -1,8 +1,4 @@ -DIST distrobox-1.7.1.tar.gz 6885484 BLAKE2B c4b2710d7f1cff7baee2e340a79345359e9906e508e8b1bc351a7b8ee2d8d2e1cb13c381e40231f8c962542e37e32988d04a687810bdfd7ec917868944c51cf3 SHA512 a86a49b9f6158af3172369a201ce3852a349258c46ebb8dfb269f7b96dfbe2bf2fe9f80a5cf9b9236432d99f4f67fb3d95ab4663964fcdb0f888d48cbdd82c39 -DIST distrobox-1.7.2.0.tar.gz 6888905 BLAKE2B f74301464f3b590f246871be1a381771e0fccbd42a933b9d2a58874eb97e49ae73676f7267b56dc7facefdba6cac1fc3df52d55ef826c0d79c90bbe9e0955af7 SHA512 ae5c9ef7ee63beec6b99488091cdb5bc73dfb219988a71c624af2278ea2efc775895ae2106c6bc35783a317b5b3e92fceed2fdba5be05f94028d28a7a2fb8ce1 DIST distrobox-1.7.2.1.tar.gz 6888919 BLAKE2B 1fd4e49585f686cf9f434c3285935bdda1131684b74dfcc20b018ab9853fb13516f3dbaf7c16b9ea55a0d038e3d9eb297bcea74c95755fbe60ef6512a9ce0df8 SHA512 aaf4324a9a31844dc08a6cc4e06d3b725675c92df01b558e733c96701d7e9700baabc1afad97ce5e2a8e2345defcea71c85f0ea6667249316f850aeca5aea149 -EBUILD distrobox-1.7.1.ebuild 746 BLAKE2B acf4ad5520af4d0d96b7af6160b4f274caedb7b0b23c1a37c8bdfd3fb43b1c4b695f72062d4bba3e79993a081c0ccf6d33678aec43b52f2714f4b9723782f080 SHA512 dc48796ccb252eb1dc422567af37c3aec58831dd6450476af2efe1a04d7aff41333c1ac6d4762bc914ad6ba5c7f1a91be7a513b78a4fdbf13ed9c1cf3a49e8d5 -EBUILD distrobox-1.7.2.0.ebuild 734 BLAKE2B 391976f5651c6072522ceb8439f16217d4ae674939b051633b0d32fe2bcd55950e1636665eed225031f672d339ab4fa984e0efb30254e237feb4d60bf14d09ec SHA512 ff39262d7637f63373dc2068ef5887c4d7f30c0fe6225dd25c4485a54beff7cfb8c8838d6d7615bb855ea03ec9d3a965bbddeba63910ba8017f9ab1e820805ff EBUILD distrobox-1.7.2.1.ebuild 734 BLAKE2B 391976f5651c6072522ceb8439f16217d4ae674939b051633b0d32fe2bcd55950e1636665eed225031f672d339ab4fa984e0efb30254e237feb4d60bf14d09ec SHA512 ff39262d7637f63373dc2068ef5887c4d7f30c0fe6225dd25c4485a54beff7cfb8c8838d6d7615bb855ea03ec9d3a965bbddeba63910ba8017f9ab1e820805ff EBUILD distrobox-9999.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a MISC metadata.xml 957 BLAKE2B a02f57f2c65a9241edbc6a1e99170712ceca000977c2271ba51c5311e7718471585ea791ed8c978a86a961d02450623c05b5f9006d4386be2130df08341b0e49 SHA512 65f455bcfd246a8de0084e1534dc85f09435f1fad2590ba87dda0bed90d8fa976d3fad2142b2006a596e713d3d91f0d3d3156017cebacf9dc7883596edb0740f diff --git a/app-containers/distrobox/distrobox-1.7.1.ebuild b/app-containers/distrobox/distrobox-1.7.1.ebuild deleted file mode 100644 index a49244c1584d..000000000000 --- a/app-containers/distrobox/distrobox-1.7.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)" -HOMEPAGE="https://distrobox.privatedns.org/ - https://github.com/89luca89/distrobox/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/89luca89/${PN}.git" -else - SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="GPL-3" # GPL-3.0-only ! -SLOT="0" - -RDEPEND=" - || ( - app-containers/docker - app-containers/podman - ) -" - -src_install() { - sh ./install --prefix "${ED}/usr" || die "${PN} install script failed" - - dodoc *.md -} diff --git a/app-containers/distrobox/distrobox-1.7.2.0.ebuild b/app-containers/distrobox/distrobox-1.7.2.0.ebuild deleted file mode 100644 index 3d1b2ae515fe..000000000000 --- a/app-containers/distrobox/distrobox-1.7.2.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)" -HOMEPAGE="https://distrobox.it/ - https://github.com/89luca89/distrobox/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/89luca89/${PN}.git" -else - SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="GPL-3" # GPL-3.0-only ! -SLOT="0" - -RDEPEND=" - || ( - app-containers/docker - app-containers/podman - ) -" - -src_install() { - sh ./install --prefix "${ED}/usr" || die "${PN} install script failed" - - dodoc *.md -} diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 51250745b58c..60ff06d30264 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -2,7 +2,6 @@ AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df11 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 AUX lxd-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4 AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537b27f5e9b84eb36e5688b13d74968c865153d6e442f77a67b5794fb429705bea8b40cdef00768102de55b SHA512 73ea4aaee39061565524a378b9317bee4b850f0c28ae3f8a47e905b9dffc4452e71736880391bb74b88ea70bda12874699a1eff56400ac9d7949738f3aa3ebce -AUX lxd-5.0.3-btrfs-quota-group-fix.patch 1762 BLAKE2B c26a2cfe479cace5dda6bccf09c4c67d5e787fb0595da58959c182ec866b7a22ebed11856b29feb77a24d4b44fed213dae649f3b74fd55f6211c8c98f3a8d55d SHA512 0438c12eb728a968ec80562e6ca839ab14cb7c09294ae527a8e20e24e927e8941f87ffc8a145f4931bb8867f5ad2cdf61c965f29f0320e5716aa387dbd3e5880 AUX lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch 3091 BLAKE2B d21b6bbc168579fdb43845bdfadf1fa4514b3e8abb9e49d171fc5a576eef73a827a573e75d4ced65225659db998cce7eb3eb90f3c2a558dc0c83255c799c582b SHA512 6a5d1c64045266697ecfa6cf970640e7dc705436af71c2d20fb1f0c978020b2a20698f8ddd43f60d444c3f460d9520d644fe9bf8c8ed28aba77f88ff7349053c AUX lxd-5.0.3-pr-12847-ignore-incus-archives.patch 1052 BLAKE2B 13f360b09a9bf3224f23f1d95ca9b4ee714a3c8e32c981acaededdfce3833d51e700a2e7b12c79b4d79ad99925d156ec57159114c6668d5a2261316a14ed4581 SHA512 4e34878214d96a165b4762f0c39bfa7279677af65a6a9452da2d19e6b1f87d8a4cd1fe5c3cb55e20662c82e1682ac5ae9848bf5c4c61b5ca2f1d58e2f9e62cfb AUX lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch 992 BLAKE2B 861128f47f9ad4e3e1ed6ec06f563339c58c8ad1f8d30a25c2ae043d34b519c6b6e1a17dc77bfccc37e65ffc1f72ed8dfd455292ce3b5bf2c00496edb5dad675 SHA512 af551a0461d0fb7044bf6f12a0d4f66d96215f05009a1a096b361824b63170e7e08b9065a310dcc885a73c5f1eea99ee52f7680fb94d3dacffaf6e38d5a26472 diff --git a/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch b/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch deleted file mode 100644 index 4e993b7e7054..000000000000 --- a/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e7c852e43c0479060e630adb50342d2552a6cdad Mon Sep 17 00:00:00 2001 -From: Thomas Parrott -Date: Tue, 7 Feb 2023 10:04:27 +0000 -Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Only check for - minimum number of columns in `btrfs qgroup show` command - -Previously we expected 4 columns, but in btrfs-progs >= 6.0 this has changed to 5 columns. - -E.g. in Jammy btrfs-progs v5.16.2: - -``` -sudo btrfs qgroup show /var/lib/lxd/storage-pools/btrfs -qgroupid rfer excl --------- ---- ---- -0/5 16.00KiB 16.00KiB -0/256 9.66MiB 400.00KiB -0/257 9.66MiB 392.00KiB -``` - -And in Lunar btrfs-progs v6.1.3: - -``` -btrfs qgroup show /var/lib/lxd/storage-pools/btrfs -Qgroupid Referenced Exclusive Path --------- ---------- --------- ---- -0/5 16.00KiB 16.00KiB -0/256 9.63MiB 400.00KiB images/1f81470478d136f0008c856e3a47369e0ac863f0402ce0e31c56dd29e9fdd4d7 -0/257 9.64MiB 404.00KiB containers/c1 -``` - -Fixes #11210 - -Signed-off-by: Thomas Parrott ---- - lxd/storage/drivers/driver_btrfs_utils.go | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go -index e1468e4b1a59..722a2de20978 100644 ---- a/lxd/storage/drivers/driver_btrfs_utils.go -+++ b/lxd/storage/drivers/driver_btrfs_utils.go -@@ -253,7 +253,9 @@ func (d *btrfs) getQGroup(path string) (string, int64, error) { - } - - fields := strings.Fields(line) -- if len(fields) != 4 { -+ -+ // The BTRFS tooling changed the number of columns between versions so we only check for minimum. -+ if len(fields) < 3 { - continue - } - -- cgit v1.2.3