diff --git a/packages/acpid/Cargo.toml b/packages/acpid/Cargo.toml index 7461a274412..19fce6a9190 100644 --- a/packages/acpid/Cargo.toml +++ b/packages/acpid/Cargo.toml @@ -9,11 +9,11 @@ build = "build.rs" path = "pkg.rs" [package.metadata.build-package] -releases-url = "http://downloads.sourceforge.net/acpid2" +releases-url = "https://downloads.sourceforge.net/acpid2" [[package.metadata.build-package.external-files]] -url = "http://downloads.sourceforge.net/acpid2/acpid-2.0.33.tar.xz" -sha512 = "491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75" +url = "https://downloads.sourceforge.net/acpid2/acpid-2.0.34.tar.xz" +sha512 = "2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/acpid/acpid.spec b/packages/acpid/acpid.spec index 05b31b7ea2f..83ed3590a6d 100644 --- a/packages/acpid/acpid.spec +++ b/packages/acpid/acpid.spec @@ -1,10 +1,10 @@ Name: %{_cross_os}acpid -Version: 2.0.33 +Version: 2.0.34 Release: 1%{?dist} Summary: ACPI event daemon License: GPL-2.0-or-later URL: http://sourceforge.net/projects/acpid2/ -Source0: http://downloads.sourceforge.net/acpid2/acpid-%{version}.tar.xz +Source0: https://downloads.sourceforge.net/acpid2/acpid-%{version}.tar.xz Source1: acpid.service Source2: power.conf Patch1: 0001-Remove-shell-dependency-by-only-shutting-down.patch diff --git a/packages/chrony/0001-sys_linux-allow-rseq-in-seccomp-filter.patch b/packages/chrony/0001-sys_linux-allow-rseq-in-seccomp-filter.patch deleted file mode 100644 index 0fe24eab545..00000000000 --- a/packages/chrony/0001-sys_linux-allow-rseq-in-seccomp-filter.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8bb8f15a7d049ed26c69d95087065b381f76ec4d Mon Sep 17 00:00:00 2001 -From: Michael Hudson-Doyle -Date: Wed, 9 Feb 2022 09:06:13 +0100 -Subject: [PATCH] sys_linux: allow rseq in seccomp filter - -Libc 2.35 will use rseq syscalls [1][2] by default and thereby -break chrony in seccomp isolation. - -[1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ -[2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html - -Tested-by: Christian Ehrhardt -Reviewed-by: Christian Ehrhardt -Signed-off-by: Michael Hudson-Doyle -Signed-off-by: Christian Ehrhardt ---- - sys_linux.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sys_linux.c b/sys_linux.c -index 9cab2ef..cc3c931 100644 ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -497,6 +497,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - SCMP_SYS(getrlimit), - SCMP_SYS(getuid), - SCMP_SYS(getuid32), -+#ifdef __NR_rseq -+ SCMP_SYS(rseq), -+#endif - SCMP_SYS(rt_sigaction), - SCMP_SYS(rt_sigreturn), - SCMP_SYS(rt_sigprocmask), --- -2.33.1 - diff --git a/packages/chrony/Cargo.toml b/packages/chrony/Cargo.toml index c0bb9005f2f..59ac0542002 100644 --- a/packages/chrony/Cargo.toml +++ b/packages/chrony/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://download.tuxfamily.org/chrony" [[package.metadata.build-package.external-files]] -url = "https://download.tuxfamily.org/chrony/chrony-4.2.tar.gz" -sha512 = "7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d" +url = "https://download.tuxfamily.org/chrony/chrony-4.3.tar.gz" +sha512 = "1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/chrony/chrony.spec b/packages/chrony/chrony.spec index 665765ce0af..aac47a2e279 100644 --- a/packages/chrony/chrony.spec +++ b/packages/chrony/chrony.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}chrony -Version: 4.2 +Version: 4.3 Release: 1%{?dist} Summary: A versatile implementation of the Network Time Protocol License: GPL-2.0-only @@ -10,9 +10,6 @@ Source2: chrony-conf Source3: chrony-sysusers.conf Source4: chrony-tmpfiles.conf -# needed for glibc 2.35 -Patch0001: 0001-sys_linux-allow-rseq-in-seccomp-filter.patch - BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libcap-devel BuildRequires: %{_cross_os}libseccomp-devel diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml index 2f167c9c25f..3cd1fefbd3e 100644 --- a/packages/containerd/Cargo.toml +++ b/packages/containerd/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/containerd/containerd/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/containerd/containerd/archive/v1.6.6/containerd-1.6.6.tar.gz" -sha512 = "f16f23384dbaa67075f2d35b7fc752938dd15601bbe3a919bc8eaa53fa1b2dea2e2d7f613a0f2f492910213dc2f7e96f0a1d38dde35bfb6d15f18167313f9817" +url = "https://github.com/containerd/containerd/archive/v1.6.8/containerd-1.6.8.tar.gz" +sha512 = "c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba" # RPM BuildRequires [build-dependencies] diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec index 7172c7b3e3b..fd3465ab629 100644 --- a/packages/containerd/containerd.spec +++ b/packages/containerd/containerd.spec @@ -2,9 +2,9 @@ %global gorepo containerd %global goimport %{goproject}/%{gorepo} -%global gover 1.6.6 +%global gover 1.6.8 %global rpmver %{gover} -%global gitrev 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 +%global gitrev 9cd3357b7fd7218e4aec3eae239db1f68a5a6ec6 %global _dwz_low_mem_die_limit 0 diff --git a/packages/docker-cli/Cargo.toml b/packages/docker-cli/Cargo.toml index 48f503388cd..903bd04e8d7 100644 --- a/packages/docker-cli/Cargo.toml +++ b/packages/docker-cli/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/docker/cli/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/docker/cli/archive/v20.10.17/cli-20.10.17.tar.gz" -sha512 = "9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316" +url = "https://github.com/docker/cli/archive/v20.10.18/cli-20.10.18.tar.gz" +sha512 = "fe5359015041f99bacf7b674a99ab7772d9e71eb6c6fefd6acb28f2afee4321a7517a53497627ae9cae8c6e0c253971a53d0579a630a3d71986edd7300a0a8ab" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/docker-cli/docker-cli.spec b/packages/docker-cli/docker-cli.spec index 8b3b7b5a2ca..9b1b713b88b 100644 --- a/packages/docker-cli/docker-cli.spec +++ b/packages/docker-cli/docker-cli.spec @@ -2,9 +2,9 @@ %global gorepo cli %global goimport %{goproject}/%{gorepo} -%global gover 20.10.17 +%global gover 20.10.18 %global rpmver %{gover} -%global gitrev 100c70180fde3601def79a59cc3e996aa553c9b9 +%global gitrev b40c2f6b5deeb11ac6c485c940865ee40664f0f0 %global source_date_epoch 1492525740 diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml index be480ae8c32..14beff77bc0 100644 --- a/packages/docker-engine/Cargo.toml +++ b/packages/docker-engine/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/moby/moby/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/moby/moby/archive/v20.10.17/moby-20.10.17.tar.gz" -sha512 = "1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4" +url = "https://github.com/moby/moby/archive/v20.10.18/moby-20.10.18.tar.gz" +sha512 = "202f9f4d455329907e87bd95549aa433b6c773d3067cc89d0bd2e087bddfc66faddd6c2019843e42bf3fed6d6584ba4ab61d762f436f8bb164aa11e6280c91c5" # RPM BuildRequires [build-dependencies] diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec index 71321106ea0..1f210cd5616 100644 --- a/packages/docker-engine/docker-engine.spec +++ b/packages/docker-engine/docker-engine.spec @@ -3,9 +3,9 @@ %global goorg github.com/docker %global goimport %{goorg}/docker -%global gover 20.10.17 +%global gover 20.10.18 %global rpmver %{gover} -%global gitrev a89b84221c8560e7a3dee2a653353429e7628424 +%global gitrev e42327a6d3c55ceda3bd5475be7aae6036d02db3 %global source_date_epoch 1363394400 diff --git a/packages/docker-proxy/Cargo.toml b/packages/docker-proxy/Cargo.toml index cb57005b58d..3497da23d62 100644 --- a/packages/docker-proxy/Cargo.toml +++ b/packages/docker-proxy/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/docker/libnetwork/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/docker/libnetwork/archive/f6ccccb1c082a432c2a5814aaedaca56af33d9ea/libnetwork-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz" -sha512 = "d3d9888f39a9247b6e773b0bfe63e6d248c5c155e7032cdbdd5cfacf995cb6b4cf2f0fb51e09c4554a4b994e3c3d7fc9cd2fde6cf8dda34fba6aa07218ac959c" +url = "https://github.com/moby/libnetwork/archive/0dde5c895075df6e3630e76f750a447cf63f4789/libnetwork-0dde5c895075df6e3630e76f750a447cf63f4789.tar.gz" +sha512 = "d73e2091c9aeefce501f5900d6c0c108d89e7970f1e091f7db4e05123536357311e65aa8210493f2386aaf4d68aac2ddf66c2c600054b87438d2f2ddd7e39584" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/docker-proxy/docker-proxy.spec b/packages/docker-proxy/docker-proxy.spec index 824ed8c9f6e..407bd859e80 100644 --- a/packages/docker-proxy/docker-proxy.spec +++ b/packages/docker-proxy/docker-proxy.spec @@ -3,12 +3,12 @@ %global goimport %{goproject}/%{gorepo} # Use the libnetwork commit listed in this file for the docker version we ship: # https://github.com/moby/moby/blob/DOCKER-VERSION-HERE/vendor.conf -%global commit f6ccccb1c082a432c2a5814aaedaca56af33d9ea +%global commit 0dde5c895075df6e3630e76f750a447cf63f4789 %global _dwz_low_mem_die_limit 0 Name: %{_cross_os}docker-proxy -Version: 20.10.17 +Version: 20.10.18 Release: 1%{?dist} Summary: Docker CLI # mostly Apache-2.0, client/mflag is BSD-3-Clause diff --git a/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch b/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch index bfc07306e8b..2422ecdb2e8 100644 --- a/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch +++ b/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch @@ -1,4 +1,4 @@ -From c8214dc68af21b4ea22c652f3e30caba5fdeef42 Mon Sep 17 00:00:00 2001 +From baf491ab24fb2dfc1c4a98c8492fc32769475cc6 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 26 Mar 2021 17:48:28 -0700 Subject: [PATCH 5/5] bottlerocket: fix procfs path on host @@ -14,7 +14,7 @@ ECS agent in a container, the ECS agent can directly read the host's 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go -index 2ad6583..118e6aa 100644 +index 729acac..74ac96c 100644 --- a/agent/ecscni/types_linux.go +++ b/agent/ecscni/types_linux.go @@ -40,7 +40,7 @@ const ( @@ -23,9 +23,9 @@ index 2ad6583..118e6aa 100644 // NetnsFormat is used to construct the path to cotainer network namespace - NetnsFormat = "/host/proc/%s/ns/net" + NetnsFormat = "/proc/%s/ns/net" - ) - - //IPAMNetworkConfig is the config format accepted by the plugin + // Starting with CNI plugin v0.8.0 (this PR https://github.com/containernetworking/cni/pull/698) + // NetworkName has to be non-empty field for network config. + // We do not actually make use of the field, hence passing in a placeholder string to fulfill the API spec -- -2.32.0 +2.25.1 diff --git a/packages/ecs-agent/Cargo.toml b/packages/ecs-agent/Cargo.toml index 274a85b1aa5..bb30c7feb89 100644 --- a/packages/ecs-agent/Cargo.toml +++ b/packages/ecs-agent/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" releases-url = "https://github.com/aws/amazon-ecs-agent/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/aws/amazon-ecs-agent/archive/v1.62.0/amazon-ecs-agent-v1.62.0.tar.gz" -sha512 = "df218d584ea2fc3b8707afea834fe68a186e6a23f7f1b2afdfa4797552b9ac30120229023f5e9b23b87bf62991f4b6b215dee4a5bddf7b9e66cbd47b309fc780" +url = "https://github.com/aws/amazon-ecs-agent/archive/v1.63.1/amazon-ecs-agent-1.63.1.tar.gz" +sha512 = "0e6b123ed7b1287daa9fb97f49c50258e13585adf776bb6b5e1d30c2f2235c1712a801bee743951e673d26fa95a5a821646f80bd5923ed68036630cc78eaa996" # The ECS agent repository includes two CNI plugins as git submodules. git # archive does not include submodules, so the tarball above does not include diff --git a/packages/ecs-agent/ecs-agent.spec b/packages/ecs-agent/ecs-agent.spec index 57d21677402..910b9adc8c5 100644 --- a/packages/ecs-agent/ecs-agent.spec +++ b/packages/ecs-agent/ecs-agent.spec @@ -2,9 +2,9 @@ %global agent_gorepo amazon-ecs-agent %global agent_goimport %{agent_goproject}/%{agent_gorepo} -%global agent_gover 1.62.0 +%global agent_gover 1.63.1 # git rev-parse --short=8 -%global agent_gitrev 3f73bab1 +%global agent_gitrev 637446af %global ecscni_goproject github.com/aws %global ecscni_gorepo amazon-ecs-cni-plugins @@ -28,7 +28,7 @@ Release: 1%{?dist} Summary: Amazon Elastic Container Service agent License: Apache-2.0 URL: https://%{agent_goimport} -Source0: https://%{agent_goimport}/archive/v%{agent_gover}/%{agent_gorepo}-v%{agent_gover}.tar.gz +Source0: https://%{agent_goimport}/archive/v%{agent_gover}/%{agent_gorepo}-%{agent_gover}.tar.gz Source1: https://%{ecscni_goimport}/archive/%{ecscni_gitrev}/%{ecscni_gorepo}.tar.gz Source2: https://%{vpccni_goimport}/archive/%{vpccni_gitrev}/%{vpccni_gorepo}.tar.gz Source101: ecs.service diff --git a/packages/grep/Cargo.toml b/packages/grep/Cargo.toml index 5a334f6f7ea..ec5664b3075 100644 --- a/packages/grep/Cargo.toml +++ b/packages/grep/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://mirrors.kernel.org/gnu/grep" [[package.metadata.build-package.external-files]] -url = "https://mirrors.kernel.org/gnu/grep/grep-3.7.tar.xz" -sha512 = "e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82" +url = "https://mirrors.kernel.org/gnu/grep/grep-3.8.tar.xz" +sha512 = "2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79" [dependencies] libpcre = { path = "../libpcre" } diff --git a/packages/grep/grep.spec b/packages/grep/grep.spec index 3b0b609d274..1eb64ad88b1 100644 --- a/packages/grep/grep.spec +++ b/packages/grep/grep.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}grep -Version: 3.7 +Version: 3.8 Release: 1%{?dist} Summary: GNU grep utility URL: https://www.gnu.org/software/grep/ diff --git a/packages/grub/Cargo.toml b/packages/grub/Cargo.toml index 290eb60e749..c8f0669f89c 100644 --- a/packages/grub/Cargo.toml +++ b/packages/grub/Cargo.toml @@ -9,8 +9,8 @@ build = "build.rs" path = "pkg.rs" [[package.metadata.build-package.external-files]] -url = "https://cdn.amazonlinux.com/blobstore/a2f920abd554c7ab22af43c720198abcf5f78828c0543a0d7c65c654610eab26/grub2-2.06-2.amzn2.0.1.src.rpm" -sha512 = "0a30a75426f9030b9bab489b824d4cc51c864f2fef87df298ca4a725ecfb49dbd310f276740fadab64879ee1dfc60b35f52957b7cfc5ff023d856b536b0af04d" +url = "https://cdn.amazonlinux.com/blobstore/21d0df3b06c1c5cc9e5cf3bb559dad713335e782ac3a46b57c5d0097e22c0aec/grub2-2.06-9.amzn2.0.1.src.rpm" +sha512 = "f27b4005e789ce1e0e792133f6adfbdbf221245c03b27c25285ff5b81e53065385536971934744f33c52a924022480aa15cd25e8d5ded9f4999c753e8394ae36" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/grub/grub.spec b/packages/grub/grub.spec index b453f6aeedb..b3e064638e8 100644 --- a/packages/grub/grub.spec +++ b/packages/grub/grub.spec @@ -14,7 +14,7 @@ Release: 1%{?dist} Summary: Bootloader with support for Linux and more License: GPL-3.0-or-later AND Unicode-DFS-2015 URL: https://www.gnu.org/software/grub/ -Source0: https://cdn.amazonlinux.com/blobstore/a2f920abd554c7ab22af43c720198abcf5f78828c0543a0d7c65c654610eab26/grub2-2.06-2.amzn2.0.1.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/21d0df3b06c1c5cc9e5cf3bb559dad713335e782ac3a46b57c5d0097e22c0aec/grub2-2.06-9.amzn2.0.1.src.rpm Source1: bios.cfg Source2: efi.cfg Patch0001: 0001-setup-Add-root-device-argument-to-grub-setup.patch diff --git a/packages/iproute/Cargo.toml b/packages/iproute/Cargo.toml index cfe8c5637ee..74c43fe60d3 100644 --- a/packages/iproute/Cargo.toml +++ b/packages/iproute/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://kernel.org/pub/linux/utils/net/iproute2" [[package.metadata.build-package.external-files]] -url = "http://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.18.0.tar.xz" -sha512 = "7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068" +url = "https://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.19.0.tar.xz" +sha512 = "eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/iproute/iproute.spec b/packages/iproute/iproute.spec index a855e6c6971..5ec442c3f94 100644 --- a/packages/iproute/iproute.spec +++ b/packages/iproute/iproute.spec @@ -1,10 +1,10 @@ Name: %{_cross_os}iproute -Version: 5.18.0 +Version: 5.19.0 Release: 1%{?dist} Summary: Tools for advanced IP routing and network device configuration License: GPL-2.0-or-later AND GPL-2.0-only -URL: http://kernel.org/pub/linux/utils/net/iproute2/ -Source0: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%{version}.tar.xz +URL: https://kernel.org/pub/linux/utils/net/iproute2/ +Source0: https://kernel.org/pub/linux/utils/net/iproute2/iproute2-%{version}.tar.xz Patch1: 0001-skip-libelf-check.patch BuildRequires: %{_cross_os}glibc-devel diff --git a/packages/kexec-tools/Cargo.toml b/packages/kexec-tools/Cargo.toml index 15a8118724c..250fc436fa0 100644 --- a/packages/kexec-tools/Cargo.toml +++ b/packages/kexec-tools/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://kernel.org/pub/linux/utils/kernel/kexec" [[package.metadata.build-package.external-files]] -url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.24.tar.xz" -sha512 = "ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822" +url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.25.tar.xz" +sha512 = "6fd3fe11d428c5bb2ce318744146e03ddf752cc77632064bdd7418ef3ad355ad2e2db212d68a5bc73554d78f786901beb42d72bd62e2a4dae34fb224b667ec6b" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/kexec-tools/kexec-tools.spec b/packages/kexec-tools/kexec-tools.spec index d91507f6476..d7700911141 100644 --- a/packages/kexec-tools/kexec-tools.spec +++ b/packages/kexec-tools/kexec-tools.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}kexec-tools -Version: 2.0.24 +Version: 2.0.25 Release: 1%{?dist} Summary: Linux tool to load kernels from the running system License: GPL-2.0-or-later AND GPL-2.0-only diff --git a/packages/kubernetes-1.21/Cargo.toml b/packages/kubernetes-1.21/Cargo.toml index e7e948a2173..62550e120cc 100644 --- a/packages/kubernetes-1.21/Cargo.toml +++ b/packages/kubernetes-1.21/Cargo.toml @@ -15,8 +15,8 @@ package-name = "kubernetes-1.21" releases-url = "https://github.com/kubernetes/kubernetes/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes/kubernetes/archive/v1.21.13/kubernetes-1.21.13.tar.gz" -sha512 = "cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd" +url = "https://github.com/kubernetes/kubernetes/archive/v1.21.14/kubernetes-1.21.14.tar.gz" +sha512 = "76e222413c4d5193ec2768cae23116f29e0e8c0fe4147c6cb567a1b6932cd5a8c9471fb926d447e5af798ce1cfeffeb46e8c4c890ee19d4f89a76a9a53e245b6" # RPM BuildRequires [build-dependencies] diff --git a/packages/kubernetes-1.21/kubernetes-1.21.spec b/packages/kubernetes-1.21/kubernetes-1.21.spec index abfccd4cacb..c2208d13607 100644 --- a/packages/kubernetes-1.21/kubernetes-1.21.spec +++ b/packages/kubernetes-1.21/kubernetes-1.21.spec @@ -2,7 +2,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.21.13 +%global gover 1.21.14 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 diff --git a/packages/libaudit/Cargo.toml b/packages/libaudit/Cargo.toml index 8ebc1b9308f..1aaa049f67d 100644 --- a/packages/libaudit/Cargo.toml +++ b/packages/libaudit/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/linux-audit/audit-userspace/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.8/audit-userspace-3.0.8.tar.gz" -sha512 = "494edfb358350fc3117614a95cd8855751896e05d92fe9efb93e1582f9ded02e5f17f359328c973afc4200b00dc0d482eb5b1c25c5fc7d440184f71e055ed3ef" +url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.9/audit-userspace-3.0.9.tar.gz" +sha512 = "c0b35d40d3aecb3450ce99422115efe40d56ad199d8f035f836dae94df0d55a4561659673c70fc49056a316bdc8531d7014f4c2a2d60aac66bdf69c262ee3ca0" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libaudit/libaudit.spec b/packages/libaudit/libaudit.spec index f4f027ccddd..39fd5a770bb 100644 --- a/packages/libaudit/libaudit.spec +++ b/packages/libaudit/libaudit.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libaudit -Version: 3.0.8 +Version: 3.0.9 Release: 1%{?dist} Summary: Library for the audit subsystem License: GPL-2.0-or-later AND LGPL-2.1-or-later diff --git a/packages/libcap/Cargo.toml b/packages/libcap/Cargo.toml index 157f13f1ef1..25b2eca84c9 100644 --- a/packages/libcap/Cargo.toml +++ b/packages/libcap/Cargo.toml @@ -13,8 +13,8 @@ releases-url = "https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libca # Changelog can be found here: https://sites.google.com/site/fullycapable/release-notes-for-libcap [[package.metadata.build-package.external-files]] -url = "https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.gz" -sha512 = "c1523d4b73bf12fee5c1518c424319d58181cab6d0436dc3d26818a906e4fe6942b476d6db7fa5e103e05b4ffcb159ac56cc7cb2fd0d89388cc375809e5289f4" +url = "https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.66.tar.gz" +sha512 = "89db090e9756dfb09c49b11dcf43e9372f46708e92f1183f7b0a07962d41ff65cb175c5e656637a6a8a13c92930d3ed132de0cc4ba8b82e6c7644da00681a563" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libcap/libcap.spec b/packages/libcap/libcap.spec index 0c0435876fc..01a980d8195 100644 --- a/packages/libcap/libcap.spec +++ b/packages/libcap/libcap.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libcap -Version: 2.65 +Version: 2.66 Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities License: GPL-2.0-only OR BSD-3-Clause diff --git a/packages/libdbus/Cargo.toml b/packages/libdbus/Cargo.toml index c1cd93750ac..b2d4dbab814 100644 --- a/packages/libdbus/Cargo.toml +++ b/packages/libdbus/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://dbus.freedesktop.org/releases/dbus" [[package.metadata.build-package.external-files]] -url = "https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz" -sha512 = "0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6" +url = "https://dbus.freedesktop.org/releases/dbus/dbus-1.15.0.tar.xz" +sha512 = "6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libdbus/libdbus.spec b/packages/libdbus/libdbus.spec index c64e245ed83..44ad19a4159 100644 --- a/packages/libdbus/libdbus.spec +++ b/packages/libdbus/libdbus.spec @@ -1,10 +1,10 @@ Name: %{_cross_os}libdbus -Version: 1.12.22 +Version: 1.15.0 Release: 1%{?dist} Summary: Library for a message bus License: AFL-2.1 OR GPL-2.0-or-later URL: http://www.freedesktop.org/Software/dbus/ -Source0: https://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz +Source0: https://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.xz BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libcap-devel BuildRequires: %{_cross_os}libexpat-devel diff --git a/packages/libexpat/Cargo.toml b/packages/libexpat/Cargo.toml index 3992d7c7c9e..e5873e6e91e 100644 --- a/packages/libexpat/Cargo.toml +++ b/packages/libexpat/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/libexpat/libexpat/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz" -sha512 = "d19b0d6469537aed20c54bd9cfa4089d39e4acaaddde57809de7c6aec55dc870677c02480e7f65dac5620bd5454b889370453613518f9da647c74a831a2a1b7b" +url = "https://github.com/libexpat/libexpat/releases/download/R_2_4_9/expat-2.4.9.tar.xz" +sha512 = "8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libexpat/libexpat.spec b/packages/libexpat/libexpat.spec index 1234c2b44fc..1d2552e47fc 100644 --- a/packages/libexpat/libexpat.spec +++ b/packages/libexpat/libexpat.spec @@ -1,4 +1,4 @@ -%global unversion 2_4_8 +%global unversion 2_4_9 Name: %{_cross_os}libexpat Version: %(echo %{unversion} | sed 's/_/./g') diff --git a/packages/libffi/Cargo.toml b/packages/libffi/Cargo.toml index 9a1b2956a99..3fea179c806 100644 --- a/packages/libffi/Cargo.toml +++ b/packages/libffi/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/libffi/libffi/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz" -sha512 = "31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1" +url = "https://github.com/libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz" +sha512 = "6e3620d3842ae0f983c47c3268364be32b6eeb2fc708b23d141531730e9149abb035c618b295be834999eadef64fabfa39df21c955c40473f3bbc9fd3170bad8" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libffi/libffi.spec b/packages/libffi/libffi.spec index bea9c7ccb23..b873a9115cb 100644 --- a/packages/libffi/libffi.spec +++ b/packages/libffi/libffi.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libffi -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Summary: Library for FFI License: MIT diff --git a/packages/libglib/Cargo.toml b/packages/libglib/Cargo.toml index 11cbfa38442..edf52c5042d 100644 --- a/packages/libglib/Cargo.toml +++ b/packages/libglib/Cargo.toml @@ -12,21 +12,13 @@ path = "pkg.rs" releases-url = "https://download.gnome.org/sources/glib" [[package.metadata.build-package.external-files]] -url = "https://download.gnome.org/sources/glib/2.72/glib-2.72.0.tar.xz" -sha512 = "351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad" - -[[package.metadata.build-package.external-files]] -url = "https://downloads.sourceforge.net/pcre/pcre-8.37.tar.bz2" -sha512 = "19344c9add2ebbd26c528505d07d3b028d79bc3e6103d51453a449cebd76bc76f5bc7ddd9ef0de41f98c50be74a2d9a65db539ed60f1add1086d99bde8a81466" - -[[package.metadata.build-package.external-files]] -url = "https://wrapdb.mesonbuild.com/v2/pcre_8.37-4/get_patch" -path = "pcre_8.37-4_patch.zip" -sha512 = "4cb2164d6a335594f64743cfc75fe16310618cb91ddd4c4fa0015b07a54390620ca379b05f1659e2224a2916b1b976b07d6d6efa4e2a1330d3957fbb9611fbc5" +url = "https://download.gnome.org/sources/glib/2.74/glib-2.74.0.tar.xz" +sha512 = "5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225" [build-dependencies] glibc = { path = "../glibc" } libffi = { path = "../libffi" } +libpcre = { path = "../libpcre" } libselinux = { path = "../libselinux" } libz = { path = "../libz" } util-linux = { path = "../util-linux" } diff --git a/packages/libglib/libglib.spec b/packages/libglib/libglib.spec index cf669748aa9..8401f207cf7 100644 --- a/packages/libglib/libglib.spec +++ b/packages/libglib/libglib.spec @@ -1,23 +1,21 @@ Name: %{_cross_os}libglib -Version: 2.72.0 +Version: 2.74.0 Release: 1%{?dist} Summary: The GLib libraries # glib2 is LGPL-2.1-only -# pcre is BSD-3-Clause -License: LGPL-2.1-only AND BSD-3-Clause +License: LGPL-2.1-only URL: https://www.gtk.org/ -Source0: https://download.gnome.org/sources/glib/2.72/glib-%{version}.tar.xz -# Note: the pcre version is specified in the glib archive in subprojects/libpcre.wrap -Source1: https://downloads.sourceforge.net/pcre/pcre-8.37.tar.bz2 -Source2: https://wrapdb.mesonbuild.com/v2/pcre_8.37-4/get_patch#/pcre_8.37-4_patch.zip +Source0: https://download.gnome.org/sources/glib/2.74/glib-%{version}.tar.xz BuildRequires: meson BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libffi-devel BuildRequires: %{_cross_os}libmount-devel +BuildRequires: %{_cross_os}libpcre-devel BuildRequires: %{_cross_os}libselinux-devel BuildRequires: %{_cross_os}libz-devel Requires: %{_cross_os}libffi Requires: %{_cross_os}libmount +Requires: %{_cross_os}libpcre Requires: %{_cross_os}libselinux Requires: %{_cross_os}libz @@ -34,10 +32,6 @@ Requires: %{_cross_os}libffi-devel %prep %autosetup -n glib-%{version} -p1 -pushd subprojects >/dev/null -tar xf %{S:1} -unzip %{S:2} -popd >/dev/null %build CONFIGURE_OPTS=( @@ -61,6 +55,7 @@ CONFIGURE_OPTS=( %{_cross_attribution_file} %{_cross_libdir}/*.so.* %exclude %{_cross_datadir} +%exclude %{_cross_libexecdir} %files devel %{_cross_bindir}/* diff --git a/packages/liblzma/Cargo.toml b/packages/liblzma/Cargo.toml index c630c8413a3..61b9a037e24 100644 --- a/packages/liblzma/Cargo.toml +++ b/packages/liblzma/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://tukaani.org/xz" [[package.metadata.build-package.external-files]] -url = "https://tukaani.org/xz/xz-5.2.5.tar.xz" -sha512 = "59266068a51cb616eb31b67cd8f07ffeb2288d1391c61665ae2ec6814465afac80fec69248f6a2f2db45b44475af001296a99af6a32287226a9c41419173ccbb" +url = "https://tukaani.org/xz/xz-5.2.6.tar.xz" +sha512 = "5c69a492227c0ff72836d7a87e6372dc2e62bedfffb33f057263e28a6341825cef67834a863ed6ac02c5368c86da89f8affbe767f8bb914064cfa478f653e935" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/liblzma/liblzma.spec b/packages/liblzma/liblzma.spec index 1042c0620e8..14a951e4d49 100644 --- a/packages/liblzma/liblzma.spec +++ b/packages/liblzma/liblzma.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}liblzma -Version: 5.2.5 +Version: 5.2.6 Release: 1%{?dist} Summary: Library for XZ and LZMA compressed files URL: https://tukaani.org/xz diff --git a/packages/libnftnl/Cargo.toml b/packages/libnftnl/Cargo.toml index 20fed8f2d14..655884ed8ff 100644 --- a/packages/libnftnl/Cargo.toml +++ b/packages/libnftnl/Cargo.toml @@ -9,11 +9,11 @@ build = "build.rs" path = "pkg.rs" [package.metadata.build-package] -releases-url = "http://netfilter.org/projects/libnftnl/files" +releases-url = "https://netfilter.org/projects/libnftnl/files" [[package.metadata.build-package.external-files]] -url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.2.1.tar.bz2" -sha512 = "cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a" +url = "https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.3.tar.bz2" +sha512 = "e2d16cbc062eb8900f0472abb8fe6b22910cc5a8efbb47445fe6ce6e2713a0637f74b46b2bf2031ba9ecb2e5eed932e3bbb49b015c7b7207591249de23d5149d" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnftnl/libnftnl.spec b/packages/libnftnl/libnftnl.spec index cc4a04a4351..5abb38937d9 100644 --- a/packages/libnftnl/libnftnl.spec +++ b/packages/libnftnl/libnftnl.spec @@ -1,10 +1,10 @@ Name: %{_cross_os}libnftnl -Version: 1.2.1 +Version: 1.2.3 Release: 1%{?dist} Summary: Library for nftables netlink License: GPL-2.0-or-later AND GPL-2.0-only URL: http://netfilter.org/projects/libnftnl/ -Source0: http://netfilter.org/projects/libnftnl/files/libnftnl-%{version}.tar.bz2 +Source0: https://netfilter.org/projects/libnftnl/files/libnftnl-%{version}.tar.bz2 BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libmnl-devel Requires: %{_cross_os}libmnl diff --git a/packages/libnl/Cargo.toml b/packages/libnl/Cargo.toml index 653debd6a93..95b2dde62f0 100644 --- a/packages/libnl/Cargo.toml +++ b/packages/libnl/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/thom311/libnl/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/thom311/libnl/archive/libnl3_5_0.tar.gz" -sha512 = "2b762419a21b4560f7d488791a9d7aec0d1c6eac0cd2839ceec0bef5562f130ce44b826691276e1301b9e239f684063037959207474cefec4b46efc32039615d" +url = "https://github.com/thom311/libnl/archive/libnl3_7_0.tar.gz" +sha512 = "86d9a5e9471495d29ab54377937dc662be693de40266d54c5b3690dbae627ed93b1ca9266b722d7e86c741e6f9ed6ea5129eb839e633f10ccc77e69dfd4f816a" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnl/libnl.spec b/packages/libnl/libnl.spec index b609c36d517..e6f3e5094ea 100644 --- a/packages/libnl/libnl.spec +++ b/packages/libnl/libnl.spec @@ -1,5 +1,5 @@ -%global rpmver 3.5.0 -%global srcver 3_5_0 +%global rpmver 3.7.0 +%global srcver 3_7_0 Name: %{_cross_os}libnl Version: %{rpmver} diff --git a/packages/libnvidia-container/0001-use-shared-libtirpc.patch b/packages/libnvidia-container/0001-use-shared-libtirpc.patch index afcdc1c8c3e..c56d8e2c780 100644 --- a/packages/libnvidia-container/0001-use-shared-libtirpc.patch +++ b/packages/libnvidia-container/0001-use-shared-libtirpc.patch @@ -1,7 +1,7 @@ -From 57c5b0010797280351d547e0f7c4cd6475868a0d Mon Sep 17 00:00:00 2001 +From 74a4c7432d8e8d5e336c30c6fe2fb8602bb6cc10 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 20 Sep 2021 23:41:28 +0000 -Subject: [PATCH 1/5] use shared libtirpc +Subject: [PATCH] use shared libtirpc Signed-off-by: Ben Cressey Signed-off-by: Arnaldo Garcia Rincon @@ -10,10 +10,10 @@ Signed-off-by: Arnaldo Garcia Rincon 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile -index 92d6f6e..bb0a610 100644 +index 6fb6976..2c7cc93 100644 --- a/Makefile +++ b/Makefile -@@ -148,9 +148,8 @@ else +@@ -165,9 +165,8 @@ else LIB_LDLIBS_STATIC += -l:libelf.a endif ifeq ($(WITH_TIRPC), yes) @@ -25,17 +25,17 @@ index 92d6f6e..bb0a610 100644 endif ifeq ($(WITH_SECCOMP), yes) LIB_CPPFLAGS += -DWITH_SECCOMP $(shell pkg-config --cflags libseccomp) -@@ -242,9 +241,6 @@ deps: $(LIB_RPC_SRCS) $(BUILD_DEFS) +@@ -265,9 +264,6 @@ endif ifeq ($(WITH_LIBELF), no) - $(MAKE) -f $(MAKE_DIR)/elftoolchain.mk install + $(MAKE) -f $(MAKE_DIR)/elftoolchain.mk DESTDIR=$(DEPS_DIR) install endif -ifeq ($(WITH_TIRPC), yes) -- $(MAKE) -f $(MAKE_DIR)/libtirpc.mk install +- $(MAKE) -f $(MAKE_DIR)/libtirpc.mk DESTDIR=$(DEPS_DIR) install -endif install: all $(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(docdir) $(libdbgdir) $(pkgconfdir)) -@@ -290,9 +286,6 @@ depsclean: +@@ -323,9 +319,6 @@ endif ifeq ($(WITH_LIBELF), no) -$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean endif @@ -46,5 +46,5 @@ index 92d6f6e..bb0a610 100644 mostlyclean: $(RM) $(LIB_OBJS) $(LIB_STATIC_OBJ) $(BIN_OBJS) $(DEPENDENCIES) -- -2.33.1 +2.37.1 diff --git a/packages/libnvidia-container/0002-use-prefix-from-environment.patch b/packages/libnvidia-container/0002-use-prefix-from-environment.patch index 87f11b38dd4..e6f92651c9b 100644 --- a/packages/libnvidia-container/0002-use-prefix-from-environment.patch +++ b/packages/libnvidia-container/0002-use-prefix-from-environment.patch @@ -1,7 +1,7 @@ -From cddc27a808db79b0cd6cbce3eaacd62327978733 Mon Sep 17 00:00:00 2001 +From c4f1d3da6387b2d4b6ed6c37a71d9e2a6e65bab7 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Tue, 21 Sep 2021 00:03:42 +0000 -Subject: [PATCH 2/5] use prefix from environment +Subject: [PATCH] use prefix from environment Signed-off-by: Ben Cressey Signed-off-by: Arnaldo Garcia Rincon @@ -10,10 +10,10 @@ Signed-off-by: Arnaldo Garcia Rincon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index bb0a610..9552ddd 100644 +index 2c7cc93..54bf0a0 100644 --- a/Makefile +++ b/Makefile -@@ -23,7 +23,7 @@ WITH_SECCOMP ?= yes +@@ -24,7 +24,7 @@ WITH_SECCOMP ?= yes ##### Global definitions ##### @@ -23,5 +23,5 @@ index bb0a610..9552ddd 100644 export bindir = $(exec_prefix)/bin export libdir = $(exec_prefix)/lib -- -2.33.1 +2.37.1 diff --git a/packages/libnvidia-container/0003-keep-debug-symbols.patch b/packages/libnvidia-container/0003-keep-debug-symbols.patch index d4fcc38ac13..eca2cca855a 100644 --- a/packages/libnvidia-container/0003-keep-debug-symbols.patch +++ b/packages/libnvidia-container/0003-keep-debug-symbols.patch @@ -1,7 +1,7 @@ -From b994aa569b2b84ed892e86b9610fb051286e0ab9 Mon Sep 17 00:00:00 2001 +From 864c7ab25cde5d8109e17798d5cf2041b559888e Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Tue, 21 Sep 2021 00:22:37 +0000 -Subject: [PATCH 3/5] keep debug symbols +Subject: [PATCH] keep debug symbols Signed-off-by: Ben Cressey Signed-off-by: Arnaldo Garcia Rincon @@ -10,10 +10,10 @@ Signed-off-by: Arnaldo Garcia Rincon 1 file changed, 10 deletions(-) diff --git a/Makefile b/Makefile -index 9552ddd..34fb136 100644 +index 54bf0a0..60429d3 100644 --- a/Makefile +++ b/Makefile -@@ -200,22 +200,14 @@ $(BIN_OBJS): %.o: %.c | shared +@@ -221,22 +221,14 @@ $(BIN_OBJS): %.o: %.c | shared -include $(DEPENDENCIES) $(LIB_SHARED): $(LIB_OBJS) @@ -36,9 +36,9 @@ index 9552ddd..34fb136 100644 ##### Public rules ##### -@@ -251,8 +243,6 @@ install: all - $(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) - $(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK) +@@ -278,8 +270,6 @@ ifeq ($(WITH_NVCGO), yes) + $(LN) -sf $(LIBGO_SONAME) $(DESTDIR)$(libdir)/$(LIBGO_SYMLINK) + endif $(LDCONFIG) -n $(DESTDIR)$(libdir) - # Install debugging symbols - $(INSTALL) -m 644 $(DEBUG_DIR)/$(LIB_SONAME) $(DESTDIR)$(libdbgdir) @@ -46,5 +46,5 @@ index 9552ddd..34fb136 100644 $(MAKE_DIR)/$(LIB_PKGCFG).in "$(strip $(VERSION))" "$(strip $(LIB_LDLIBS_SHARED))" > $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG) # Install binary files -- -2.33.1 +2.37.1 diff --git a/packages/libnvidia-container/0004-Use-NVIDIA_PATH-to-look-up-binaries.patch b/packages/libnvidia-container/0004-Use-NVIDIA_PATH-to-look-up-binaries.patch index acbc206587e..a7997445bf0 100644 --- a/packages/libnvidia-container/0004-Use-NVIDIA_PATH-to-look-up-binaries.patch +++ b/packages/libnvidia-container/0004-Use-NVIDIA_PATH-to-look-up-binaries.patch @@ -1,7 +1,7 @@ -From 334cf602d9ea6247d7b0baec1785d9ab4c0fe5d9 Mon Sep 17 00:00:00 2001 +From 831d6c71e30b8d533123600648bb12cbb225a100 Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Mon, 1 Nov 2021 16:18:19 +0000 -Subject: [PATCH 4/5] Use NVIDIA_PATH to look up binaries +Subject: [PATCH] Use NVIDIA_PATH to look up binaries Signed-off-by: Arnaldo Garcia Rincon --- @@ -9,10 +9,10 @@ Signed-off-by: Arnaldo Garcia Rincon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvc_info.c b/src/nvc_info.c -index 252dd5c..0697fba 100644 +index 55c3ba9..56dcbd2 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -249,8 +249,8 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d +@@ -251,8 +251,8 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d char path[PATH_MAX]; int rv = -1; @@ -24,5 +24,5 @@ index 252dd5c..0697fba 100644 } if ((env = ptr = xstrdup(err, env)) == NULL) -- -2.33.1 +2.37.1 diff --git a/packages/libnvidia-container/0005-makefile-avoid-ldconfig-when-cross-compiling.patch b/packages/libnvidia-container/0005-makefile-avoid-ldconfig-when-cross-compiling.patch index 30ef889ad3e..ae3cdcbbc30 100644 --- a/packages/libnvidia-container/0005-makefile-avoid-ldconfig-when-cross-compiling.patch +++ b/packages/libnvidia-container/0005-makefile-avoid-ldconfig-when-cross-compiling.patch @@ -1,7 +1,7 @@ -From b8d13cfc11a967385f18bfbdd74986a043665832 Mon Sep 17 00:00:00 2001 +From 0fbe931ffee3b95a7940fc749a6ee6c4ce894665 Mon Sep 17 00:00:00 2001 From: Arnaldo Garcia Rincon Date: Tue, 18 Jan 2022 23:57:24 +0000 -Subject: [PATCH 5/5] makefile: avoid ldconfig when cross-compiling +Subject: [PATCH] makefile: avoid ldconfig when cross-compiling Signed-off-by: Arnaldo Garcia Rincon --- @@ -9,18 +9,18 @@ Signed-off-by: Arnaldo Garcia Rincon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 34fb136..1c3d9d2 100644 +index 60429d3..075dc9b 100644 --- a/Makefile +++ b/Makefile -@@ -242,7 +242,7 @@ install: all - $(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir) - $(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) - $(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK) +@@ -269,7 +269,7 @@ ifeq ($(WITH_NVCGO), yes) + $(INSTALL) -m 755 $(DEPS_DIR)$(libdir)/$(LIBGO_SHARED) $(DESTDIR)$(libdir) + $(LN) -sf $(LIBGO_SONAME) $(DESTDIR)$(libdir)/$(LIBGO_SYMLINK) + endif - $(LDCONFIG) -n $(DESTDIR)$(libdir) + $(LN) -sf $(LIB_SHARED) $(DESTDIR)$(libdir)/$(LIB_SONAME) # Install configuration files $(MAKE_DIR)/$(LIB_PKGCFG).in "$(strip $(VERSION))" "$(strip $(LIB_LDLIBS_SHARED))" > $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG) # Install binary files -- -2.33.1 +2.37.1 diff --git a/packages/libnvidia-container/Cargo.toml b/packages/libnvidia-container/Cargo.toml index b3d5f50ef77..d3d9c931527 100644 --- a/packages/libnvidia-container/Cargo.toml +++ b/packages/libnvidia-container/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/NVIDIA/libnvidia-container/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.7.0.tar.gz" -sha512 = "cb2bedc7f3278c56f9da003257ea1c16116ac52cc4a792e4bdfc7e1739a5504436b61db65abb159f4bd4702d961ebd4c455605ce5e9daac00a2ab282a1b1348f" +url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.11.0/libnvidia-container-1.11.0.tar.gz" +sha512 = "d74b84950c4139b6e81be5e644fab38b2e78b69a6275e693c15936825226484e1504f8ed683d7001e521d5f1e7bf6b660781a2cd929490ca8e9e57bade2d6134" [[package.metadata.build-package.external-files]] url = "https://github.com/NVIDIA/nvidia-modprobe/archive/495.44/nvidia-modprobe-495.44.tar.gz" sha512 = "67486ed1b17c8962786e13880910bb2b1938206a0fd76b360ddef7faf80ee0c941a2e3fbc73fa92a92009e2c54130dce17a466c8079537a981a2fed09c07e4c9" diff --git a/packages/libnvidia-container/libnvidia-container.spec b/packages/libnvidia-container/libnvidia-container.spec index 1f84582c66a..32a327ab170 100644 --- a/packages/libnvidia-container/libnvidia-container.spec +++ b/packages/libnvidia-container/libnvidia-container.spec @@ -1,14 +1,14 @@ %global nvidia_modprobe_version 495.44 Name: %{_cross_os}libnvidia-container -Version: 1.7.0 +Version: 1.11.0 Release: 1%{?dist} Summary: NVIDIA container runtime library # The COPYING and COPYING.LESSER files in the sources don't apply to libnvidia-container # they are there because they apply to libelf in elfutils License: Apache-2.0 URL: https://github.com/NVIDIA/libnvidia-container -Source0: https://github.com/NVIDIA/libnvidia-container/archive/v%{version}.tar.gz +Source0: https://github.com/NVIDIA/libnvidia-container/archive/v%{version}/libnvidia-container-%{version}.tar.gz Source1: https://github.com/NVIDIA/nvidia-modprobe/archive/%{nvidia_modprobe_version}/nvidia-modprobe-%{nvidia_modprobe_version}.tar.gz # First party patches from 1 to 1000 @@ -54,6 +54,7 @@ export CFLAGS="${CFLAGS} -I%{_cross_includedir}/tirpc" \\\ export WITH_LIBELF=yes \\\ export WITH_SECCOMP=yes \\\ export WITH_TIRPC=yes \\\ +export WITH_NVCGO=no \\\ export prefix=%{_cross_prefix} \\\ export DESTDIR=%{buildroot} \\\ %{nil} diff --git a/packages/libtirpc/Cargo.toml b/packages/libtirpc/Cargo.toml index 2458d04a4d0..f71f4230e06 100644 --- a/packages/libtirpc/Cargo.toml +++ b/packages/libtirpc/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" [[package.metadata.build-package.external-files]] -url = "https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.2.tar.bz2" -sha512 = "8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255" +url = "https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.3.tar.bz2" +sha512 = "df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libtirpc/libtirpc.spec b/packages/libtirpc/libtirpc.spec index 33ad3ecfc91..b9beb60bc49 100644 --- a/packages/libtirpc/libtirpc.spec +++ b/packages/libtirpc/libtirpc.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libtirpc -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Library for RPC License: BSD-3-Clause diff --git a/packages/nvidia-container-toolkit/Cargo.toml b/packages/nvidia-container-toolkit/Cargo.toml index 0e1423ecc9d..d0217ed68ae 100644 --- a/packages/nvidia-container-toolkit/Cargo.toml +++ b/packages/nvidia-container-toolkit/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/NVIDIA/nvidia-container-toolkit/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.7.0/v1.7.0.tar.gz" -sha512 = "7bc3601ca5cca5b3ad7f30f9c2453d41452b425811d37209c20b7f375d557666a1369d756b52a007406996758b09d47635f2e8628bf363298ec247cb3d3f8845" +url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.11.0/nvidia-container-toolkit-1.11.0.tar.gz" +sha512 = "97420dc51a25e088ff9bd581c0b81a18df63a7fcf344c85a1bedecd7e897741a74e3f8aab0ad15c6035c3263c3f3d53118a941bbbeb3cf887a36aedcff3bcf80" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec b/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec index afaf3fe5693..5ddca90e863 100644 --- a/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -2,7 +2,7 @@ %global gorepo nvidia-container-toolkit %global goimport %{goproject}/%{gorepo} -%global gover 1.7.0 +%global gover 1.11.0 %global rpmver %{gover} Name: %{_cross_os}nvidia-container-toolkit @@ -12,7 +12,7 @@ Summary: Tool to build and run GPU accelerated containers License: Apache-2.0 URL: https://%{goimport} -Source0: https://%{goimport}/archive/v%{gover}/v%{gover}.tar.gz +Source0: https://%{goimport}/archive/v%{gover}/nvidia-container-toolkit-%{gover}.tar.gz Source1: nvidia-container-toolkit-config.toml Source2: nvidia-container-toolkit-tmpfiles.conf Source3: nvidia-oci-hooks-json @@ -30,7 +30,7 @@ Requires: %{_cross_os}shimpei %build %cross_go_configure %{goimport} -go build -buildmode=pie -ldflags="${GOLDFLAGS}" -o nvidia-container-toolkit ./cmd/nvidia-container-toolkit +go build -buildmode=pie -ldflags="${GOLDFLAGS}" -o nvidia-container-runtime-hook ./cmd/nvidia-container-runtime-hook %install install -d %{buildroot}%{_cross_bindir} @@ -38,7 +38,7 @@ install -d %{buildroot}%{_cross_tmpfilesdir} install -d %{buildroot}%{_cross_templatedir} install -d %{buildroot}%{_cross_datadir}/nvidia-container-toolkit install -d %{buildroot}%{_cross_factorydir}/etc/nvidia-container-runtime -install -p -m 0755 nvidia-container-toolkit %{buildroot}%{_cross_bindir}/nvidia-container-runtime-hook +install -p -m 0755 nvidia-container-runtime-hook %{buildroot}%{_cross_bindir}/ install -m 0644 %{S:1} %{buildroot}%{_cross_factorydir}/etc/nvidia-container-runtime/config.toml install -m 0644 %{S:2} %{buildroot}%{_cross_tmpfilesdir}/nvidia-container-toolkit.conf install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/nvidia-oci-hooks-json diff --git a/packages/nvidia-k8s-device-plugin/Cargo.toml b/packages/nvidia-k8s-device-plugin/Cargo.toml index 4de7fe9c716..5a2ee1ee363 100644 --- a/packages/nvidia-k8s-device-plugin/Cargo.toml +++ b/packages/nvidia-k8s-device-plugin/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/NVIDIA/k8s-device-plugin/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/NVIDIA/k8s-device-plugin/archive/v0.10.0/v0.10.0.tar.gz" -sha512 = "d83107ef511a1fa8b43596726e084feea1bbf9b0e22754444e76cbf0aefd5476421d00bc02173c606509f0dbf7b4e86f9453d59fca976b7f8f15c7667932bebe" +url = "https://github.com/NVIDIA/k8s-device-plugin/archive/v0.12.3/v0.12.3.tar.gz" +sha512 = "38d75cd972ba3b8bf0c656ad179392ddaec1ac47dc595b3c9f0409bbeaea788e40170d0015cd249772860a73c479f0b23292e0538bcc316299f05ae5a24e4477" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin.spec b/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin.spec index ca1ddcbbd60..58ccf602dd0 100644 --- a/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin.spec +++ b/packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin.spec @@ -2,7 +2,7 @@ %global gorepo k8s-device-plugin %global goimport %{goproject}/%{gorepo} -%global gover 0.10.0 +%global gover 0.12.3 %global rpmver %{gover} Name: %{_cross_os}nvidia-k8s-device-plugin diff --git a/packages/open-vm-tools/Cargo.toml b/packages/open-vm-tools/Cargo.toml index 4a4a9158d55..6e5a8f6d8aa 100644 --- a/packages/open-vm-tools/Cargo.toml +++ b/packages/open-vm-tools/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/vmware/open-vm-tools/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/vmware/open-vm-tools/releases/download/stable-11.3.5/open-vm-tools-11.3.5-18557794.tar.gz" -sha512 = "fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e" +url = "https://github.com/vmware/open-vm-tools/releases/download/stable-12.1.0/open-vm-tools-12.1.0-20219665.tar.gz" +sha512 = "00cd71a5fc25d854d0043b2ddfb7f759e3b3138acb9f33f7452641d7520e46bfa39ff784bde6c711de6e8aec24309720532100d7a8588fb1bebaa378b9566a2a" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/open-vm-tools/open-vm-tools.spec b/packages/open-vm-tools/open-vm-tools.spec index 692e6b63ed3..adf35501dc6 100644 --- a/packages/open-vm-tools/open-vm-tools.spec +++ b/packages/open-vm-tools/open-vm-tools.spec @@ -1,7 +1,7 @@ -%global buildver 18557794 +%global buildver 20219665 Name: %{_cross_os}open-vm-tools -Version: 11.3.5 +Version: 12.1.0 Release: 1%{?dist} Summary: Tools for VMware License: LGPL-2.1-or-later @@ -44,6 +44,7 @@ autoreconf -fi --disable-servicediscovery \ --disable-tests \ --disable-vgauth \ + --disable-containerinfo \ --with-tirpc \ --with-udev-rules-dir=%{_cross_udevrulesdir} \ --without-dnet \ diff --git a/packages/strace/Cargo.toml b/packages/strace/Cargo.toml index 8c23c02ae98..d0e70a36b31 100644 --- a/packages/strace/Cargo.toml +++ b/packages/strace/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://strace.io/files" [[package.metadata.build-package.external-files]] -url = "https://strace.io/files/5.17/strace-5.17.tar.xz" -sha512 = "1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44" +url = "https://strace.io/files/5.19/strace-5.19.tar.xz" +sha512 = "1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/strace/strace.spec b/packages/strace/strace.spec index 64c1946cdc2..ab7bb99bc7c 100644 --- a/packages/strace/strace.spec +++ b/packages/strace/strace.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}strace -Version: 5.17 +Version: 5.19 Release: 1%{?dist} Summary: Linux syscall tracer License: LGPL-2.1-or-later diff --git a/packages/util-linux/1000-libmount-kernel-compat.patch b/packages/util-linux/1000-libmount-kernel-compat.patch deleted file mode 100644 index 043c84516cf..00000000000 --- a/packages/util-linux/1000-libmount-kernel-compat.patch +++ /dev/null @@ -1,373 +0,0 @@ -commit eccd0130d33cf2348f68d8f83c93909e8b50805d -Author: Tom Kirchner -Date: Wed Jul 28 15:38:26 2021 -0700 - - Revert "libmount: remove read-mountinfo workaround" - - This reverts commit 57898c3a7ee8fc5933cddd4526bb3980bef85a02. - -diff --git a/configure.ac b/configure.ac -index bc9549daf..1c003585b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -528,6 +528,7 @@ AC_CHECK_FUNCS([ \ - __fpending \ - __fpurge \ - fpurge \ -+ fmemopen \ - fsync \ - getdomainname \ - getdtablesize \ -diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h -index d43a83541..9b40457ab 100644 ---- a/libmount/src/mountP.h -+++ b/libmount/src/mountP.h -@@ -98,6 +98,7 @@ extern int mnt_valid_tagname(const char *tagname); - extern int append_string(char **a, const char *b); - - extern const char *mnt_statfs_get_fstype(struct statfs *vfs); -+extern int is_procfs_fd(int fd); - extern int is_file_empty(const char *name); - - extern int mnt_is_readonly(const char *path) -@@ -123,6 +124,7 @@ extern void mnt_free_filesystems(char **filesystems); - extern char *mnt_get_kernel_cmdline_option(const char *name); - extern int mnt_stat_mountpoint(const char *target, struct stat *st); - extern int mnt_lstat_mountpoint(const char *target, struct stat *st); -+extern FILE *mnt_get_procfs_memstream(int fd, char **membuf); - - /* tab.c */ - extern int is_mountinfo(struct libmnt_table *tb); -diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c -index 917779ab6..ba90b7087 100644 ---- a/libmount/src/tab_parse.c -+++ b/libmount/src/tab_parse.c -@@ -696,15 +696,7 @@ static int kernel_fs_postparse(struct libmnt_table *tb, - return rc; - } - --/** -- * mnt_table_parse_stream: -- * @tb: tab pointer -- * @f: file stream -- * @filename: filename used for debug and error messages -- * -- * Returns: 0 on success, negative number in case of error. -- */ --int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filename) -+static int __table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filename) - { - int rc = -1; - int flags = 0; -@@ -785,6 +777,40 @@ err: - return rc; - } - -+/** -+ * mnt_table_parse_stream: -+ * @tb: tab pointer -+ * @f: file stream -+ * @filename: filename used for debug and error messages -+ * -+ * Returns: 0 on success, negative number in case of error. -+ */ -+int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filename) -+{ -+ int fd, rc; -+ FILE *memf = NULL; -+ char *membuf = NULL; -+ -+ /* -+ * For /proc/#/{mountinfo,mount} we read all file to memory and use it -+ * as memory stream. For more details see mnt_read_procfs_file(). -+ */ -+ if ((fd = fileno(f)) >= 0 -+ && (tb->fmt == MNT_FMT_GUESS || -+ tb->fmt == MNT_FMT_MOUNTINFO || -+ tb->fmt == MNT_FMT_MTAB) -+ && is_procfs_fd(fd) -+ && (memf = mnt_get_procfs_memstream(fd, &membuf))) { -+ -+ rc = __table_parse_stream(tb, memf, filename); -+ fclose(memf); -+ free(membuf); -+ } else -+ rc = __table_parse_stream(tb, f, filename); -+ -+ return rc; -+} -+ - /** - * mnt_table_parse_file: - * @tb: tab pointer -@@ -800,18 +826,49 @@ err: - int mnt_table_parse_file(struct libmnt_table *tb, const char *filename) - { - FILE *f; -- int rc; -+ int rc, fd = -1; - - if (!filename || !tb) - return -EINVAL; - -- f = fopen(filename, "r" UL_CLOEXECSTR); -+ /* -+ * Try to use read()+poll() to realiably read all -+ * /proc/#/{mount,mountinfo} file to memory -+ */ -+ if (tb->fmt != MNT_FMT_SWAPS -+ && strncmp(filename, "/proc/", 6) == 0) { -+ -+ FILE *memf; -+ char *membuf = NULL; -+ -+ fd = open(filename, O_RDONLY|O_CLOEXEC); -+ if (fd < 0) { -+ rc = -errno; -+ goto done; -+ } -+ memf = mnt_get_procfs_memstream(fd, &membuf); -+ if (memf) { -+ rc = __table_parse_stream(tb, memf, filename); -+ -+ fclose(memf); -+ free(membuf); -+ close(fd); -+ goto done; -+ } -+ /* else fallback to fopen/fdopen() */ -+ } -+ -+ if (fd >= 0) -+ f = fdopen(fd, "r" UL_CLOEXECSTR); -+ else -+ f = fopen(filename, "r" UL_CLOEXECSTR); -+ - if (f) { -- rc = mnt_table_parse_stream(tb, f, filename); -+ rc = __table_parse_stream(tb, f, filename); - fclose(f); - } else - rc = -errno; -- -+done: - DBG(TAB, ul_debugobj(tb, "parsing done [filename=%s, rc=%d]", filename, rc)); - return rc; - } -@@ -868,7 +925,7 @@ static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname) - - f = fopen_at(dd, d->d_name, O_RDONLY|O_CLOEXEC, "r" UL_CLOEXECSTR); - if (f) { -- mnt_table_parse_stream(tb, f, d->d_name); -+ __table_parse_stream(tb, f, d->d_name); - fclose(f); - } - } -@@ -909,7 +966,7 @@ static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname) - f = fopen_at(dirfd(dir), d->d_name, - O_RDONLY|O_CLOEXEC, "r" UL_CLOEXECSTR); - if (f) { -- mnt_table_parse_stream(tb, f, d->d_name); -+ __table_parse_stream(tb, f, d->d_name); - fclose(f); - } - } -diff --git a/libmount/src/utils.c b/libmount/src/utils.c -index 35afce32c..b8dcab235 100644 ---- a/libmount/src/utils.c -+++ b/libmount/src/utils.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - - #include "strutils.h" -@@ -449,6 +450,13 @@ const char *mnt_statfs_get_fstype(struct statfs *vfs) - return NULL; - } - -+int is_procfs_fd(int fd) -+{ -+ struct statfs sfs; -+ -+ return fstatfs(fd, &sfs) == 0 && sfs.f_type == STATFS_PROC_MAGIC; -+} -+ - /** - * mnt_match_fstype: - * @type: filesystem type -@@ -1168,7 +1176,164 @@ done: - return 1; - } - -+#if defined(HAVE_FMEMOPEN) || defined(TEST_PROGRAM) -+ -+/* -+ * This function tries to minimize possible races when we read -+ * /proc/#/{mountinfo,mount} files. -+ * -+ * The idea is to minimize number of read()s and check by poll() that during -+ * the read the mount table has not been modified. If yes, than re-read it -+ * (with some limitations to avoid never ending loop). -+ * -+ * Returns: <0 error, 0 success, 1 too many attempts -+ */ -+static int read_procfs_file(int fd, char **buf, size_t *bufsiz) -+{ -+ size_t bufmax = 0; -+ int rc = 0, tries = 0, ninters = 0; -+ char *bufptr = NULL; -+ -+ assert(buf); -+ assert(bufsiz); -+ -+ *bufsiz = 0; -+ *buf = NULL; -+ -+ do { -+ ssize_t ret; -+ -+ if (!bufptr || bufmax == *bufsiz) { -+ char *tmp; -+ -+ bufmax = bufmax ? bufmax * 2 : (16 * 1024); -+ tmp = realloc(*buf, bufmax); -+ if (!tmp) -+ break; -+ *buf = tmp; -+ bufptr = tmp + *bufsiz; -+ } -+ -+ errno = 0; -+ ret = read(fd, bufptr, bufmax - *bufsiz); -+ -+ if (ret < 0) { -+ /* error */ -+ if ((errno == EAGAIN || errno == EINTR) && (ninters++ < 5)) { -+ xusleep(200000); -+ continue; -+ } -+ break; -+ -+ } if (ret > 0) { -+ /* success -- verify no event during read */ -+ struct pollfd fds[] = { -+ { .fd = fd, .events = POLLPRI } -+ }; -+ -+ rc = poll(fds, 1, 0); -+ if (rc < 0) -+ break; /* poll() error */ -+ if (rc > 0) { -+ /* event -- read all again */ -+ if (lseek(fd, 0, SEEK_SET) != 0) -+ break; -+ *bufsiz = 0; -+ bufptr = *buf; -+ tries++; -+ -+ if (tries > 10) -+ /* busy system? -- wait */ -+ xusleep(10000); -+ continue; -+ } -+ -+ /* successful read() without active poll() */ -+ (*bufsiz) += (size_t) ret; -+ bufptr += ret; -+ tries = ninters = 0; -+ } else { -+ /* end-of-file */ -+ goto success; -+ } -+ } while (tries <= 100); -+ -+ rc = errno ? -errno : 1; -+ free(*buf); -+ return rc; -+ -+success: -+ return 0; -+} -+ -+/* -+ * Create FILE stream for data from read_procfs_file() -+ */ -+FILE *mnt_get_procfs_memstream(int fd, char **membuf) -+{ -+ size_t sz = 0; -+ off_t cur; -+ -+ *membuf = NULL; -+ -+ /* in case of error, rewind to the original position */ -+ cur = lseek(fd, 0, SEEK_CUR); -+ -+ if (read_procfs_file(fd, membuf, &sz) == 0 && sz > 0) { -+ FILE *memf = fmemopen(*membuf, sz, "r"); -+ if (memf) -+ return memf; /* success */ -+ -+ free(*membuf); -+ *membuf = NULL; -+ } -+ -+ /* error */ -+ if (cur != (off_t) -1) -+ lseek(fd, cur, SEEK_SET); -+ return NULL; -+} -+#else -+FILE *mnt_get_procfs_memstream(int fd __attribute((__unused__)), -+ char **membuf __attribute((__unused__))) -+{ -+ return NULL; -+} -+#endif /* HAVE_FMEMOPEN */ -+ -+ - #ifdef TEST_PROGRAM -+static int test_proc_read(struct libmnt_test *ts, int argc, char *argv[]) -+{ -+ char *buf = NULL; -+ char *filename = argv[1]; -+ size_t bufsiz = 0; -+ int rc = 0, fd = open(filename, O_RDONLY); -+ -+ if (fd <= 0) { -+ warn("%s: cannot open", filename); -+ return -errno; -+ } -+ -+ rc = read_procfs_file(fd, &buf, &bufsiz); -+ close(fd); -+ -+ switch (rc) { -+ case 0: -+ fwrite(buf, 1, bufsiz, stdout); -+ free(buf); -+ break; -+ case 1: -+ warnx("too many attempts"); -+ break; -+ default: -+ warn("%s: cannot read", filename); -+ break; -+ } -+ -+ return rc; -+} -+ - static int test_match_fstype(struct libmnt_test *ts, int argc, char *argv[]) - { - char *type = argv[1]; -@@ -1350,6 +1515,7 @@ int main(int argc, char *argv[]) - { "--guess-root", test_guess_root, "[]" }, - { "--mkdir", test_mkdir, "" }, - { "--statfs-type", test_statfs_type, "" }, -+ { "--read-procfs", test_proc_read, "" }, - - { NULL } - }; diff --git a/packages/util-linux/Cargo.toml b/packages/util-linux/Cargo.toml index 88fea730953..48cc6aedbfa 100644 --- a/packages/util-linux/Cargo.toml +++ b/packages/util-linux/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://www.kernel.org/pub/linux/utils/util-linux" [[package.metadata.build-package.external-files]] -url = "https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.4.tar.xz" -sha512 = "ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7" +url = "https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz" +sha512 = "07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/util-linux/util-linux.spec b/packages/util-linux/util-linux.spec index 79b6bd01a32..445a3e01b5a 100644 --- a/packages/util-linux/util-linux.spec +++ b/packages/util-linux/util-linux.spec @@ -1,5 +1,5 @@ -%global majorminor 2.37 -%global version %{majorminor}.4 +%global majorminor 2.38 +%global version %{majorminor}.1 Name: %{_cross_os}util-linux Version: %{version} @@ -9,12 +9,6 @@ License: BSD-3-Clause AND BSD-4-Clause-UC AND GPL-1.0-or-later AND GPL-2.0-only URL: http://en.wikipedia.org/wiki/Util-linux Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{majorminor}/util-linux-%{version}.tar.xz -# Note: remove the autogen.sh call when we no longer patch anything in the -# build system. - -# Retain compatibility with kernels <5.8 -Patch1000: 1000-libmount-kernel-compat.patch - BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libacl-devel BuildRequires: %{_cross_os}libselinux-devel @@ -116,8 +110,6 @@ Requires: %{_cross_os}libuuid cp Documentation/licenses/COPYING.* . %build -# We have patches that touch the build system, so we need to regenerate -./autogen.sh %cross_configure \ --disable-makeinstall-chown \ @@ -187,6 +179,7 @@ done %{_cross_bindir}/lscpu %{_cross_bindir}/lsipc %{_cross_bindir}/lsirq +%{_cross_bindir}/lsfd %{_cross_bindir}/lslocks %{_cross_bindir}/lsmem %{_cross_bindir}/lsns diff --git a/variants/Cargo.lock b/variants/Cargo.lock index cf8bb894f02..cc791d3c58a 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -515,6 +515,7 @@ version = "0.1.0" dependencies = [ "glibc", "libffi", + "libpcre", "libselinux", "libz", "util-linux",