Skip to content

Commit

Permalink
Merge pull request bottlerocket-os#129 from vigh-m/3p-updates
Browse files Browse the repository at this point in the history
Third Party package updates
  • Loading branch information
vigh-m authored Sep 10, 2024
2 parents be02baf + 4fb3f30 commit ca9d324
Show file tree
Hide file tree
Showing 36 changed files with 53 additions and 157 deletions.
4 changes: 2 additions & 2 deletions packages/aws-iam-authenticator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.21/aws-iam-authenticator-0.6.21.tar.gz"
sha512 = "5548748efa330fc89256fda0e723e75f83040f55301f692166588d32c883a69d8f955a86f38c39558a6ccd65de6b622a59b7768486cc9ba6f1d78b2f9d183eed"
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.6.26/aws-iam-authenticator-0.6.26.tar.gz"
sha512 = "eae6f2cf8e7735b0cebe0758e1a34eaf3347d43c224edf250f618272b3af3577c58205d1fa46b43bc056ad00f71fd4bcd0c398f7a78ec919fce7f34109bf3786"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-iam-authenticator/aws-iam-authenticator.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo aws-iam-authenticator
%global goimport %{goproject}/%{gorepo}

%global gover 0.6.21
%global gover 0.6.26
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-signing-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/aws/rolesanywhere-credential-helper/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/rolesanywhere-credential-helper/archive/v1.1.1/rolesanywhere-credential-helper-v1.1.1.tar.gz"
sha512 = "c60d62f8e946955d181577d1e2e5fe2ecb7a82ef0c4cc29fa98b6136b93e9bac9a91cffe3a98c063d7a3f07a956b02e1dd5a92160648b26bbee90aec52a15dca"
url = "https://github.com/aws/rolesanywhere-credential-helper/archive/v1.2.0/rolesanywhere-credential-helper-v1.2.0.tar.gz"
sha512 = "c2c7fa2fb319aea0036bf334c59cf2a10520da56a45a3e04a99870becfee5099eeb655933b507d2627ebcfde969f1150f0025ace6e06b88bfa801ee847324d30"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-signing-helper/aws-signing-helper.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo rolesanywhere-credential-helper
%global goimport %{goproject}/%{gorepo}

%global gover 1.1.1
%global gover 1.2.0
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/containerd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/containerd/containerd/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/containerd/containerd/archive/v1.7.20/containerd-1.7.20.tar.gz"
sha512 = "b8be3a073c1716d66cd97162b0f40cab68094df9f8a9eaf81fa617c552d51f536d41d2823838e01e4e3936fe0ae8af0352531b1682623c25dc2318cd9af32985"
url = "https://github.com/containerd/containerd/archive/v1.7.21/containerd-1.7.21.tar.gz"
sha512 = "fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75"

# RPM BuildRequires
[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/containerd/containerd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo containerd
%global goimport %{goproject}/%{gorepo}

%global gover 1.7.20
%global gover 1.7.21
%global rpmver %{gover}
%global gitrev 8fc6bcff51318944179630522a095cc9dbf9f353

Expand Down
6 changes: 3 additions & 3 deletions packages/ecr-credential-provider-1.27/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ package-name = "ecr-credential-provider-1.27"
releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases"

[[package.metadata.build-package.external-files]]
url = "https://codeload.github.com/kubernetes/cloud-provider-aws/tar.gz/v1.27.8"
path = "cloud-provider-aws-1.27.8.tar.gz"
sha512 = "31a4627760cfc173a216e902d403e0dd47bbdf69437f3b64545b303bd66e6b7025db5e312d96432a2002bc70921cd1394d6923e2e1ac36f8adb610664d65a29f"
url = "https://codeload.github.com/kubernetes/cloud-provider-aws/tar.gz/v1.27.9"
path = "cloud-provider-aws-1.27.9.tar.gz"
sha512 = "f9d078144cb1f8f04c9ea613ef0a348c0b5ac864307d4d35b82df4f0480d8b4d010dfff0b85ebaf7b981bfa9e913d48c7055ac396bb9c15aa4e00be52b5994cb"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo cloud-provider-aws
%global goimport %{goproject}/%{gorepo}

%global gover 1.27.8
%global gover 1.27.9
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/ecr-credential-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes/cloud-provider-aws/archive/v1.25.15/cloud-provider-aws-1.25.15.tar.gz"
sha512 = "1e4ee33900d3ec655ce9f5788bb8f173621f187b130464bef196ef6e18a61a49d9501f5492909922a34b086fcffbb0cb369cfa8b941efbb0c38ffb0abe6c17dc"
url = "https://github.com/kubernetes/cloud-provider-aws/archive/v1.25.16/cloud-provider-aws-1.25.16.tar.gz"
sha512 = "be2937871764a59b5e8dcca0d5a08e665c18ff56f859f4e5eb41cd5d1cdda9bfb0d0b30fd53fa9024cfa90526bddb581ea01375b7f8884cad2314521752d3068"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo cloud-provider-aws
%global goimport %{goproject}/%{gorepo}

%global gover 1.25.15
%global gover 1.25.16
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/iptables/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://www.netfilter.org/projects/iptables/files"

[[package.metadata.build-package.external-files]]
url = "https://www.netfilter.org/projects/iptables/files/iptables-1.8.9.tar.xz"
sha512 = "e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70"
url = "https://www.netfilter.org/projects/iptables/files/iptables-1.8.10.tar.xz"
sha512 = "71e6ed2260859157d61981a4fe5039dc9e8d7da885a626a4b5dae8164c509a9d9f874286b9468bb6a462d6e259d4d32d5967777ecefdd8a293011ae80c00f153"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
5 changes: 1 addition & 4 deletions packages/iptables/iptables.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}iptables
Version: 1.8.9
Version: 1.8.10
Release: 1%{?dist}
Summary: Tools for managing Linux kernel packet filtering capabilities
License: GPL-2.0-or-later AND GPL-2.0-only
Expand All @@ -16,9 +16,6 @@ Requires: %{_cross_os}libnfnetlink
Requires: %{_cross_os}libnftnl
Requires: %{_cross_os}libnetfilter_conntrack

