Merge pull request #36 from vigh-m/3p-updates

Updating 3rd Party packages
bottlerocket-os · Jul 18, 2024 · 82c7d2b · 82c7d2b
2 parents 1ae2d4f + 20a7fb3
commit 82c7d2b
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 75 deletions.
diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.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.6.14/aws-iam-authenticator-0.6.14.tar.gz"
-sha512 = "26a6b394fbe767910f605a356032338a4ec254b81cd470796e3137e3595fef338bd213dee8d956c8d23e16f5508741e78664cd0f8b1acd97321d2fb5b7b723af"
+url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.6.21/aws-iam-authenticator-0.6.21.tar.gz"
+sha512 = "5548748efa330fc89256fda0e723e75f83040f55301f692166588d32c883a69d8f955a86f38c39558a6ccd65de6b622a59b7768486cc9ba6f1d78b2f9d183eed"
 bundle-modules = [ "go" ]
 
 [build-dependencies]

diff --git 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.6.14
+%global gover 0.6.21
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0
@@ -48,6 +48,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
 
 %build
 %set_cross_go_flags
+export GO_MAJOR="1.22"
 go build -ldflags="${GOLDFLAGS}" -o aws-iam-authenticator ./cmd/aws-iam-authenticator
 gofips build -ldflags="${GOLDFLAGS}" -o fips/aws-iam-authenticator ./cmd/aws-iam-authenticator
 

diff --git a/packages/aws-iam-authenticator/clarify.toml b/packages/aws-iam-authenticator/clarify.toml
@@ -1,5 +1,8 @@
 [clarify."sigs.k8s.io/yaml"]
 expression = "MIT AND BSD-3-Clause"
 license-files = [
-    { path = "LICENSE", hash = 0xcdf3ae00 },
+    { path = "LICENSE", hash = 0x617d80bc },
+    { path = "goyaml.v2/LICENSE", hash = 0xe569d630 },
+    { path = "goyaml.v2/LICENSE.libyaml", hash = 0xa2e4ce3 },
+    { path = "goyaml.v2/NOTICE", hash = 0x49bceeb9 },
 ]
diff --git a/packages/cni-plugins/Cargo.toml b/packages/cni-plugins/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/containernetworking/plugins/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/containernetworking/plugins/archive/v1.4.0/plugins-1.4.0.tar.gz"
-sha512 = "d812663fb58cfa2bfe35dd70940586d47f11feddd35a86ea7639197b022f9c0e0f487679e2e968eebf1f80b8b1d9cfbd0fe99d80590ae60a8128fa393d713e0b"
+url = "https://github.com/containernetworking/plugins/archive/v1.5.1/plugins-1.5.1.tar.gz"
+sha512 = "d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132"
 
 # RPM BuildRequires
 [build-dependencies]

diff --git a/packages/cni-plugins/cni-plugins.spec b/packages/cni-plugins/cni-plugins.spec
@@ -2,7 +2,7 @@
 %global gorepo plugins
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.4.0
+%global gover 1.5.1
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0

diff --git a/packages/docker-cli/Cargo.toml b/packages/docker-cli/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/docker/cli/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/docker/cli/archive/v25.0.2/cli-25.0.2.tar.gz"
-sha512 = "66c6c408f4f5f42ded007948a69fb66cf0d1f0462a1700fb4efaaf70755285e7179d5bd61e7963f77a088e5f27a8a42b0501be1331948d0ff30bd829b205b5ad"
+url = "https://github.com/docker/cli/archive/v25.0.5/cli-25.0.5.tar.gz"
+sha512 = "39f49514605a3c78661f105094f9c28beb01927a2d7dc474048c2a27135ca8c3f075a6f05157a176c032d5e7c105f00c9100c15713298b33bd34a6f399bac84d"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git 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 25.0.2
+%global gover 25.0.5
 %global rpmver %{gover}
-%global gitrev 29cf62922279a56e122dc132eb84fe98f61d5950
+%global gitrev 5dc9bcc5b78ed23f12cdd68e4285ea1c216ce2a1 
 
 %global source_date_epoch 1492525740
 

diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/moby/moby/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/moby/moby/archive/v25.0.2/moby-25.0.2.tar.gz"
-sha512 = "f0cf5e1792bf54a0e3878663dace55b9e713adba61d8b464888991da2bdf670aebeb22da86f1a7335b79cc9dcde59379afba32249bd3c6a79e5291dbc9faa997"
+url = "https://github.com/moby/moby/archive/v25.0.5/moby-25.0.5.tar.gz"
+sha512 = "42ac2cf271b0a8fe67816844b26216896e4f5ccb0e4b85516b1bcc5a76e5dd5e1dc560b50a6e1d1df4eed2f8b57585e189048edf0a3266e93098004c09dca8cc"
 
 # RPM BuildRequires
 [build-dependencies]

