From 4be03637210bd0044800e9e6a8ec2cdb6217b2f7 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 15:53:42 +0000 Subject: [PATCH 01/10] packages: update amazon-ssm-agent to 3.2.2086.0 --- packages/amazon-ssm-agent/Cargo.toml | 4 ++-- packages/amazon-ssm-agent/amazon-ssm-agent.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/amazon-ssm-agent/Cargo.toml b/packages/amazon-ssm-agent/Cargo.toml index 6dd43fd363d..24cb2c0c080 100644 --- a/packages/amazon-ssm-agent/Cargo.toml +++ b/packages/amazon-ssm-agent/Cargo.toml @@ -9,8 +9,8 @@ build = "../build.rs" path = "../packages.rs" [[package.metadata.build-package.external-files]] -url = "https://github.com/aws/amazon-ssm-agent/archive/3.2.1798.0/amazon-ssm-agent-3.2.1798.0.tar.gz" -sha512 = "17110456172ac4de07f7c0963a629aff800fb2db2111d0f5eb7f78a93490ed50706925774c156c51d3c58684992be3a92df00667274297ea6c147d85602cbf84" +url = "https://github.com/aws/amazon-ssm-agent/archive/3.2.2086.0/amazon-ssm-agent-3.2.2086.0.tar.gz" +sha512 = "fc46f81c1316a438a46a99259229126621197bba9414c41ab6de111b010c71d28cf0f7d191d203c07bd5373cf685bf7d325454a75e02e812ac23bb07af75dec7" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/amazon-ssm-agent/amazon-ssm-agent.spec b/packages/amazon-ssm-agent/amazon-ssm-agent.spec index c0f99cb730e..93bc3b325e9 100644 --- a/packages/amazon-ssm-agent/amazon-ssm-agent.spec +++ b/packages/amazon-ssm-agent/amazon-ssm-agent.spec @@ -8,7 +8,7 @@ %global goimport %{goproject}/%{gorepo} Name: %{_cross_os}amazon-ssm-agent -Version: 3.2.1798.0 +Version: 3.2.2086.0 Release: 1%{?dist} Summary: An agent to enable remote management of EC2 instances License: Apache-2.0 From 836877a8861c02c6382326f4e05117a594257949 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 15:54:31 +0000 Subject: [PATCH 02/10] packages: update aws-iam-authenticator to 0.6.14 --- packages/aws-iam-authenticator/Cargo.toml | 4 ++-- packages/aws-iam-authenticator/aws-iam-authenticator.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml index a710b289d87..d1eb4a41eb7 100644 --- 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.13/aws-iam-authenticator-0.6.13.tar.gz" -sha512 = "deb7692c5e3d87fd9b6f3e44c916a08604fb6fbb23ba1cbd5611e87b0aca9f4380525641fb5ac7e4d7d9f82223bc73d7d5d6c1295e56de351a011c38a252e5f5" +url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.6.14/aws-iam-authenticator-0.6.14.tar.gz" +sha512 = "26a6b394fbe767910f605a356032338a4ec254b81cd470796e3137e3595fef338bd213dee8d956c8d23e16f5508741e78664cd0f8b1acd97321d2fb5b7b723af" 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 index 2c4306f1583..1a2cf853fb3 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.6.13 +%global gover 0.6.14 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 From 8301ed387aa8a0a3bc9e32752aeae82798ebed98 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:03:53 +0000 Subject: [PATCH 03/10] packages: update ca-certificates to 2023.12.12 --- packages/ca-certificates/Cargo.toml | 4 ++-- packages/ca-certificates/ca-certificates.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ca-certificates/Cargo.toml b/packages/ca-certificates/Cargo.toml index 98d8fdebafb..ba24faf28ba 100644 --- a/packages/ca-certificates/Cargo.toml +++ b/packages/ca-certificates/Cargo.toml @@ -12,5 +12,5 @@ path = "../packages.rs" releases-url = "https://curl.se/docs/caextract.html" [[package.metadata.build-package.external-files]] -url = "https://curl.haxx.se/ca/cacert-2023-08-22.pem" -sha512 = "26a6696b4b17a8d95a6baeaf0643e21789eae033a680c18ff7083d3dea70b908e12c6afeb39aee0025c4f65428d2c2944576893936818426c5030d7e150ef1c2" +url = "https://curl.haxx.se/ca/cacert-2023-12-12.pem" +sha512 = "dcbfe08d39efdd8de555b31e1050757900d08448c61f8a67c055f14514e5d47e734f6874b5ae628021c35ebc8dabdfdac5808df0b3a073d4f9246cca4b725fe8" diff --git a/packages/ca-certificates/ca-certificates.spec b/packages/ca-certificates/ca-certificates.spec index 984325fc484..ecffb9f5e2e 100644 --- a/packages/ca-certificates/ca-certificates.spec +++ b/packages/ca-certificates/ca-certificates.spec @@ -1,12 +1,12 @@ Name: %{_cross_os}ca-certificates -Version: 2023.08.22 +Version: 2023.12.12 Release: 1%{?dist} Summary: CA certificates extracted from Mozilla License: MPL-2.0 # Note: You can see changes here: # https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt URL: https://curl.haxx.se/docs/caextract.html -Source0: https://curl.haxx.se/ca/cacert-2023-08-22.pem +Source0: https://curl.haxx.se/ca/cacert-2023-12-12.pem Source1: ca-certificates-tmpfiles.conf %description From bd74c7c98a851417d36975a816474c3c0e9dd0c2 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:04:45 +0000 Subject: [PATCH 04/10] packages: update chrony to 4.5 --- packages/chrony/Cargo.toml | 4 ++-- packages/chrony/chrony.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/chrony/Cargo.toml b/packages/chrony/Cargo.toml index 5fb05cb8e9b..0c8ad01592b 100644 --- a/packages/chrony/Cargo.toml +++ b/packages/chrony/Cargo.toml @@ -12,8 +12,8 @@ path = "../packages.rs" releases-url = "https://download.tuxfamily.org/chrony" [[package.metadata.build-package.external-files]] -url = "https://download.tuxfamily.org/chrony/chrony-4.4.tar.gz" -sha512 = "45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7" +url = "https://download.tuxfamily.org/chrony/chrony-4.5.tar.gz" +sha512 = "58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/chrony/chrony.spec b/packages/chrony/chrony.spec index 89dfa3bc900..149dd60ee6f 100644 --- a/packages/chrony/chrony.spec +++ b/packages/chrony/chrony.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}chrony -Version: 4.4 +Version: 4.5 Release: 1%{?dist} Summary: A versatile implementation of the Network Time Protocol License: GPL-2.0-only From 28101b28c2498dbc144fce27aab8e83eff27d00c Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:05:42 +0000 Subject: [PATCH 05/10] packages: update containerd to 1.6.26 --- packages/containerd/Cargo.toml | 4 ++-- packages/containerd/containerd.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml index 369860804c4..8877bbd07ef 100644 --- a/packages/containerd/Cargo.toml +++ b/packages/containerd/Cargo.toml @@ -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.6.25/containerd-1.6.25.tar.gz" -sha512 = "5d225e1d0f9682c5831b1b2b8397cea69e6bc10ab8ee2fe5e79a0077fb2d4f3f81456de5c8e4483c63bcc25b342c9e69a9649da4420753ca376c002ca7e5b017" +url = "https://github.com/containerd/containerd/archive/v1.6.26/containerd-1.6.26.tar.gz" +sha512 = "a642ef48f858aaf7f7830ab2ad23d4fc5102dc939d9f8e017ea86772199fe4bd9c7eb550a640b0b9e8b6963d88a1aca87d09eb02e109fc8341f39cfeda47860b" # RPM BuildRequires [build-dependencies] diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec index 55c83518782..829fe628ec1 100644 --- a/packages/containerd/containerd.spec +++ b/packages/containerd/containerd.spec @@ -2,7 +2,7 @@ %global gorepo containerd %global goimport %{goproject}/%{gorepo} -%global gover 1.6.25 +%global gover 1.6.26 %global rpmver %{gover} %global gitrev 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f From 3f7a87656a7d6bfe5ab4ab6ad6d3d2c8fb2e532b Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:06:46 +0000 Subject: [PATCH 06/10] packages: update ecs-agent to 1.79.2 --- packages/ecs-agent/Cargo.toml | 4 ++-- packages/ecs-agent/ecs-agent.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ecs-agent/Cargo.toml b/packages/ecs-agent/Cargo.toml index 2b0a0a7f647..57caa591e64 100644 --- a/packages/ecs-agent/Cargo.toml +++ b/packages/ecs-agent/Cargo.toml @@ -13,8 +13,8 @@ path = "../packages.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.79.1/amazon-ecs-agent-1.79.1.tar.gz" -sha512 = "7ad4e370fbefdf19bc2ac90e4bca80eba25ddd46e3b86d95cdf4288f36ffb01bbae7b4cc98f85392f47a6e1d68b21f02921a24058e6d07946cae43457cfd393f" +url = "https://github.com/aws/amazon-ecs-agent/archive/v1.79.2/amazon-ecs-agent-1.79.2.tar.gz" +sha512 = "28abd355f3a1fb2170b6d2b3064d2f6057e0d8f6d7a37df77cfe91e45ee50ab00cb5ca3ea64fdca82bca29fcdb19c4cd966db0173473cea68612b416c23dae77" # 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 1d7037253f1..893093fe32b 100644 --- a/packages/ecs-agent/ecs-agent.spec +++ b/packages/ecs-agent/ecs-agent.spec @@ -2,7 +2,7 @@ %global agent_gorepo amazon-ecs-agent %global agent_goimport %{agent_goproject}/%{agent_gorepo} -%global agent_gover 1.79.1 +%global agent_gover 1.79.2 # git rev-parse --short=8 %global agent_gitrev 06008fa1 From 40d6f7db0844aaf566323ad9052dc6a1b0e684c7 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:07:46 +0000 Subject: [PATCH 07/10] packages: update iputils to 20231222 --- packages/iputils/Cargo.toml | 6 +++--- packages/iputils/iputils.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/iputils/Cargo.toml b/packages/iputils/Cargo.toml index 7244067e155..3c17ca38357 100644 --- a/packages/iputils/Cargo.toml +++ b/packages/iputils/Cargo.toml @@ -12,9 +12,9 @@ path = "../packages.rs" releases-url = "https://github.com/iputils/iputils/releases" [[package.metadata.build-package.external-files]] -path = "iputils-20221126.tar.gz" -url = "https://github.com/iputils/iputils/archive/20221126.tar.gz" -sha512 = "7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f" +path = "iputils-20231222.tar.gz" +url = "https://github.com/iputils/iputils/archive/20231222.tar.gz" +sha512 = "499cf870210d4aec28dc8c2305892d57d3c1aee0ddbdf0ecb5a4887cd41995bf9e07ca8eabb1e3a38f56d408ea6b54ea9c436e76098f58d530752b862b2598ff" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/iputils/iputils.spec b/packages/iputils/iputils.spec index 9dd50d67d2d..b90564de4c1 100644 --- a/packages/iputils/iputils.spec +++ b/packages/iputils/iputils.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}iputils -Version: 20221126 +Version: 20231222 Release: 1%{?dist} Summary: A set of network monitoring tools License: GPL-2.0-or-later AND BSD-3-Clause From 6274488876985bd1097501f144972e4a78657c75 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:09:58 +0000 Subject: [PATCH 08/10] packages: update kubernetes-1.23 to release 33 --- packages/kubernetes-1.23/Cargo.toml | 4 ++-- packages/kubernetes-1.23/kubernetes-1.23.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kubernetes-1.23/Cargo.toml b/packages/kubernetes-1.23/Cargo.toml index e0b12e4f7c9..2d4dc3e7fc0 100644 --- a/packages/kubernetes-1.23/Cargo.toml +++ b/packages/kubernetes-1.23/Cargo.toml @@ -14,8 +14,8 @@ path = "../packages.rs" package-name = "kubernetes-1.23" [[package.metadata.build-package.external-files]] -url = "https://distro.eks.amazonaws.com/kubernetes-1-23/releases/28/artifacts/kubernetes/v1.23.17/kubernetes-src.tar.gz" -sha512 = "31fd414bebe6ec71682c65256373a99467f558340739739df3f332d6bf1cfef2a2c0b39b337f3f0ed56ae72a4ae083f4fdbe6ad8e964b86c2c9e144aa1f748ab" +url = "https://distro.eks.amazonaws.com/kubernetes-1-23/releases/33/artifacts/kubernetes/v1.23.17/kubernetes-src.tar.gz" +sha512 = "a11b1869c4f201e515b62fd83cf8a984ff83a5238f4447ef62426b933ade0132cdebeb9cd501ddae4b2b6dc6fad4fcea10a94673c36c0b77200602e2789640d5" [[package.metadata.build-package.external-files]] url = "https://raw.githubusercontent.com/aws/eks-distro/168d252ab1f465d3621a6e9b2251fb72b250c49f/projects/kubernetes/kubernetes/1-23/patches/0026-EKS-PATCH-Cherry-pick-119832-Fix-the-problem-Pod-ter.patch" diff --git a/packages/kubernetes-1.23/kubernetes-1.23.spec b/packages/kubernetes-1.23/kubernetes-1.23.spec index fcdbb5562e0..21c010758cd 100644 --- a/packages/kubernetes-1.23/kubernetes-1.23.spec +++ b/packages/kubernetes-1.23/kubernetes-1.23.spec @@ -24,7 +24,7 @@ Summary: Container cluster management # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause License: Apache-2.0 AND BSD-3-Clause URL: https://%{goimport} -Source0: https://distro.eks.amazonaws.com/kubernetes-1-23/releases/28/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz +Source0: https://distro.eks.amazonaws.com/kubernetes-1-23/releases/33/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz Source1: kubelet.service Source2: kubelet-env Source3: kubelet-config From 829b93da3bd883cc79551a09a88cc8be87b481f8 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 19:18:13 +0000 Subject: [PATCH 09/10] libncurses: update to 6.4 rev 20231209 Signed-off-by: Ben Cressey --- packages/libncurses/Cargo.toml | 6 +++--- packages/libncurses/libncurses.spec | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/libncurses/Cargo.toml b/packages/libncurses/Cargo.toml index 46c840538de..65ef24cc264 100644 --- a/packages/libncurses/Cargo.toml +++ b/packages/libncurses/Cargo.toml @@ -9,11 +9,11 @@ build = "../build.rs" path = "../packages.rs" [package.metadata.build-package] -releases-url = "https://invisible-mirror.net/ncurses/announce.html" +releases-url = "https://invisible-mirror.net/archives/ncurses/current/" [[package.metadata.build-package.external-files]] -url = "https://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz" -sha512 = "1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34" +url = "https://invisible-mirror.net/archives/ncurses/current/ncurses-6.4-20231209.tgz" +sha512 = "293b91b20f676230e28dadfc6ec811ac898e56d558d919566bf515d91ee9bd5df222f56da593d5ce249550a38ad4a9d206df2761f170c7738c9e8a3ea564e42a" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libncurses/libncurses.spec b/packages/libncurses/libncurses.spec index a5f56e73dfc..97768617469 100644 --- a/packages/libncurses/libncurses.spec +++ b/packages/libncurses/libncurses.spec @@ -1,10 +1,13 @@ +%global ncurses_ver 6.4 +%global ncurses_rev 20231209 + Name: %{_cross_os}libncurses -Version: 6.4 -Release: 1%{?dist} +Version: %{ncurses_ver} +Release: %{ncurses_rev}%{?dist} Summary: Ncurses libraries License: X11 URL: https://invisible-island.net/ncurses/ncurses.html -Source0: https://invisible-mirror.net/archives/ncurses/ncurses-%{version}.tar.gz +Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{ncurses_ver}-%{ncurses_rev}.tgz Patch1: ncurses-config.patch Patch2: ncurses-libs.patch Patch3: ncurses-urxvt.patch @@ -22,7 +25,7 @@ Requires: %{name} %{summary}. %prep -%autosetup -n ncurses-%{version} -p1 +%autosetup -n ncurses-%{ncurses_ver}-%{ncurses_rev} -p1 %build %cross_configure \ From 3de7b05357f8d2a1833117b256165a10c855f4e0 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 4 Jan 2024 16:14:48 +0000 Subject: [PATCH 10/10] packages: update procps to 4.0.4 --- packages/procps/Cargo.toml | 4 ++-- packages/procps/procps.spec | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/procps/Cargo.toml b/packages/procps/Cargo.toml index b62910171a4..b9feef8065e 100644 --- a/packages/procps/Cargo.toml +++ b/packages/procps/Cargo.toml @@ -12,8 +12,8 @@ path = "../packages.rs" releases-url = "https://gitlab.com/procps-ng/procps/-/tags" [[package.metadata.build-package.external-files]] -url = "https://gitlab.com/procps-ng/procps/-/archive/v3.3.17/procps-v3.3.17.tar.gz" -sha512 = "070076cf6bbbd8b6b342af361035f11d9c7381c5d1e2e430a5f2584ff55656254e8f863a40ca75a38870a5007d1b22a0d452bef13fa0ab89e4bf9676826fd788" +url = "https://gitlab.com/procps-ng/procps/-/archive/v4.0.4/procps-v4.0.4.tar.gz" +sha512 = "b7ba28391b71ad95fda6de25c539132face53c308402d615aa6f5bdde0b5c3de3f5b1b7623e4b1fb92dc36bc2d5b73268afda21c992ef94b1059ba0cd2b6a340" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/procps/procps.spec b/packages/procps/procps.spec index dfd807de1bf..cae7fd459e2 100644 --- a/packages/procps/procps.spec +++ b/packages/procps/procps.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}procps -Version: 3.3.17 +Version: 4.0.4 Release: 1%{?dist} Summary: A set of process monitoring tools License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -51,7 +51,7 @@ Requires: %{name} %{_cross_bindir}/pmap %{_cross_bindir}/ps %{_cross_bindir}/pwdx -%{_cross_bindir}/pwait +%{_cross_bindir}/pidwait %{_cross_bindir}/skill %{_cross_bindir}/snice %{_cross_bindir}/tload @@ -62,15 +62,13 @@ Requires: %{name} %{_cross_libdir}/*.so.* %exclude %{_cross_docdir}/* -%exclude %{_cross_localedir}/* %exclude %{_cross_mandir}/* %files devel %{_cross_libdir}/*.a %{_cross_libdir}/*.so -%dir %{_cross_includedir}/proc -%{_cross_includedir}/proc/*.h +%dir %{_cross_includedir}/libproc2 +%{_cross_includedir}/libproc2/*.h %{_cross_pkgconfigdir}/*.pc -%exclude %{_cross_libdir}/*.la %changelog