Patch1001: 1001-extensions-NAT-Fix-for-Werror-format-security.patch
Patch1002: 1002-ip6tables-Fix-checking-existence-of-rule.patch

%description
%{summary}.

Expand Down
4 changes: 2 additions & 2 deletions packages/kexec-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.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.28.tar.xz"
sha512 = "889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753"
url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.29.tar.xz"
sha512 = "4c9e0b3df47b240f0eac2c31e8b515465f626ce043f64daa32b0b032d7132e54dada5d70875dab256345f66cf94a25dc3c160a9009ba60addd8dcb1e5205f5ca"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/kexec-tools/kexec-tools.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}kexec-tools
Version: 2.0.28
Version: 2.0.29
Release: 1%{?dist}
Summary: Linux tool to load kernels from the running system
License: GPL-2.0-or-later AND GPL-2.0-only
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Subject: [PATCH] kbuild: do not outline atomics for arm64

Signed-off-by: Ben Cressey <[email protected]>
---
usr/src/aws-neuronx-2.16.7.0/Kbuild | 1 +
usr/src/aws-neuronx-2.17.17.0/Kbuild | 1 +
1 file changed, 1 insertion(+)

diff --git a/usr/src/aws-neuronx-2.16.7.0/Kbuild b/usr/src/aws-neuronx-2.16.7.0/Kbuild
diff --git a/usr/src/aws-neuronx-2.17.17.0/Kbuild b/usr/src/aws-neuronx-2.17.17.0/Kbuild
index 11f8490..6535608 100644
--- a/usr/src/aws-neuronx-2.16.7.0/Kbuild
+++ b/usr/src/aws-neuronx-2.16.7.0/Kbuild
--- a/usr/src/aws-neuronx-2.17.17.0/Kbuild
+++ b/usr/src/aws-neuronx-2.17.17.0/Kbuild
@@ -16,3 +16,4 @@ neuron-objs += v3/notific.o v3/neuron_dhal_v3.o

ccflags-y += -O3 -Wall -Werror -Wno-declaration-after-statement -Wunused-macros -Wunused-local-typedefs
Expand Down
4 changes: 2 additions & 2 deletions packages/kmod-6.1-neuron/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ package-name = "kmod-6.1-neuron"
releases-url = "https://awsdocs-neuron.readthedocs-hosted.com/en/latest/release-notes/runtime/aws-neuronx-dkms/index.html"

[[package.metadata.build-package.external-files]]
url = "https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.16.7.0.noarch.rpm"
sha512 = "8e66feb4051af31321c08b6663a950172da65c4e5b432c0b5609785be34ccb193c0eb50c9aadfeec8b6410ccbe05264a3fb6fc7cb66dc87b172bc5be5c4d92d0"
url = "https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.17.17.0.noarch.rpm"
sha512 = "8ff07280fc2864677d9401d56939f8b8f8cd59dc1ae9df53d49aced500cd62c3071a61639e9f5381b557d29cc7a2b72be71020f90880680a59d10a1f8b28580b"

[build-dependencies]
kernel-6_1 = { path = "../kernel-6.1" }
2 changes: 1 addition & 1 deletion packages/kmod-6.1-neuron/kmod-6.1-neuron.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}kmod-6.1-neuron
Version: 2.16.7.0
Version: 2.17.17.0
Release: 1%{?dist}
Summary: Neuron drivers for the 6.1 kernel
License: GPL-2.0-only
Expand Down
4 changes: 2 additions & 2 deletions packages/libbpf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/libbpf/libbpf/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/libbpf/libbpf/archive/refs/tags/v1.4.3.tar.gz"
sha512 = "d03965f8abeaac840cda28fdacf9df378869fa6e5ef45d992fc5398bed5970ebedb24f20676b1779f8941b4b912bb691948e198eff87ea1d5d8e5cd95d6e06d1"
url = "https://github.com/libbpf/libbpf/archive/refs/tags/v1.4.5.tar.gz"
sha512 = "c5ed459e89a8897ef7c892723c61efb2f2fdb0e7bea63eaff1c9936d368d2cc9e63b8c093207eef0df3109c021156c52ddb570757f69c54e713909e866dbb2f5"

