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

Update packages for 1.8.0 #2178

Merged
merged 24 commits into from
Jun 7, 2022
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/aws-iam-authenticator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ 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.5/aws-iam-authenticator-0.5.5.tar.gz"
sha512 = "24c2a7fd141f921e18c17f4c7e90bbf5325cc6fad3b35753c0da2d879cf64d8f6af0130f8c45ec7693d6fce043181abbd04a911e6fa778f686bd5c313631ed0f"
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.7/aws-iam-authenticator-0.5.7.tar.gz"
sha512 = "64d0959555a39f0fd1f55e689495507a3d1fd005ced4287ea853750915c1953a328f794a37799b4f0936fca2a009fa7d7fdb432be79468b643f5f967edaf8f9c"

[build-dependencies]
glibc = { path = "../glibc" }
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.5.5
%global gover 0.5.7
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 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 = "pkg.rs"
releases-url = "https://curl.se/docs/caextract.html"

[[package.metadata.build-package.external-files]]
url = "https://curl.haxx.se/ca/cacert-2022-03-18.pem"
sha512 = "ef82868c7d0ea1ff708a4f63cd8f10158384931f39ba2300bbf1ffcc3ff3fea2282f8f78cf74a78d0b93d83297e2cfcabb7427a463d3199087b708b624aabc42"
url = "https://curl.haxx.se/ca/cacert-2022-04-26.pem"
sha512 = "91266bcf97d879828c26beba82e15ff73aa676d800e11401da22b0a565e980912222e02e9a9cc7daff7ceddf78309d8fb0adef6a4eaff9cefa73b72a97281bc2"
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: 2022.03.18
Version: 2022.04.26
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-2022-03-18.pem
Source0: https://curl.haxx.se/ca/cacert-2022-04-26.pem
Source1: ca-certificates-tmpfiles.conf

%description
Expand Down
36 changes: 36 additions & 0 deletions packages/coreutils/1001-gnulib-simple-backup-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
Author: Paul Eggert <[email protected]>
Date: Wed Apr 20 19:34:57 2022 -0700

backupfile: fix bug when renaming simple backups

* lib/backupfile.c (backupfile_internal): Fix bug when RENAME
and when doing simple backups. Problem reported by Steve Ward in:
https://bugs.gnu.org/55029

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 1e9290a187..d9f465a3e0 100644
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
return s;

DIR *dirp = NULL;
- int sdir = AT_FDCWD;
+ int sdir = dir_fd;
idx_t base_max = 0;
while (true)
{
@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
if (! rename)
break;

- int olddirfd = sdir < 0 ? dir_fd : sdir;
- idx_t offset = sdir < 0 ? 0 : base_offset;
+ idx_t offset = backup_type == simple_backups ? 0 : base_offset;
unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
+ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
break;
int e = errno;
if (! (e == EEXIST && extended))
4 changes: 2 additions & 2 deletions packages/coreutils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "pkg.rs"
releases-url = "https://ftp.gnu.org/gnu/coreutils"

[[package.metadata.build-package.external-files]]
url = "https://ftp.gnu.org/gnu/coreutils/coreutils-9.0.tar.xz"
sha512 = "9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03"
url = "https://ftp.gnu.org/gnu/coreutils/coreutils-9.1.tar.xz"
sha512 = "a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
5 changes: 4 additions & 1 deletion packages/coreutils/coreutils.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}coreutils
Version: 9.0
Version: 9.1
Release: 1%{?dist}
Summary: A set of basic GNU tools
License: GPL-3.0-or-later
Expand All @@ -17,6 +17,9 @@ Requires: %{_cross_os}libcap
Requires: %{_cross_os}libselinux
Requires: %{_cross_os}libxcrypt

# Include patch from Fedora 37, fix for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55029
Patch1001: 1001-gnulib-simple-backup-fix.patch

%description
%{summary}.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
From c6cbf43d62a587b7a7672b726c4513005c9b77e8 Mon Sep 17 00:00:00 2001
From 9c29e409e68789b2bae933e5be4f0c8828a3f59a Mon Sep 17 00:00:00 2001
From: Samuel Karp <[email protected]>
Date: Wed, 8 Jul 2020 11:18:35 -0700
Subject: [PATCH 1/5] bottlerocket: default filesystem locations

