Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3p packages update 1.19.3 #3832

Merged
merged 20 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/amazon-ssm-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.40.0/amazon-ssm-agent-3.3.40.0.tar.gz"
sha512 = "3397dc2604b22f3457c43a0efa3ccadc8d4b5db4036a93413138bf00d0d54c052dfe6d657b21097df94300c7cfb6f8b5b4bd2ddae228957d96c85e08814a9ec5"
url = "/~https://github.com/aws/amazon-ssm-agent/archive/3.3.131.0/amazon-ssm-agent-3.3.131.0.tar.gz"
sha512 = "b4c40aabc8da3b5ea3944e420fbe795d0988c57a1eafe8fc6bef6e43f9bf8fb7806213dac7bebe9e5e7e6413a2ddb4057820bcbc399c4c92f6a3ba0078c14bd7"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/amazon-ssm-agent/amazon-ssm-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%global goimport %{goproject}/%{gorepo}

Name: %{_cross_os}amazon-ssm-agent
Version: 3.3.40.0
Version: 3.3.131.0
Release: 1%{?dist}
Summary: An agent to enable remote management of EC2 instances
License: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions packages/ca-certificates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-12-12.pem"
sha512 = "dcbfe08d39efdd8de555b31e1050757900d08448c61f8a67c055f14514e5d47e734f6874b5ae628021c35ebc8dabdfdac5808df0b3a073d4f9246cca4b725fe8"
url = "https://curl.haxx.se/ca/cacert-2024-03-11.pem"
sha512 = "31f03cc19566d007c4cffdad2ada71d99b4734ad7b13bc4f30d73d321f40cbe13b87a801aa61d9788207a851cc1f95a8af8ac732a372d45edb932f204bce3744"
4 changes: 2 additions & 2 deletions packages/ca-certificates/ca-certificates.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: %{_cross_os}ca-certificates
Version: 2023.12.12
Version: 2024.03.11
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-12-12.pem
Source0: https://curl.haxx.se/ca/cacert-2024-03-11.pem
Source1: ca-certificates-tmpfiles.conf

%description
Expand Down
14 changes: 7 additions & 7 deletions packages/conntrack-tools/0001-disable-RPC-helper.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From d45fa29ef802bf5787393e88dd61dabc2999d5ae Mon Sep 17 00:00:00 2001
From 5a76b5fa1b631191adbec7919f58e067dd6c2896 Mon Sep 17 00:00:00 2001
From: Ben Cressey <bcressey@amazon.com>
Date: Mon, 17 Jun 2019 22:40:54 +0000
Date: Tue, 19 Mar 2024 14:17:52 +0000
Subject: [PATCH] disable RPC helper

We do not intend to run the daemon to synchronize firewall rules or
Expand All @@ -16,20 +16,20 @@ Signed-off-by: Ben Cressey <bcressey@amazon.com>
2 files changed, 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0565be..a417691 100644
index da852b1..973a9d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,6 @@ AC_ARG_ENABLE([systemd],
@@ -49,8 +49,6 @@ AC_ARG_ENABLE([systemd],
AS_HELP_STRING([--enable-systemd], [Build systemd support]),
[enable_systemd="$enableval"], [enable_systemd="no"])

-AC_CHECK_HEADER([rpc/rpc_msg.h], [AC_SUBST([LIBTIRPC_CFLAGS],'')], [PKG_CHECK_MODULES([LIBTIRPC], [libtirpc])])
-
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.8])
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.9])
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
index e4f10c9..159362f 100644
index e458ab4..47f1d46 100644
--- a/src/helpers/Makefile.am
+++ b/src/helpers/Makefile.am
@@ -4,7 +4,6 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \
Expand All @@ -52,5 +52,5 @@ index e4f10c9..159362f 100644
ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
ct_helper_tftp_la_CFLAGS = $(HELPER_CFLAGS)
--
2.21.0
2.40.1

4 changes: 2 additions & 2 deletions packages/conntrack-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://www.netfilter.org/projects/conntrack-tools/files"