# RPM BuildRequires
[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/libbpf/libbpf.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libbpf
Version: 1.4.3
Version: 1.4.5
Release: 1%{?dist}
Summary: Library for BPF
License: LGPL-2.1-only OR BSD-2-Clause
Expand Down
4 changes: 2 additions & 2 deletions packages/libncurses/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-20240713.tgz"
sha512 = "d0a9874aec4d32e2dfd0f7215d75caa004a983b4da9a68bfd6508bd75c85074b9bbc21609d5deaf5e741a1d8d8766aa5290958d9bbb2718dd359d5d3a264234c"
url = "https://invisible-mirror.net/archives/ncurses/current/ncurses-6.5-20240831.tgz"
sha512 = "d7ed0711375631c30533c56a449b0a148fc473096c40ec7ab9e44f8ed1086e36d9e04edacdfde04e78aabfb1d57483b98403dda34a40008264e72ee1da9ec30c"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/libncurses/libncurses.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global ncurses_ver 6.5
%global ncurses_rev 20240713
%global ncurses_rev 20240831

Name: %{_cross_os}libncurses
Version: %{ncurses_ver}
Expand Down
4 changes: 2 additions & 2 deletions packages/libnftnl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://netfilter.org/projects/libnftnl/files"

[[package.metadata.build-package.external-files]]
url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.2.6.tar.xz"
sha512 = "0c8c369eec84b0c568f0067598bece6e3be9a0fbd977e443ae3b14a5a6d842a6086ceb5426a65f8c77204709655f148c1241193f1a928f8c12154a57e3548b34"
url = "http://netfilter.org/projects/libnftnl/files/libnftnl-1.2.7.tar.xz"
sha512 = "24ff3e7e97f51cb5dfda2fbd2f5e175abcec0dd58f94936022800ec356ff004a531f0915df72278b867769ba71473d407b01d52cc33a3cafb043d9a90b051f9d"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/libnftnl/libnftnl.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libnftnl
Version: 1.2.6
Version: 1.2.7
Release: 1%{?dist}
Summary: Library for nftables netlink
License: GPL-2.0-or-later AND GPL-2.0-only
Expand Down
40 changes: 0 additions & 40 deletions packages/libnvme/0001-linux-Fix-uninitialized-variables.patch

This file was deleted.

4 changes: 2 additions & 2 deletions packages/libnvme/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/linux-nvme/libnvme/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/linux-nvme/libnvme/archive/v1.9/libnvme-1.9.tar.gz"
sha512 = "39a3346805143f93a17d00cfcb6fb75f82154658db6079134c09dfa989995ac5de79b1ce1ac091b4e997523d3216829ce9eac44110c9f59f9fd21636529c8b25"
url = "https://github.com/linux-nvme/libnvme/archive/v1.10/libnvme-1.10.tar.gz"
sha512 = "44e8a407c9fda8c296163832c14ba167caab53eab315bd2dee94275458532429f12a35e0adef1356420d83127e658a354ce65ac946acaa53bef2d46a8189054c"

[build-dependencies]
glibc = { path = "../glibc" }
3 changes: 1 addition & 2 deletions packages/libnvme/libnvme.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Name: %{_cross_os}libnvme
Version: 1.9
Version: 1.10
Release: 1%{?dist}
Summary: Library for NVM Express
License: LGPL-2.1-only AND CC0-1.0 AND MIT
URL: https://github.com/linux-nvme/libnvme
Source0: https://github.com/linux-nvme/libnvme/archive/v%{version}/libnvme-%{version}.tar.gz
Patch0001: 0001-linux-Fix-uninitialized-variables.patch

BuildRequires: meson
BuildRequires: %{_cross_os}glibc-devel
Expand Down
4 changes: 2 additions & 2 deletions packages/libpcre/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/PhilipHazel/pcre2/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2"
sha512 = "8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9"
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2"
sha512 = "ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/libpcre/libpcre.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libpcre
Version: 10.43
Version: 10.44
Release: 1%{?dist}
Summary: Library for regular expressions
License: BSD-3-Clause
Expand Down
4 changes: 2 additions & 2 deletions packages/libtirpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.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.4.tar.bz2"
sha512 = "004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00"
url = "https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.5.tar.bz2"
sha512 = "c80a953671c5692294efe7425e41c7f12bd4c430f473f9ea71883168cb4a69111f0018122bd0e7982e18f4576e45d4977ce0790743382faae006c446813d2a4f"

[build-dependencies]
glibc = { path = "../glibc" }
Loading

0 comments on commit ca9d324

Please sign in to comment.