From 2cf35a09e1c18ffa93e7aba5c8007205ca9dae58 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:14 +0000 Subject: [PATCH 01/23] ecs-agent: update to 1.58.0 --- ...06-bottlerocket-Revert-removing-duplicate-build-tags.patch | 2 +- packages/ecs-agent/Cargo.toml | 4 ++-- packages/ecs-agent/ecs-agent.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch b/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch index 2a6e0418edb..1b14078d5aa 100644 --- a/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch +++ b/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch @@ -2813,7 +2813,7 @@ index b23fcdf9..1e73e997 100644 --- a/agent/stats/task_unspecified.go +++ b/agent/stats/task_unspecified.go @@ -1,4 +1,5 @@ - //go:build !linux + //go:build !linux && !windows +// +build !linux // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. diff --git a/packages/ecs-agent/Cargo.toml b/packages/ecs-agent/Cargo.toml index 77e22f4ceef..ee9bdb5ce81 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.57.0/amazon-ecs-agent-v1.57.0.tar.gz" -sha512 = "a5ec9251af2b5d56eaeb7e1c1005480eabfa43a60ee868c3bc48a78cb976c7369c7afe2c9cad85fcc2826dd56ca88f012d0e5743ff12244b7b29ed4778ce170b" +url = "https://github.com/aws/amazon-ecs-agent/archive/v1.58.0/amazon-ecs-agent-v1.58.0.tar.gz" +sha512 = "f8636874c81fd99afc219f9bb6153dfc1f5fc2c6e6a025ec734450d6b2a7410646ad629ef23d2f2249f36e90b69a8b69b5e923adb71f07b3c46ecfe87c138b6a" # 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 e1365585e7f..162dee184ab 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.57.0 +%global agent_gover 1.58.0 # git rev-parse --short=8 -%global agent_gitrev fe79b107 +%global agent_gitrev 80ad4ca4 %global ecscni_goproject github.com/aws %global ecscni_gorepo amazon-ecs-cni-plugins From e5110092d05ff69a22bf7facc310d6f773dbd0be Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:24 +0000 Subject: [PATCH 02/23] aws-iam-authenticator: update to 0.5.3 Upstream missed updating the vendored go dependencies for this release, so we apply a patch to update them. --- packages/aws-iam-authenticator/.gitignore | 1 + packages/aws-iam-authenticator/Cargo.toml | 9 +++++++-- .../aws-iam-authenticator/aws-iam-authenticator.spec | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 packages/aws-iam-authenticator/.gitignore diff --git a/packages/aws-iam-authenticator/.gitignore b/packages/aws-iam-authenticator/.gitignore new file mode 100644 index 00000000000..0ad3dc5dd80 --- /dev/null +++ b/packages/aws-iam-authenticator/.gitignore @@ -0,0 +1 @@ +0001-Update-vendored-go-dependencies.patch diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml index 460c9350782..f0a7151bffd 100644 --- a/packages/aws-iam-authenticator/Cargo.toml +++ b/packages/aws-iam-authenticator/Cargo.toml @@ -12,8 +12,13 @@ path = "pkg.rs" releases-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.2/aws-iam-authenticator-0.5.2.tar.gz" -sha512 = "a16a630096ed3223d156e1586f02ffcfcf256f12530ba565f5f1f649c83418cd71ea66c554c9e1edd1b44dd745d9393f4ed4c63c62677ae973e9bd9a1a24fe5b" +url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.3/aws-iam-authenticator-0.5.3.tar.gz" +sha512 = "430af9fd04b9a94205a485281fb668f5bc18cdac569de0232fa98e08ebb0e08a8d233537bd3373a5f1e53cf529bc2050aebc34a4a53c8b29a831070e34213210" + +# This blob includes a patch which updates the vendored go dependencies of aws-iam-authenticator, which weren't updated upstream for the 0.5.3 release. +[[package.metadata.build-package.external-files]] +url = "https://cache.bottlerocket.aws/aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch/39c9ef0c143b4a6c1374c24cdd7a13a8f5662f206a3200f6d07224359ec0f8350e1456510e9c891fd2e01ac9d261b2d51239a03883b88f1936d8735a01d3bf5f/aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch" +sha512 = "39c9ef0c143b4a6c1374c24cdd7a13a8f5662f206a3200f6d07224359ec0f8350e1456510e9c891fd2e01ac9d261b2d51239a03883b88f1936d8735a01d3bf5f" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/aws-iam-authenticator/aws-iam-authenticator.spec b/packages/aws-iam-authenticator/aws-iam-authenticator.spec index dde876bcb87..1e993fe6cc2 100644 --- a/packages/aws-iam-authenticator/aws-iam-authenticator.spec +++ b/packages/aws-iam-authenticator/aws-iam-authenticator.spec @@ -2,7 +2,7 @@ %global gorepo aws-iam-authenticator %global goimport %{goproject}/%{gorepo} -%global gover 0.5.2 +%global gover 0.5.3 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 @@ -15,6 +15,10 @@ License: Apache-2.0 URL: https://%{goimport} Source0: https://%{goimport}/archive/v%{gover}/%{gorepo}-%{gover}.tar.gz Source1000: clarify.toml + +# 0.5.3 release did not include necessary vendored dependencies. +Patch0001: aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch + BuildRequires: git BuildRequires: %{_cross_os}glibc-devel From 47b629cd23ca6e33d2d4a8d0432ff3e79eeb9d2f Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:27 +0000 Subject: [PATCH 03/23] containerd: update to 1.5.9 --- packages/containerd/Cargo.toml | 4 ++-- packages/containerd/containerd.spec | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml index b360ec7d83a..3e45d6d4978 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.5.8/containerd-1.5.8.tar.gz" -sha512 = "c769506ff6d98689c46ffee94d70ae00ef2f32e0daac1e631cbe8a587f67c7e4f83eb3895707362bdf46198b61823c99df1d8ca61095ab1415de5596f106fd07" +url = "https://github.com/containerd/containerd/archive/v1.5.9/containerd-1.5.9.tar.gz" +sha512 = "13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b" # RPM BuildRequires [build-dependencies] diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec index 6056f84dc9f..4774383866d 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.5.8 +%global gover 1.5.9 %global rpmver %{gover} -%global gitrev 1e5ef943eb76627a6d3b6de8cd1ef6537f393a71 +%global gitrev 1407cab509ff0d96baa4f0eb6ff9980270e6e620 %global _dwz_low_mem_die_limit 0 @@ -25,9 +25,6 @@ Source1000: clarify.toml # TODO: submit this upstream, including a unit test. Patch1001: 1001-cri-set-default-RLIMIT_NOFILE.patch -# CVE-2021-43816 -Patch2001: containerd-1.5-only-relabel-cri-managed-host-mounts.patch - BuildRequires: git BuildRequires: %{_cross_os}glibc-devel Requires: %{_cross_os}runc From a4b81ac04eb8ccf4355f5cf55cca800eb76a9dfb Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:29 +0000 Subject: [PATCH 04/23] chrony: update to 4.2 --- ...clone3-and-pread64-in-seccomp-filter.patch | 35 ------------------- packages/chrony/Cargo.toml | 4 +-- packages/chrony/chrony.spec | 5 +-- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 packages/chrony/0001-sys_linux-allow-clone3-and-pread64-in-seccomp-filter.patch diff --git a/packages/chrony/0001-sys_linux-allow-clone3-and-pread64-in-seccomp-filter.patch b/packages/chrony/0001-sys_linux-allow-clone3-and-pread64-in-seccomp-filter.patch deleted file mode 100644 index c2574b62c0a..00000000000 --- a/packages/chrony/0001-sys_linux-allow-clone3-and-pread64-in-seccomp-filter.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bbbd80bf03223f181d4abf5c8e5fe6136ab6129a Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Mon, 9 Aug 2021 11:48:21 +0200 -Subject: [PATCH] sys_linux: allow clone3 and pread64 in seccomp filter - -These seem to be needed with the latest glibc. ---- - sys_linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sys_linux.c b/sys_linux.c -index 50c0843..2b53f72 100644 ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - - /* Process */ - SCMP_SYS(clone), -+#ifdef __NR_clone3 -+ SCMP_SYS(clone3), -+#endif - SCMP_SYS(exit), - SCMP_SYS(exit_group), - SCMP_SYS(getpid), -@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - #ifdef __NR_ppoll_time64 - SCMP_SYS(ppoll_time64), - #endif -+ SCMP_SYS(pread64), - SCMP_SYS(pselect6), - #ifdef __NR_pselect6_time64 - SCMP_SYS(pselect6_time64), --- -2.21.3 - diff --git a/packages/chrony/Cargo.toml b/packages/chrony/Cargo.toml index 0fdfed4c87b..c0bb9005f2f 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.1.tar.gz" -sha512 = "5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f" +url = "https://download.tuxfamily.org/chrony/chrony-4.2.tar.gz" +sha512 = "7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/chrony/chrony.spec b/packages/chrony/chrony.spec index e867c28e9cc..921b7d82868 100644 --- a/packages/chrony/chrony.spec +++ b/packages/chrony/chrony.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}chrony -Version: 4.1 +Version: 4.2 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 -# Fix seccomp filter for glibc 2.34+ -Patch0001: 0001-sys_linux-allow-clone3-and-pread64-in-seccomp-filter.patch - BuildRequires: %{_cross_os}glibc-devel BuildRequires: %{_cross_os}libcap-devel BuildRequires: %{_cross_os}libseccomp-devel From cec1b35b9bb47783060ad9dafbb8d99430a07175 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:31 +0000 Subject: [PATCH 05/23] kubernetes-1.20: update to 1.20.15 --- packages/kubernetes-1.20/Cargo.toml | 4 ++-- packages/kubernetes-1.20/kubernetes-1.20.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kubernetes-1.20/Cargo.toml b/packages/kubernetes-1.20/Cargo.toml index 345b4a40226..9d61f403a6f 100644 --- a/packages/kubernetes-1.20/Cargo.toml +++ b/packages/kubernetes-1.20/Cargo.toml @@ -15,8 +15,8 @@ package-name = "kubernetes-1.20" releases-url = "https://github.com/kubernetes/kubernetes/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes/kubernetes/archive/v1.20.12/kubernetes-1.20.12.tar.gz" -sha512 = "42f9d000454ae4717a9a7026fa0f1af192e160deddc6e44044993183036e67bdb9fdae02d9fcb7556370f75a44a739c49da5daf091d3b88b6dd4101e6aafe6ac" +url = "https://github.com/kubernetes/kubernetes/archive/v1.20.15/kubernetes-1.20.15.tar.gz" +sha512 = "760c75c5eef9410ee1f0efc2944f45d259fa41175ce064f1c18224df0dfb1355fb2a7b9652e0af3c814987d3ae86a96f39aa2b686280eed745bdfe6f29dfb35c" # RPM BuildRequires [build-dependencies] diff --git a/packages/kubernetes-1.20/kubernetes-1.20.spec b/packages/kubernetes-1.20/kubernetes-1.20.spec index 932f08af555..886f03d6403 100644 --- a/packages/kubernetes-1.20/kubernetes-1.20.spec +++ b/packages/kubernetes-1.20/kubernetes-1.20.spec @@ -2,7 +2,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.20.12 +%global gover 1.20.15 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 From 3a819683a3d2c03d8da3ab8ba739a5231d23c459 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:33 +0000 Subject: [PATCH 06/23] kubernetes-1.21: update to 1.21.9 --- packages/kubernetes-1.21/Cargo.toml | 4 ++-- packages/kubernetes-1.21/kubernetes-1.21.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kubernetes-1.21/Cargo.toml b/packages/kubernetes-1.21/Cargo.toml index 2bda259dc7b..2f04ad76de8 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.6/kubernetes-1.21.6.tar.gz" -sha512 = "a53dc25aa091075d73b7f8ae9a518c019a16b821bce6cfe3ff191cf4098df8851de03ec0a9292e534045323b8300532a23e6caceae3e6dfaea00471eac16a223" +url = "https://github.com/kubernetes/kubernetes/archive/v1.21.9/kubernetes-1.21.9.tar.gz" +sha512 = "d334cab0fa3c173c12eb73c2f6f34a8745447525c6524ebd556cd18587345012e518a2ddb77484f48e01f4bbd795177b0c8b067bdf66715f60a70b0566ac66e8" # 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 fbc08a99684..632ec8ba1b7 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.6 +%global gover 1.21.9 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 From 461594d84cd27c4b895e61c81ed71f700d16f6c7 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:34 +0000 Subject: [PATCH 07/23] runc: update to 1.1 --- packages/runc/Cargo.toml | 6 +++--- packages/runc/runc.spec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/runc/Cargo.toml b/packages/runc/Cargo.toml index fae11055a0d..d97cd920d32 100644 --- a/packages/runc/Cargo.toml +++ b/packages/runc/Cargo.toml @@ -12,9 +12,9 @@ path = "pkg.rs" releases-url = "https://github.com/opencontainers/runc/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/opencontainers/runc/releases/download/v1.0.2/runc.tar.xz" -path = "runc-v1.0.2.tar.xz" -sha512 = "2feae69e7680c55de4dc9bb7d77e8275b47b58f5549b061bd6ceef493cb16a5505e0077cf36fea4b0ec799327143aa9f5f46572d55007270ac93fa87aaadd530" +url = "https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.tar.xz" +path = "runc-v1.1.0.tar.xz" +sha512 = "fddd9d7f874e21a718c734c85cafc0c917ba90a38a478df42c4cd4a4bc57cdce2de6462ab8f71fe39f3e926777d0e43793db841579f884076d3178e3313c4774" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/runc/runc.spec b/packages/runc/runc.spec index c298d96cbe9..1197c3705a7 100644 --- a/packages/runc/runc.spec +++ b/packages/runc/runc.spec @@ -1,8 +1,8 @@ %global goproject github.com/opencontainers %global gorepo runc %global goimport %{goproject}/%{gorepo} -%global commit 52b36a2dd837e8462de8e01458bf02cf9eea47dd -%global gover 1.0.2 +%global commit 067aaf8548d78269dcb2c13b856775e27c410f9c +%global gover 1.1.0 %global _dwz_low_mem_die_limit 0 From 60a811e77a99352df279bfc565368e1af1df195b Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:36 +0000 Subject: [PATCH 08/23] strace: update to 5.16 --- packages/strace/Cargo.toml | 4 ++-- packages/strace/strace.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/strace/Cargo.toml b/packages/strace/Cargo.toml index 49bb7ac24c8..e432a5185c1 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.14/strace-5.14.tar.xz" -sha512 = "3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a" +url = "https://strace.io/files/5.16/strace-5.16.tar.xz" +sha512 = "db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/strace/strace.spec b/packages/strace/strace.spec index 9c75b5c1520..e75811f80ea 100644 --- a/packages/strace/strace.spec +++ b/packages/strace/strace.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}strace -Version: 5.14 +Version: 5.16 Release: 1%{?dist} Summary: Linux syscall tracer License: LGPL-2.1-or-later From e8b8a6107c94a66284d8e34b949a18a83c7ac93f Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:38 +0000 Subject: [PATCH 09/23] libcap: update to 2.63 --- packages/libcap/Cargo.toml | 4 ++-- packages/libcap/libcap.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libcap/Cargo.toml b/packages/libcap/Cargo.toml index a9d9ddfb923..333c57076e2 100644 --- a/packages/libcap/Cargo.toml +++ b/packages/libcap/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://sites.google.com/site/fullycapable/release-notes-for-libcap" [[package.metadata.build-package.external-files]] -url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.60.tar.gz" -sha512 = "0c65e82f226451e4498c5f2594e54aa29b92e9e4362fa8e99a08d2b64dab956950e80eeb7d9b688f619ae507265201a63a024d2fc77829100901b3a96210194e" +url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.63.tar.gz" +sha512 = "0db42bc9079c75b539fd7511531a2088ba37f8d4fe75799606976a3f36bc240c4b7c87402c4b71b9c455daed098a3ddaa31687d70ed45168d471df131e2898f1" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libcap/libcap.spec b/packages/libcap/libcap.spec index 4adbb906588..89b2a606e86 100644 --- a/packages/libcap/libcap.spec +++ b/packages/libcap/libcap.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libcap -Version: 2.60 +Version: 2.63 Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities License: GPL-2.0-only OR BSD-3-Clause From ccaf338cfb47517723104d67ec755952a2a1e067 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:39 +0000 Subject: [PATCH 10/23] e2fsprogs: update to 1.46.5 --- packages/e2fsprogs/Cargo.toml | 4 ++-- packages/e2fsprogs/e2fsprogs.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2fsprogs/Cargo.toml b/packages/e2fsprogs/Cargo.toml index 095dfeb9a29..991479afd9f 100644 --- a/packages/e2fsprogs/Cargo.toml +++ b/packages/e2fsprogs/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs" [[package.metadata.build-package.external-files]] -url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz" -sha512 = "7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d" +url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.xz" +sha512 = "53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/e2fsprogs/e2fsprogs.spec b/packages/e2fsprogs/e2fsprogs.spec index 6aadebe21d3..4227e21684c 100644 --- a/packages/e2fsprogs/e2fsprogs.spec +++ b/packages/e2fsprogs/e2fsprogs.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}e2fsprogs -Version: 1.46.4 +Version: 1.46.5 Release: 1%{?dist} Summary: Tools for managing ext2, ext3, and ext4 file systems License: GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND BSD-3-Clause From 0139d02760b3ab74d261c9e96b364c6e01919b0a Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:40 +0000 Subject: [PATCH 11/23] wicked: update to 0.6.68 --- .../wicked/1001-avoid-gcrypt-dependency.patch | 12 ++++++------ .../1002-exclude-unused-components.patch | 8 ++++---- ...st-and-schema-sources-for-runtime-use.patch | 10 +++++----- ...ust-safeguard-for-dhcp6-defer-timeout.patch | 18 +++++++++--------- packages/wicked/Cargo.toml | 4 ++-- packages/wicked/wicked.spec | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/wicked/1001-avoid-gcrypt-dependency.patch b/packages/wicked/1001-avoid-gcrypt-dependency.patch index 8c8a0141dee..a80cde3c505 100644 --- a/packages/wicked/1001-avoid-gcrypt-dependency.patch +++ b/packages/wicked/1001-avoid-gcrypt-dependency.patch @@ -1,7 +1,7 @@ -From d7c3d65bf98d3695bfb2a831b1a6b3c65aa2a9fd Mon Sep 17 00:00:00 2001 +From 86613c3486af4c01c3281b8064ffeaea1566732b Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Fri, 9 Aug 2019 16:39:28 +0000 -Subject: [PATCH 1001/1004] avoid gcrypt dependency +Subject: [PATCH 1/4] avoid gcrypt dependency gcrypt is only used for its implementations of SHA-1 and MD5, in order to generate UUIDs to fingerprint the XML configuration files. These @@ -20,7 +20,7 @@ Signed-off-by: Ben Cressey 3 files changed, 15 insertions(+), 83 deletions(-) diff --git a/configure.ac b/configure.ac -index 08df65c..b94dcf4 100644 +index 08df65ca..b94dcf48 100644 --- a/configure.ac +++ b/configure.ac @@ -242,14 +242,6 @@ AC_CHECK_LIB([anl], [getaddrinfo_a], [LIBANL_LIBS="-lanl"],[ @@ -39,7 +39,7 @@ index 08df65c..b94dcf4 100644 PKG_CHECK_MODULES(LIBNL, [libnl-3.0 libnl-route-3.0]) PKG_CHECK_MODULES(LIBDBUS, [dbus-1]) diff --git a/src/hashcsum.c b/src/hashcsum.c -index 4fc0dfc..eeb41ee 100644 +index 4fc0dfce..eeb41eee 100644 --- a/src/hashcsum.c +++ b/src/hashcsum.c @@ -27,10 +27,12 @@ @@ -160,7 +160,7 @@ index 4fc0dfc..eeb41ee 100644 } diff --git a/src/netinfo.c b/src/netinfo.c -index 9598155..63bb6a9 100644 +index 9598155d..63bb6a9f 100644 --- a/src/netinfo.c +++ b/src/netinfo.c @@ -33,7 +33,6 @@ @@ -227,5 +227,5 @@ index 9598155..63bb6a9 100644 if (appname == NULL) { /* Backward compatible - for now. -- -2.21.3 +2.32.0 diff --git a/packages/wicked/1002-exclude-unused-components.patch b/packages/wicked/1002-exclude-unused-components.patch index 9943feaf305..ee815414310 100644 --- a/packages/wicked/1002-exclude-unused-components.patch +++ b/packages/wicked/1002-exclude-unused-components.patch @@ -1,7 +1,7 @@ -From 73a6d2a91625771f2b3c87651fe234ac4dae4e75 Mon Sep 17 00:00:00 2001 +From ddd3d20d40b8df6c97312f8ad723ca543a08e046 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 10 Aug 2019 04:53:31 +0000 -Subject: [PATCH 1002/1004] exclude unused components +Subject: [PATCH 2/4] exclude unused components The extensions are all shell scripts, which we don't support. The docs require a native helper program to generate, which doesn't work. While @@ -14,7 +14,7 @@ Signed-off-by: Ben Cressey 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 8f6bffc..2fa645a 100644 +index 71c2fbb5..0278e40b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.* \ @@ -27,5 +27,5 @@ index 8f6bffc..2fa645a 100644 pkgconfig_DATA = wicked.pc -- -2.21.3 +2.32.0 diff --git a/packages/wicked/1003-ship-mkconst-and-schema-sources-for-runtime-use.patch b/packages/wicked/1003-ship-mkconst-and-schema-sources-for-runtime-use.patch index 6e16a68f8a7..65ec8ce39d5 100644 --- a/packages/wicked/1003-ship-mkconst-and-schema-sources-for-runtime-use.patch +++ b/packages/wicked/1003-ship-mkconst-and-schema-sources-for-runtime-use.patch @@ -1,7 +1,7 @@ -From d108d9eee746b0d9a03f8fd124cbf651da9ba254 Mon Sep 17 00:00:00 2001 +From 66a794b0eeda8c293e29614c2072f265586d8805 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 10 Aug 2019 18:31:42 +0000 -Subject: [PATCH 1003/1004] ship mkconst and schema sources for runtime use +Subject: [PATCH 3/4] ship mkconst and schema sources for runtime use `mkconst` needs to be compiled for the host architecture, but relies on most of the sources in wicked and needs all of the same libraries. @@ -17,7 +17,7 @@ Signed-off-by: Ben Cressey 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/schema/Makefile.am b/schema/Makefile.am -index 462dc04..03a4bcd 100644 +index 462dc044..03a4bcd3 100644 --- a/schema/Makefile.am +++ b/schema/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in @@ -30,7 +30,7 @@ index 462dc04..03a4bcd 100644 wicked_schema_files = \ addrconf.xml \ diff --git a/util/Makefile.am b/util/Makefile.am -index 2af1435..bb9697e 100644 +index 2af1435b..bb9697e1 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -2,7 +2,8 @@ @@ -44,5 +44,5 @@ index 2af1435..bb9697e 100644 AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/include -- -2.21.3 +2.32.0 diff --git a/packages/wicked/1004-adjust-safeguard-for-dhcp6-defer-timeout.patch b/packages/wicked/1004-adjust-safeguard-for-dhcp6-defer-timeout.patch index 7237c43e761..3847e685bd9 100644 --- a/packages/wicked/1004-adjust-safeguard-for-dhcp6-defer-timeout.patch +++ b/packages/wicked/1004-adjust-safeguard-for-dhcp6-defer-timeout.patch @@ -1,7 +1,7 @@ -From a9e6198232b38a778471f986ee416cb78d41e728 Mon Sep 17 00:00:00 2001 +From 872581355f4bff115abd849267b52bb96ef8d4bb Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 8 Nov 2021 05:13:35 +0000 -Subject: [PATCH 1004/1004] adjust safeguard for dhcp6 defer timeout +Subject: [PATCH 4/4] adjust safeguard for dhcp6 defer timeout For low timeout values, such as one second, we could sometimes wait twice as long as expected if the timer fired early. If we're within @@ -13,18 +13,18 @@ Signed-off-by: Ben Cressey 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcp6/fsm.c b/src/dhcp6/fsm.c -index b3284f6..690e365 100644 +index 08624b49..b864efd6 100644 --- a/src/dhcp6/fsm.c +++ b/src/dhcp6/fsm.c -@@ -563,7 +563,7 @@ ni_dhcp6_fsm_timeout(ni_dhcp6_device_t *dev) +@@ -569,7 +569,7 @@ ni_dhcp6_fsm_timeout(ni_dhcp6_device_t *dev) /* Do we still need this safeguard? */ - deadline = ni_dhcp6_remaining_time(&dev->start_time, - dev->config->defer_timeout); + deadline = ni_lifetime_left(dev->config->defer_timeout, + &dev->start_time, NULL); - if (deadline) { + if (deadline > 1) { - deadline *= 1000; - ni_dhcp6_fsm_set_timeout_msec(dev, deadline); + ni_dhcp6_fsm_set_timeout_sec(dev, deadline); dev->fsm.fail_on_timeout = 0; + return; -- -2.21.3 +2.32.0 diff --git a/packages/wicked/Cargo.toml b/packages/wicked/Cargo.toml index 953d6329790..2dbe66eafec 100644 --- a/packages/wicked/Cargo.toml +++ b/packages/wicked/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/openSUSE/wicked/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/openSUSE/wicked/archive/version-0.6.66.tar.gz" -sha512 = "4898e065a77c3158702b1a32e2317a97821df2bc54a9df52e6b3626e4787602771983717a90eb999d7e4a119e4705bfeeb213de8361877fae2a6cda178c329bd" +url = "https://github.com/openSUSE/wicked/archive/version-0.6.68.tar.gz" +sha512 = "b087d58b84d44a33ae9e88fdf3a8a4c5dbe5046c7a42450bd449fcd9903bb0c6e1635f1bdf7ba98ffdb9729133f7450065ea4605542e779caf44ff241d91cb93" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/wicked/wicked.spec b/packages/wicked/wicked.spec index 37977bf3f5c..26f7825ca6c 100644 --- a/packages/wicked/wicked.spec +++ b/packages/wicked/wicked.spec @@ -11,7 +11,7 @@ %bcond_with bootstrap # without Name: %{_cross_os}wicked -Version: 0.6.66 +Version: 0.6.68 Release: 1%{?dist} Summary: Network configuration infrastructure License: GPL-2.0-or-later AND (GPL-2.0-only OR BSD-3-Clause) From d8fe38d9dbc9140f1a075ca0d0f209c9efcf8283 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:41 +0000 Subject: [PATCH 12/23] iputils: update to 20211215 --- packages/iputils/1000-skip-ipv6-test.patch | 4 ++-- packages/iputils/Cargo.toml | 6 +++--- packages/iputils/iputils.spec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/iputils/1000-skip-ipv6-test.patch b/packages/iputils/1000-skip-ipv6-test.patch index 9686ec51a2f..f1495a7a59e 100644 --- a/packages/iputils/1000-skip-ipv6-test.patch +++ b/packages/iputils/1000-skip-ipv6-test.patch @@ -1,7 +1,7 @@ diff --git iputils.orig/ping/meson.build iputils/ping/meson.build index 1e678ec..eedd04b 100644 ---- iputils.orig/ping/meson.build -+++ iputils/ping/meson.build +--- iputils.orig/test/ping/meson.build ++++ iputils/ping/test/meson.build @@ -35,7 +35,7 @@ endif # https://github.com/actions/virtual-environments/issues/668 ipv6_dst = [] diff --git a/packages/iputils/Cargo.toml b/packages/iputils/Cargo.toml index fec63aef21f..6041c570ec2 100644 --- a/packages/iputils/Cargo.toml +++ b/packages/iputils/Cargo.toml @@ -12,9 +12,9 @@ path = "pkg.rs" releases-url = "https://github.com/iputils/iputils/releases" [[package.metadata.build-package.external-files]] -path = "iputils-20210722.tar.gz" -url = "https://github.com/iputils/iputils/archive/20210722.tar.gz" -sha512 = "8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328" +path = "iputils-20211215.tar.gz" +url = "https://github.com/iputils/iputils/archive/20211215.tar.gz" +sha512 = "191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/iputils/iputils.spec b/packages/iputils/iputils.spec index 59d9336d979..b98a1886687 100644 --- a/packages/iputils/iputils.spec +++ b/packages/iputils/iputils.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}iputils -Version: 20210722 +Version: 20211215 Release: 1%{?dist} Summary: A set of network monitoring tools License: GPL-2.0-or-later AND BSD-3-Clause From 6300593ed3b9af42a6fe456429040e7006db910b Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:43 +0000 Subject: [PATCH 13/23] libacl: update to 2.3.1 --- packages/libacl/Cargo.toml | 4 ++-- packages/libacl/libacl.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libacl/Cargo.toml b/packages/libacl/Cargo.toml index 259a3f754b3..6ac63531407 100644 --- a/packages/libacl/Cargo.toml +++ b/packages/libacl/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://download-mirror.savannah.gnu.org/releases/acl" [[package.metadata.build-package.external-files]] -url = "https://download-mirror.savannah.gnu.org/releases/acl/acl-2.2.53.tar.gz" -sha512 = "176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716" +url = "https://download-mirror.savannah.gnu.org/releases/acl/acl-2.3.1.tar.gz" +sha512 = "f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libacl/libacl.spec b/packages/libacl/libacl.spec index eb76e72b125..39a44444515 100644 --- a/packages/libacl/libacl.spec +++ b/packages/libacl/libacl.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libacl -Version: 2.2.53 +Version: 2.3.1 Release: 1%{?dist} Summary: Library for access control list support License: LGPL-2.1-or-later From 0bd5e7f9a58776a07c11a32b043f655f2c309afb Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:46 +0000 Subject: [PATCH 14/23] libaudit: update to 3.0.7 --- packages/libaudit/Cargo.toml | 4 ++-- packages/libaudit/libaudit.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libaudit/Cargo.toml b/packages/libaudit/Cargo.toml index 52518a18174..8601a5db571 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.6/audit-userspace-3.0.6.tar.gz" -sha512 = "4da1d0afa54b0439bd22c6bde51e955e965ff820d096665d5ffc973238950d92cb8075422809d4204bb92492037effc23b96a31310288be8f3b38cdd20b82bcd" +url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.7/audit-userspace-3.0.7.tar.gz" +sha512 = "1582fada809f83fb89ed6baedd3bc51a67c88ce9cc2dc041ec51c5da89855b14c080cc6dffa1310c96f894cc2ac8b5e709fb4577d0dc9536f28a9617138db405" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libaudit/libaudit.spec b/packages/libaudit/libaudit.spec index 1974c863f7d..d1bb4ea90fd 100644 --- a/packages/libaudit/libaudit.spec +++ b/packages/libaudit/libaudit.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libaudit -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} Summary: Library for the audit subsystem License: GPL-2.0-or-later AND LGPL-2.1-or-later From 0eaffe83a8f548f7579c0135ecb805e5045c7b80 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:48 +0000 Subject: [PATCH 15/23] libelf: update to 0.186 --- packages/libelf/Cargo.toml | 4 ++-- packages/libelf/libelf.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libelf/Cargo.toml b/packages/libelf/Cargo.toml index 6c3524de73f..c2c98ed7a7c 100644 --- a/packages/libelf/Cargo.toml +++ b/packages/libelf/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://sourceware.org/elfutils/ftp/" [[package.metadata.build-package.external-files]] -url = "https://sourceware.org/elfutils/ftp/0.185/elfutils-0.185.tar.bz2" -sha512 = "34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f" +url = "https://sourceware.org/elfutils/ftp/0.186/elfutils-0.186.tar.bz2" +sha512 = "c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libelf/libelf.spec b/packages/libelf/libelf.spec index a6ca8ebf544..cb0720a5340 100644 --- a/packages/libelf/libelf.spec +++ b/packages/libelf/libelf.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libelf -Version: 0.185 +Version: 0.186 Release: 1%{?dist} Summary: Library for ELF files License: GPL-2.0-or-later OR LGPL-3.0-or-later From 4863e2b380627c4bfe2a19d5cfca1f644fc6a3fd Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:50 +0000 Subject: [PATCH 16/23] libexpat: update to 2.4.4 --- packages/libexpat/Cargo.toml | 4 ++-- packages/libexpat/libexpat.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libexpat/Cargo.toml b/packages/libexpat/Cargo.toml index a49fd904650..6d2fcad22f6 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_1/expat-2.4.1.tar.xz" -sha512 = "9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191" +url = "https://github.com/libexpat/libexpat/releases/download/R_2_4_4/expat-2.4.4.tar.xz" +sha512 = "c88a82f4732e27340eb9480c082bcc909b0284e16b368ee9feeb4e2dd058e8f7c42fd48feacd5272cc76cb78bd183df33eb5d0b135fdd1d3c493cb156572ab76" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libexpat/libexpat.spec b/packages/libexpat/libexpat.spec index 6cd9a19c7bc..9f506d013f1 100644 --- a/packages/libexpat/libexpat.spec +++ b/packages/libexpat/libexpat.spec @@ -1,4 +1,4 @@ -%global unversion 2_4_1 +%global unversion 2_4_4 Name: %{_cross_os}libexpat Version: %(echo %{unversion} | sed 's/_/./g') From d395ae21fa41881bc8cd65769553f906227f5074 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:51 +0000 Subject: [PATCH 17/23] libglib: update to 2.71.1 --- packages/libglib/Cargo.toml | 4 ++-- packages/libglib/libglib.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libglib/Cargo.toml b/packages/libglib/Cargo.toml index 60cd73ae339..0c9c6bc80bc 100644 --- a/packages/libglib/Cargo.toml +++ b/packages/libglib/Cargo.toml @@ -12,8 +12,8 @@ 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.70/glib-2.70.1.tar.xz" -sha512 = "639317c98ab72ad853608ab4d395484daff135c0222556c51ca93fd8533c5759db14478beda964e4feb02bb2737a46a4eda25063f98a9c6ba6ae4bc5d74bf5e1" +url = "https://download.gnome.org/sources/glib/2.71/glib-2.71.1.tar.xz" +sha512 = "eda37d883d27f63eef38a811ce824783d39c6454712d7b7e48507da5d53ff0aebbd05bdf82a6ae5395c0c09d4cdee8ac5ec27ba3d4ff868f146043906876d967" [[package.metadata.build-package.external-files]] url = "https://downloads.sourceforge.net/pcre/pcre-8.37.tar.bz2" diff --git a/packages/libglib/libglib.spec b/packages/libglib/libglib.spec index d4eff1d46e6..9c5249ef39f 100644 --- a/packages/libglib/libglib.spec +++ b/packages/libglib/libglib.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libglib -Version: 2.70.1 +Version: 2.71.1 Release: 1%{?dist} Summary: The GLib libraries # glib2 is LGPL-2.1-only From 840a88712bcc9a0130f1f8d2d83c10657132d5dc Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:53 +0000 Subject: [PATCH 18/23] libnftnl: update to 1.2.1 --- packages/libnftnl/Cargo.toml | 4 ++-- packages/libnftnl/libnftnl.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libnftnl/Cargo.toml b/packages/libnftnl/Cargo.toml index 51bd655ec5c..20fed8f2d14 100644 --- a/packages/libnftnl/Cargo.toml +++ b/packages/libnftnl/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://netfilter.org/projects/libnftnl/files" [[package.metadata.build-package.external-files]] -url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.2.0.tar.bz2" -sha512 = "2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380" +url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.2.1.tar.bz2" +sha512 = "cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnftnl/libnftnl.spec b/packages/libnftnl/libnftnl.spec index b9ed90c9f6d..cc4a04a4351 100644 --- a/packages/libnftnl/libnftnl.spec +++ b/packages/libnftnl/libnftnl.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libnftnl -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Library for nftables netlink License: GPL-2.0-or-later AND GPL-2.0-only From cf54ad0142679449875188774fc412fbf235c411 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:54 +0000 Subject: [PATCH 19/23] libxcrypt: update to 4.4.27 --- packages/libxcrypt/Cargo.toml | 4 ++-- packages/libxcrypt/libxcrypt.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libxcrypt/Cargo.toml b/packages/libxcrypt/Cargo.toml index 9b45e4fb2ec..d60c6962a36 100644 --- a/packages/libxcrypt/Cargo.toml +++ b/packages/libxcrypt/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/besser82/libxcrypt/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/besser82/libxcrypt/archive/v4.4.26/libxcrypt-4.4.26.tar.gz" -sha512 = "fd58e397c59fd8f227a0006ed1039ef1d89e033f792f186a8c352fddc0741616fabe9784eb081aecac4db945741dd730f6cef36e6354f252fd934ce0866fdb2a" +url = "https://github.com/besser82/libxcrypt/archive/v4.4.27/libxcrypt-4.4.27.tar.gz" +sha512 = "83b5854ca4b928522b8f4bf865331a50e3ffb3c873727e406a87a96408398c00cb617f68224c3413ed976d8060aa60bdea730e0fc8b0321a163d0b4ec496ce10" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libxcrypt/libxcrypt.spec b/packages/libxcrypt/libxcrypt.spec index ad15aafabb7..aedb37387fc 100644 --- a/packages/libxcrypt/libxcrypt.spec +++ b/packages/libxcrypt/libxcrypt.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libxcrypt -Version: 4.4.26 +Version: 4.4.27 Release: 1%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others License: LGPL-2.1-or-later From 2066b9ae19d99b5bc66b01d5d6a0d6874236fccb Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Tue, 1 Feb 2022 17:38:56 +0000 Subject: [PATCH 20/23] libzstd: update to 1.5.2 --- packages/libzstd/Cargo.toml | 4 ++-- packages/libzstd/libzstd.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libzstd/Cargo.toml b/packages/libzstd/Cargo.toml index 6975a498279..52de9c23d91 100644 --- a/packages/libzstd/Cargo.toml +++ b/packages/libzstd/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/facebook/zstd/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/facebook/zstd/archive/v1.5.0.tar.gz" -sha512 = "25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33" +url = "https://github.com/facebook/zstd/archive/v1.5.2.tar.gz" +sha512 = "e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libzstd/libzstd.spec b/packages/libzstd/libzstd.spec index c3fa6cdc49a..ac155a4ca6b 100644 --- a/packages/libzstd/libzstd.spec +++ b/packages/libzstd/libzstd.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libzstd -Version: 1.5.0 +Version: 1.5.2 Release: 1%{?dist} Summary: Library for Zstandard compression License: BSD-3-Clause AND GPL-2.0-only From 730b9b66ded7d6f0d22ece7f6a8d2a327add0b7c Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Wed, 2 Feb 2022 21:45:26 +0000 Subject: [PATCH 21/23] docker-cli: update to 20.10.12 --- packages/docker-cli/Cargo.toml | 4 ++-- packages/docker-cli/docker-cli.spec | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/docker-cli/Cargo.toml b/packages/docker-cli/Cargo.toml index f8f2dd4472f..980ca3d6274 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.7/cli-20.10.7.tar.gz" -sha512 = "4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f" +url = "https://github.com/docker/cli/archive/v20.10.12/cli-20.10.12.tar.gz" +sha512 = "ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/docker-cli/docker-cli.spec b/packages/docker-cli/docker-cli.spec index 4b0187bb647..1bf7ce82c79 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.7 +%global gover 20.10.12 %global rpmver %{gover} -%global gitrev f0df35096d5f5e6b559b42c7fde6c65a2909f7c5 +%global gitrev e91ed5707e038b02af3b5120fa0835c5bedfd42e %global source_date_epoch 1492525740 @@ -19,9 +19,6 @@ URL: https://%{goimport} Source0: https://%{goimport}/archive/v%{gover}/cli-%{gover}.tar.gz Source1000: clarify.toml -# CVE-2021-41092 -Patch0001: 0001-registry-ensure-default-auth-config-has-address.patch - BuildRequires: git BuildRequires: %{_cross_os}glibc-devel From 12bab03478875ab4bdb130cd4361c747bebaa835 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Wed, 2 Feb 2022 21:56:20 +0000 Subject: [PATCH 22/23] docker-engine: update to 20.10.12 --- packages/docker-engine/Cargo.toml | 4 ++-- packages/docker-engine/docker-engine.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml index 01d955f9772..9c7fed14d26 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.11/moby-20.10.11.tar.gz" -sha512 = "ac947e882abb02d52aea4aecb5dcfef6e23c86aadf98b49e3312ca3079dac7a01d6c936c0a4e51b3561def926ae50b4c5587063b8c58cac5c5de3c5e7985b120" +url = "https://github.com/moby/moby/archive/v20.10.12/moby-20.10.12.tar.gz" +sha512 = "f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753" # RPM BuildRequires [build-dependencies] diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec index 55703a166b1..0c800d22b98 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.11 +%global gover 20.10.12 %global rpmver %{gover} -%global gitrev 847da184ad5048b27f5bdf9d53d070f731b43180 +%global gitrev 459d0dfbbb51fb2423a43655e6c62368ec0f36c9 %global source_date_epoch 1363394400 From 9db2b133e3412926066e47f74b942388e4b018a5 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Wed, 2 Feb 2022 22:05:21 +0000 Subject: [PATCH 23/23] docker-proxy: update to 20.10.12 --- packages/docker-proxy/Cargo.toml | 4 ++-- packages/docker-proxy/docker-proxy.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/docker-proxy/Cargo.toml b/packages/docker-proxy/Cargo.toml index cdf50e06f87..3de9241a1d5 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/fa125a3512ee0f6187721c88582bf8c4378bd4d7/libnetwork-fa125a3512ee0f6187721c88582bf8c4378bd4d7.tar.gz" -sha512 = "dd583218fbeba8aeac2e4143369ad55a3e6c15d64f198f73e3656a80d0281a4374fb3be7bc05b01425461bf830762aa2c950da68ed0e3ae5884643e9d178c69e" +url = "https://github.com/docker/libnetwork/archive/64b7a4574d1426139437d20e81c0b6d391130ec8/libnetwork-64b7a4574d1426139437d20e81c0b6d391130ec8.tar.gz" +sha512 = "6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/docker-proxy/docker-proxy.spec b/packages/docker-proxy/docker-proxy.spec index 4f132f410e1..05272a032cc 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 fa125a3512ee0f6187721c88582bf8c4378bd4d7 +%global commit 64b7a4574d1426139437d20e81c0b6d391130ec8 %global _dwz_low_mem_die_limit 0 Name: %{_cross_os}docker-proxy -Version: 20.10.04 +Version: 20.10.12 Release: 1%{?dist} Summary: Docker CLI # mostly Apache-2.0, client/mflag is BSD-3-Clause