[[package.metadata.build-package.external-files]]
url = "https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.7.tar.bz2"
sha512 = "3d37a6b8cd13fd3c149ab80009d686d2184920ba2d0d5c1b57abed6e92e0dd92cba868bfe22f1a155479fe5ab2e291b8bb8a7e72123a73788032202ac142653b"
url = "https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.8.tar.xz"
sha512 = "95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
4 changes: 2 additions & 2 deletions packages/conntrack-tools/conntrack-tools.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Name: %{_cross_os}conntrack-tools
Version: 1.4.7
Version: 1.4.8
Release: 1%{?dist}
Summary: Tools for managing Linux kernel connection tracking
# src/utils.c contains GPLv2-only code from linux
License: GPL-2.0-or-later AND GPL-2.0-only
URL: http://conntrack-tools.netfilter.org/
Source0: https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-%{version}.tar.bz2
Source0: https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-%{version}.tar.xz
Patch1: 0001-disable-RPC-helper.patch

BuildRequires: %{_cross_os}glibc-devel
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.6.28/containerd-1.6.28.tar.gz"
sha512 = "8d7f289aa1dd55868612654e60ddb95573149b2b40ba925910a0ad75ec5de1acd916ecaaf7571f4f24ec0fb6db3ec23ef1efbe6bf4960c410f46f7b15531a301"
url = "/~https://github.com/containerd/containerd/archive/v1.6.30/containerd-1.6.30.tar.gz"
sha512 = "0c92412601805757c13f9007cb8a2828da557bcc0e9e4627d1d1c50e5a2f8281c9155d5976d57b51cace497f68bd014c2688b077cf4bfc77d458bdc91dae164c"

# 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.6.28
%global gover 1.6.30
%global rpmver %{gover}
%global gitrev ae07eda36dd25f8a1b98dfbf587313b99c0190bb

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.27.tar.xz"
sha512 = "30b5ef7c2075dfd11fd1c3c33abe6b60673400257668d60145be08a2472356c7191a0810095da0fa32e327b9806a7578c73129ac0550d26c28ea6571c88c7b3c"
url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.28.tar.xz"
sha512 = "889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753"