diff --git 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 25.0.2
+%global gover 25.0.5
 %global rpmver %{gover}
-%global gitrev fce6e0ca9bc000888de3daa157af14fa41fcd0ff
+%global gitrev e63daec8672d77ac0b2b5c262ef525c7cf17fd20
 
 %global source_date_epoch 1363394400
 

diff --git a/packages/e2fsprogs/Cargo.toml b/packages/e2fsprogs/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.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.47.0/e2fsprogs-1.47.0.tar.xz"
-sha512 = "0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec"
+url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.1/e2fsprogs-1.47.1.tar.xz"
+sha512 = "2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/e2fsprogs/e2fsprogs.spec b/packages/e2fsprogs/e2fsprogs.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}e2fsprogs
-Version: 1.47.0
+Version: 1.47.1
 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

diff --git a/packages/ethtool/Cargo.toml b/packages/ethtool/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://kernel.org/pub/software/network/ethtool/"
 
 [[package.metadata.build-package.external-files]]
-url = "https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-6.7.tar.xz"
-sha512 = "07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524"
+url = "https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-6.9.tar.xz"
+sha512 = "bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/ethtool/ethtool.spec b/packages/ethtool/ethtool.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}ethtool
-Version: 6.7
+Version: 6.9
 Release: 1%{?dist}
 Summary: Settings tool for Ethernet NICs
 License: GPL-2.0-only AND GPL-2.0-or-later

diff --git a/packages/findutils/Cargo.toml b/packages/findutils/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://ftp.gnu.org/pub/gnu/findutils"
 
 [[package.metadata.build-package.external-files]]
-url = "https://ftp.gnu.org/pub/gnu/findutils/findutils-4.9.0.tar.xz"
-sha512 = "ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9"
+url = "https://ftp.gnu.org/pub/gnu/findutils/findutils-4.10.0.tar.xz"
+sha512 = "b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/findutils/findutils.spec b/packages/findutils/findutils.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}findutils
-Version: 4.9.0
+Version: 4.10.0
 Release: 1%{?dist}
 Summary: A set of GNU tools for finding
 License: GPL-3.0-or-later

diff --git a/packages/libncurses/Cargo.toml b/packages/libncurses/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://invisible-mirror.net/archives/ncurses/current/"
 
 [[package.metadata.build-package.external-files]]
-url = "https://invisible-mirror.net/archives/ncurses/current/ncurses-6.4-20231209.tgz"
-sha512 = "293b91b20f676230e28dadfc6ec811ac898e56d558d919566bf515d91ee9bd5df222f56da593d5ce249550a38ad4a9d206df2761f170c7738c9e8a3ea564e42a"
+url = "https://invisible-mirror.net/archives/ncurses/current/ncurses-6.5-20240713.tgz"
+sha512 = "d0a9874aec4d32e2dfd0f7215d75caa004a983b4da9a68bfd6508bd75c85074b9bbc21609d5deaf5e741a1d8d8766aa5290958d9bbb2718dd359d5d3a264234c"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/libncurses/libncurses.spec b/packages/libncurses/libncurses.spec
@@ -1,5 +1,5 @@
-%global ncurses_ver 6.4
-%global ncurses_rev 20231209
+%global ncurses_ver 6.5
+%global ncurses_rev 20240713
 
 Name: %{_cross_os}libncurses
 Version: %{ncurses_ver}