Signed-off-by: Sean P. Kelly <[email protected]>
---
agent/config/config.go | 6 +++---
agent/config/config_unix.go | 4 ++--
agent/ecscni/plugin.go | 2 +-
agent/utils/license.go | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
agent/config/config.go | 6 +++---
agent/config/config_unix.go | 6 +++---
agent/ecscni/plugin_linux.go | 2 +-
agent/ecscni/plugin_unsupported.go | 2 +-
agent/utils/license.go | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/agent/config/config.go b/agent/config/config.go
index 3178c63f2..810eb31b4 100644
index 4b308bb..5d0aa36 100644
--- a/agent/config/config.go
+++ b/agent/config/config.go
@@ -51,7 +51,7 @@ const (
Expand Down Expand Up @@ -40,10 +42,10 @@ index 3178c63f2..810eb31b4 100644
// DefaultTaskMetadataSteadyStateRate is set as 40. This is arrived from our benchmarking
// results where task endpoint can handle 4000 rps effectively. Here, 100 containers
diff --git a/agent/config/config_unix.go b/agent/config/config_unix.go
index 080f18c4d..ef14970ce 100644
index 8f6b801..b8e7f93 100644
--- a/agent/config/config_unix.go
+++ b/agent/config/config_unix.go
@@ -27,10 +27,10 @@ const (
@@ -29,10 +29,10 @@ const (
// AgentCredentialsAddress is used to serve the credentials for tasks.
AgentCredentialsAddress = "" // this is left blank right now for net=bridge
// defaultAuditLogFile specifies the default audit log filename
Expand All @@ -54,9 +56,9 @@ index 080f18c4d..ef14970ce 100644
- defaultRuntimeStatsLogFile = `/log/agent-runtime-stats.log`
+ defaultRuntimeStatsLogFile = `/var/log/ecs/agent-runtime-stats.log`

// DefaultTaskCgroupPrefix is default cgroup prefix for ECS tasks
DefaultTaskCgroupPrefix = "/ecs"
@@ -56,7 +56,7 @@ func DefaultConfig() Config {
// DefaultTaskCgroupV1Prefix is default cgroup v1 prefix for ECS tasks
DefaultTaskCgroupV1Prefix = "/ecs"
@@ -63,7 +63,7 @@ func DefaultConfig() Config {
DockerEndpoint: "unix:///var/run/docker.sock",
ReservedPorts: []uint16{SSHPort, DockerReservedPort, DockerReservedSSLPort, AgentIntrospectionPort, AgentCredentialsPort},
ReservedPortsUDP: []uint16{},
Expand All @@ -66,10 +68,10 @@ index 080f18c4d..ef14970ce 100644
DisableMetrics: BooleanDefaultFalse{Value: ExplicitlyDisabled},
ReservedMemory: 0,
diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go
index 6fc0111d..d3ef6641 100644
index aa56d0a..e8f71b4 100644
--- a/agent/ecscni/plugin_linux.go
+++ b/agent/ecscni/plugin_linux.go
@@ -32,7 +32,7 @@ import (
@@ -33,7 +33,7 @@ import (
const (
vpcCNIPluginInterfaceType = "vlan"
// vpcCNIPluginPath is the path of the cni plugin's log file.
Expand All @@ -79,10 +81,10 @@ index 6fc0111d..d3ef6641 100644

// newCNIGuard returns a new instance of CNI guard for the CNI client.
diff --git a/agent/ecscni/plugin_unsupported.go b/agent/ecscni/plugin_unsupported.go
index 6289877a..fcebedfe 100644
index e156b75..55d1a3c 100644
--- a/agent/ecscni/plugin_unsupported.go
+++ b/agent/ecscni/plugin_unsupported.go
@@ -25,7 +25,7 @@ import (
@@ -26,7 +26,7 @@ import (

const (
// vpcCNIPluginPath is the path of the cni plugin's log file.
Expand All @@ -92,7 +94,7 @@ index 6289877a..fcebedfe 100644

// newCNIGuard returns a new instance of CNI guard for the CNI client.
diff --git a/agent/utils/license.go b/agent/utils/license.go
index 6eccff6ac..324307cd3 100644
index 6eccff6..324307c 100644
--- a/agent/utils/license.go
+++ b/agent/utils/license.go
@@ -24,9 +24,9 @@ type LicenseProvider interface {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ab4d702e78c1730f96deb7662201630f60b77e8c Mon Sep 17 00:00:00 2001
From 331c76247d4c4c0f8fb968e21db85e28b991b716 Mon Sep 17 00:00:00 2001
From: "Sean P. Kelly" <[email protected]>
Date: Wed, 1 Dec 2021 19:19:52 +0000
Subject: [PATCH 2/5] bottlerocket: remove unsupported capabilities
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH 2/5] bottlerocket: remove unsupported capabilities
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/agent/app/agent_capability.go b/agent/app/agent_capability.go
index cc90dc8..a6a5891 100644
index 5febc49..48cf468 100644
--- a/agent/app/agent_capability.go
+++ b/agent/app/agent_capability.go
@@ -231,36 +231,36 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
@@ -233,36 +233,36 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
capabilities = agent.appendPIDAndIPCNamespaceSharingCapabilities(capabilities)

// ecs agent version 1.26.0 supports aws-appmesh cni plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b1b730a48bfb2164b08ffa4a862f2c7621b44b28 Mon Sep 17 00:00:00 2001
From 709aa50f6cefbb860fdc38894d1d82907444343f Mon Sep 17 00:00:00 2001
From: Samuel Karp <[email protected]>
Date: Fri, 21 Aug 2020 11:07:32 -0700
Subject: [PATCH 3/5] bottlerocket: bind introspection to localhost
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 3/5] bottlerocket: bind introspection to localhost
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/handlers/introspection_server_setup.go b/agent/handlers/introspection_server_setup.go
index 3ca0ecc7..b7f70e92 100644
index 3ca0ecc..b7f70e9 100644
--- a/agent/handlers/introspection_server_setup.go
+++ b/agent/handlers/introspection_server_setup.go
@@ -88,7 +88,7 @@ func introspectionServerSetup(containerInstanceArn *string, taskEngine handlersu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 58a3f6b6b64db3054c225e1081d66273a9fc2a2b Mon Sep 17 00:00:00 2001
From efe908afd97346ff3e3efff87700bb07d46e7e08 Mon Sep 17 00:00:00 2001
From: Samuel Karp <[email protected]>
Date: Fri, 26 Mar 2021 17:05:21 -0700
Subject: [PATCH 4/5] bottlerocket: remove unsupported CNI plugins
Expand All @@ -9,10 +9,10 @@ Bottlerocket is enabling support for awsvpc mode, but not AppMesh yet.
1 file changed, 1 deletion(-)

diff --git a/agent/app/agent_unix.go b/agent/app/agent_unix.go
index 42c947015..917a61ecc 100644
index 0d8ae66..bc3daed 100644
--- a/agent/app/agent_unix.go
+++ b/agent/app/agent_unix.go
@@ -48,7 +48,6 @@ const initPID = 1
@@ -46,7 +46,6 @@ const initPID = 1
var awsVPCCNIPlugins = []string{ecscni.ECSENIPluginName,
ecscni.ECSBridgePluginName,
ecscni.ECSIPAMPluginName,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a07bc91f65387a0c4472796a9c673e52596a601f Mon Sep 17 00:00:00 2001
From c8214dc68af21b4ea22c652f3e30caba5fdeef42 Mon Sep 17 00:00:00 2001
From: Samuel Karp <[email protected]>
Date: Fri, 26 Mar 2021 17:48:28 -0700
Subject: [PATCH 5/5] bottlerocket: fix procfs path on host
Expand All @@ -14,10 +14,10 @@ ECS agent in a container, the ECS agent can directly read the host's
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go
index 06a134f4..3705ad24 100644
index 2ad6583..118e6aa 100644
--- a/agent/ecscni/types_linux.go
+++ b/agent/ecscni/types_linux.go
@@ -39,7 +39,7 @@ const (
@@ -40,7 +40,7 @@ const (
// ECSBranchENIPluginName is the binary of the branch-eni plugin
ECSBranchENIPluginName = "vpc-branch-eni"
// NetnsFormat is used to construct the path to cotainer network namespace
Expand Down
Loading