[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.27
Version: 2.0.28
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
1 change: 1 addition & 0 deletions packages/kubernetes-1.23/kubernetes-1.23.spec
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make generated_files

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.24/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.24"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-24/releases/29/artifacts/kubernetes/v1.24.17/kubernetes-src.tar.gz"
sha512 = "cfdecfb3cdae51f8484eb611f3946c3ffbb708d701ee3a4723498f1164a455a1a8a9ebd61cf195cd5532edcf16e6bf3d6e554142b679f3d0c425e685e32b26da"
url = "https://distro.eks.amazonaws.com/kubernetes-1-24/releases/36/artifacts/kubernetes/v1.24.17/kubernetes-src.tar.gz"
sha512 = "ac71b53a37c2875a2f0ecf816aba3d3bb6da555976496f43f18e3fedfc8c60903b372a11c7f5b1114561e8d8baecb028ed92c34d8adeafe495e5b9dc7d32a4ab"
# RPM BuildRequires
[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
3 changes: 2 additions & 1 deletion packages/kubernetes-1.24/kubernetes-1.24.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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-24/releases/29/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-24/releases/36/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I'd like to see the addition of these as their own commit and down by the rest of the exports (probably after export %{kube_cc} along with a comment explaining that we want to override the Go specification since we bring our own Go toolchain.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed about putting them in their own commit (kubelet: set FORCE_HOST_GO=1 in environment).

But it does need to be set here, before make generated_files is invoked, or it will try again to download the Go toolchain for codegen.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh interesting, I didn't realize they used go in the codegen :| Ok, then I agree that is where it should be.

# Build codegen programs with the host toolchain.
make generated_files

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.25/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.25"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-25/releases/27/artifacts/kubernetes/v1.25.16/kubernetes-src.tar.gz"
sha512 = "e3a7b21e6fe07e31d42a4c8b917679b1d3d7f3d0020d5085b592fdb776228e786bbe458cce94d6cf1d7c8bd85142ba02bbfb71b89047f99f8e82a5e9f62dd477"
url = "https://distro.eks.amazonaws.com/kubernetes-1-25/releases/35/artifacts/kubernetes/v1.25.16/kubernetes-src.tar.gz"
sha512 = "e3672cc93d74f1ffbdbf446b84693fa8e03d989f6c9174adc60b4ea8f53ac0e5bc660d06377f99bc7cc11f40c2c611e8641f6b9c1d6d2c658b1b0ece79909b1b"
# RPM BuildRequires
[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
3 changes: 2 additions & 1 deletion packages/kubernetes-1.25/kubernetes-1.25.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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-25/releases/27/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-25/releases/35/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make generated_files

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.26/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.26"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-26/releases/23/artifacts/kubernetes/v1.26.11/kubernetes-src.tar.gz"
sha512 = "7790ef617fbd30a1f264a4af19d6ccd0a81a6b3abfafe75aa9584948211c1e16a0d4f8910cb9b3edfc77407932bd879215fc0084fbfc5e65b090369e05378790"
url = "https://distro.eks.amazonaws.com/kubernetes-1-26/releases/31/artifacts/kubernetes/v1.26.14/kubernetes-src.tar.gz"
sha512 = "6e4df683493b055e0445be2389f7c31b48da5a26f82f833df9ab9d0ae17e769cda65d58e0af2bbd4472a30b6f8ec4bd144af00b35a8ecd2b7afd9c62c2fcc7dc"
# RPM BuildRequires
[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
5 changes: 3 additions & 2 deletions packages/kubernetes-1.26/kubernetes-1.26.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%global gorepo kubernetes
%global goimport %{goproject}/%{gorepo}

%global gover 1.26.11
%global gover 1.26.14
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand All @@ -32,7 +32,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-26/releases/23/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-26/releases/31/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make hack/update-codegen.sh

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.27/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.27"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-27/releases/17/artifacts/kubernetes/v1.27.8/kubernetes-src.tar.gz"
sha512 = "d09335d7d171c0a1d6e7a85dfbbfedd6732c89f56c617f4c54555429339ab3ce2a6008e8a0583b71d26cf46df3ebd8bf9b46344f4b1f7d43d6ec381b37f300cf"
url = "https://distro.eks.amazonaws.com/kubernetes-1-27/releases/25/artifacts/kubernetes/v1.27.11/kubernetes-src.tar.gz"
sha512 = "6d07dabc536149035137332afaa641964d76839d63b0d1b8fe8fbce39c7879370996eece1df0c6d1deb478bb613033527c06934bb6ccfd23cbb18a0ae3d85e0d"

# RPM BuildRequires
[build-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions packages/kubernetes-1.27/kubernetes-1.27.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%global gorepo kubernetes
%global goimport %{goproject}/%{gorepo}

%global gover 1.27.8
%global gover 1.27.11
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand All @@ -32,7 +32,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-27/releases/17/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-27/releases/25/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make hack/update-codegen.sh

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.28/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.28"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/10/artifacts/kubernetes/v1.28.4/kubernetes-src.tar.gz"
sha512 = "663762465cf0a926651b4996f59fa20d31cc0dc2a0d7b8aeb6cd7ad465b154fc330a5b51e92c1a5d6ae80af2cb3789e8b99b68524a4c58d03d298c6ff4e29b32"
url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/18/artifacts/kubernetes/v1.28.7/kubernetes-src.tar.gz"
sha512 = "451e88936d88e07edfd3bd14069a5c33d7c1b21a10feae693f09206ced76170f228f4a12fe666220ddfa39192ca080b7a59b6942d02fdd326759ae24163a483e"

# RPM BuildRequires
[build-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions packages/kubernetes-1.28/kubernetes-1.28.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%global gorepo kubernetes
%global goimport %{goproject}/%{gorepo}

%global gover 1.28.4
%global gover 1.28.7
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand All @@ -32,7 +32,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-28/releases/10/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-28/releases/18/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make hack/update-codegen.sh

Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.29/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
package-name = "kubernetes-1.29"

[[package.metadata.build-package.external-files]]
url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/1/artifacts/kubernetes/v1.29.0/kubernetes-src.tar.gz"
sha512 = "fb94f967683428ca59dd8f203f398b2658ef5b65d517672d16e7f5b4e08662f9ee81065840060301e240f7659ec61543402ad4d0379c5405047c612ede8ad4eb"
url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/7/artifacts/kubernetes/v1.29.1/kubernetes-src.tar.gz"
sha512 = "9940027197f83702516775047664d3c30a83e69202dcca5aa89f320e78c27a930eb1373777277f240b3c5a63c351ccab3199c577424e760fe122692065895e2f"

# RPM BuildRequires
[build-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions packages/kubernetes-1.29/kubernetes-1.29.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%global gorepo kubernetes
%global goimport %{goproject}/%{gorepo}

%global gover 1.29.0
%global gover 1.29.1
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand All @@ -32,7 +32,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-29/releases/1/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source0: https://distro.eks.amazonaws.com/kubernetes-1-29/releases/7/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
Source1: kubelet.service
Source2: kubelet-env
Source3: kubelet-config
Expand Down Expand Up @@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang
cp third_party/forked/golang/PATENTS PATENTS.golang

%build
export FORCE_HOST_GO=1
# Build codegen programs with the host toolchain.
make hack/update-codegen.sh

Expand Down
4 changes: 2 additions & 2 deletions packages/libaudit/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-audit/audit-userspace/releases"

[[package.metadata.build-package.external-files]]
url = "/~https://github.com/linux-audit/audit-userspace/archive/v3.1.2/audit-userspace-3.1.2.tar.gz"
sha512 = "d5b05686aedd6eaaced000778580bd3e96e38c020534038d6b1ee6de96dd7687c2f3a52a2ae75be8b93c173b286a56dbc92231906c68fda79b113dfcaad6da84"
url = "/~https://github.com/linux-audit/audit-userspace/archive/v3.1.3/audit-userspace-3.1.3.tar.gz"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's fine to stay on 3.x for now, but it should also be possible to move up to audit 4 - or if it's not, we should at least have tried it and have a sense of what's broken.

Copy link
Contributor Author

@vyaghras vyaghras Mar 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

sha512 = "3e21af2a43e103dd38b65bb1fbfcbe5da2aae1a883218edd80dc715d4ed5fc8980b964469dadf42040f35fab9bfb4b0224b299aafb622a11f48e9f388103b6f0"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/libaudit/libaudit.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libaudit
Version: 3.1.2
Version: 3.1.3
Release: 1%{?dist}
Summary: Library for the audit subsystem
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Expand Down
4 changes: 2 additions & 2 deletions packages/libexpat/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/libexpat/libexpat/releases/"

[[package.metadata.build-package.external-files]]
url = "/~https://github.com/libexpat/libexpat/releases/download/R_2_6_0/expat-2.6.0.tar.xz"
sha512 = "d6f1c4a1a2ec8ffc04c04d6767cc8dd7dea3d132d10b8a2c45c5bfb405893c75db032b87a56cc88300b61c961dd7f9782b93aa74dddc7e66f25acb0c6c82b1fd"
url = "/~https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.xz"
sha512 = "47b60967d6346d330dded87ea1a2957aa7d34dd825043386a89aa131054714f618ede57bfe97cf6caa40582a4bc67e198d2a915e7d8dbe8ee4f581857c2e3c2e"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/libexpat/libexpat.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global unversion 2_6_0
%global unversion 2_6_2

Name: %{_cross_os}libexpat
Version: %(echo %{unversion} | sed 's/_/./g')
Expand Down
Loading