@@ -11,7 +11,6 @@ Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{ncurses
 Patch1: ncurses-config.patch
 Patch2: ncurses-libs.patch
 Patch3: ncurses-urxvt.patch
-Patch4: ncurses-kbs.patch
 BuildRequires: %{_cross_os}glibc-devel
 
 %description

diff --git a/packages/libncurses/ncurses-kbs.patch b/packages/libncurses/ncurses-kbs.patch
diff --git a/packages/soci-snapshotter/Cargo.toml b/packages/soci-snapshotter/Cargo.toml
@@ -12,15 +12,15 @@ path = "../packages.rs"
 releases-url = "https://github.com/awslabs/soci-snapshotter/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.5.0.tar.gz"
-sha512 = "9980688b71c149ea0f36c52906ba0cc862ca65b9ee0e4b813fef0df83716e313137886986cc78b694e35516fb21095b0cd0436caf485d4b63bd01b150769b6f4"
-bundle-root-path = "soci-snapshotter-0.5.0/cmd"
+url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.6.1.tar.gz"
+sha512 = "5d789e79be7157aed7a6af0bdde622d0d60bef3c268971d4eb980d4f32dbcad651c99912d94165f500fdf63498cc4e782083f046412b941ced7522e3ee32588d"
+bundle-root-path = "soci-snapshotter-0.6.1/cmd"
 bundle-output-path = "bundled-cmd.tar.gz"
 bundle-modules = [ "go" ]
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.5.0.tar.gz"
-sha512 = "9980688b71c149ea0f36c52906ba0cc862ca65b9ee0e4b813fef0df83716e313137886986cc78b694e35516fb21095b0cd0436caf485d4b63bd01b150769b6f4"
+url = "https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.6.1.tar.gz"
+sha512 = "5d789e79be7157aed7a6af0bdde622d0d60bef3c268971d4eb980d4f32dbcad651c99912d94165f500fdf63498cc4e782083f046412b941ced7522e3ee32588d"
 bundle-modules = [ "go" ]
 
 # RPM BuildRequires

diff --git a/packages/soci-snapshotter/soci-snapshotter.spec b/packages/soci-snapshotter/soci-snapshotter.spec
@@ -1,5 +1,5 @@
 %global gorepo soci-snapshotter
-%global gover 0.5.0
+%global gover 0.6.1
 %global rpmver %{gover}
 
 Name: %{_cross_os}soci-snapshotter
@@ -8,7 +8,7 @@ Release: 1%{?dist}
 Summary: A containerd snapshotter plugin which enables lazy loading for OCI images.
 License: Apache-2.0
 URL: https://github.com/awslabs/soci-snapshotter
-Source0: https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v0.5.0.tar.gz
+Source0: https://github.com/awslabs/soci-snapshotter/archive/refs/tags/v%{gover}.tar.gz
 Source1: bundled-v%{gover}.tar.gz
 Source2: bundled-cmd.tar.gz
 Source101: soci-snapshotter.service

diff --git a/packages/strace/Cargo.toml b/packages/strace/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://strace.io/files"
 
 [[package.metadata.build-package.external-files]]
-url = "https://strace.io/files/6.8/strace-6.8.tar.xz"
-sha512 = "c477724a77112a74a5236a38b7dbaa9b6199622a1d21cc6253cac80dc4ddea78aeaf8cddf4a51ee4119e00e1adaf95f64f64e20d9775ec3edd77cd82c8f7b30e"
+url = "https://strace.io/files/6.9/strace-6.9.tar.xz"
+sha512 = "aa80b9b6ec41082f1710f2327f7a22003cdce6d95ab0e5083ada9c5b7b40b8f7cbc7dc6c017878dc0e42c52e405e98ed1488c51d17bc3538989ff4be2c2411e1"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/strace/strace.spec b/packages/strace/strace.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}strace
-Version: 6.8
+Version: 6.9
 Release: 1%{?dist}
 Summary: Linux syscall tracer
 License: LGPL-2.1-or-later

diff --git a/packages/util-linux/Cargo.toml b/packages/util-linux/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.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.39/util-linux-2.39.3.tar.xz"
-sha512 = "a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa"
+url = "https://www.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.2.tar.xz"
+sha512 = "ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/util-linux/util-linux.spec b/packages/util-linux/util-linux.spec
@@ -1,5 +1,5 @@
-%global majorminor 2.39
-%global version %{majorminor}.3
+%global majorminor 2.40
+%global version %{majorminor}.2
 
 Name: %{_cross_os}util-linux
 Version: %{version}
@@ -177,6 +177,7 @@ done
 %{_cross_bindir}/logger
 %{_cross_bindir}/lsblk
 %{_cross_bindir}/lscpu
+%{_cross_bindir}/lsclocks
 %{_cross_bindir}/lsipc
 %{_cross_bindir}/lsirq
 %{_cross_bindir}/lsfd
@@ -206,6 +207,8 @@ done
 %exclude %{_cross_bindir}/colrm
 %exclude %{_cross_bindir}/column
 %exclude %{_cross_bindir}/eject
+%exclude %{_cross_bindir}/enosys
+%exclude %{_cross_bindir}/exch
 %exclude %{_cross_bindir}/fincore
 %exclude %{_cross_bindir}/getopt
 %exclude %{_cross_bindir}/hardlink
@@ -230,6 +233,7 @@ done
 %exclude %{_cross_bindir}/scriptreplay
 %exclude %{_cross_bindir}/setarch
 %exclude %{_cross_bindir}/setterm
+%exclude %{_cross_bindir}/setpgid
 %exclude %{_cross_bindir}/ul
 %exclude %{_cross_bindir}/uname26
 %exclude %{_cross_bindir}/utmpdump

diff --git a/packages/xfsprogs/Cargo.toml b/packages/xfsprogs/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/"
 
 [[package.metadata.build-package.external-files]]
-url = "http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.7.0.tar.xz"
-sha512 = "4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74"
+url = "http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.8.0.tar.xz"
+sha512 = "f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

diff --git a/packages/xfsprogs/xfsprogs.spec b/packages/xfsprogs/xfsprogs.spec
@@ -1,5 +1,5 @@
 Name: %{_cross_os}xfsprogs
-Version: 6.7.0
+Version: 6.8.0
 Release: 1%{?dist}
 Summary: Utilities for managing the XFS filesystem
 License: GPL-2.0-only AND LGPL-2.1-only