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 third-party packages #1676

Merged
merged 17 commits into from
Aug 2, 2021
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/ca-certificates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://curl.haxx.se/ca/cacert-2021-05-25.pem"
sha512 = "dcf1a7ad2c9f49f794fb7b927a4c04dd3d25afcd99fe2f7b89be50c986aa2c7964fb785a6eb053f6639996c8b5b93d2364369b0f68c3e483de132f68299c7f0a"
url = "https://curl.haxx.se/ca/cacert-2021-07-05.pem"
sha512 = "881183c7fed512cab763a6145f0e07c5bcdc143589baf433f7ba92223d215f18f48782fcfc04860db0671849e2ceeecedf6704f77148f588e17c4cd9a34cc8f8"
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: 2021.05.25
Version: 2021.07.05
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-2021-05-25.pem
Source0: https://curl.haxx.se/ca/cacert-2021-07-05.pem
Source1: ca-certificates-tmpfiles.conf

%description
Expand Down
4 changes: 2 additions & 2 deletions packages/docker-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/docker/cli/archive/v20.10.4/cli-20.10.4.tar.gz"
sha512 = "861f69657ac3eede228983b7d845ce98c81f4b0aa601aab37024d3f21cf1ca73a182d33bdde8fb9ad89e4954c3903dc4ec2b81fcf7364941a7c38a80ea410e34"
url = "https://github.com/docker/cli/archive/v20.10.7/cli-20.10.7.tar.gz"
sha512 = "4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f"

[build-dependencies]
glibc = { path = "../glibc" }
4 changes: 2 additions & 2 deletions packages/docker-cli/docker-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
%global gorepo cli
%global goimport %{goproject}/%{gorepo}

%global gover 20.10.4
%global gover 20.10.7
%global rpmver %{gover}
%global gitrev d3cb89ee53287cf9214ad5fbc9a111190f607c72
%global gitrev f0df35096d5f5e6b559b42c7fde6c65a2909f7c5

%global source_date_epoch 1492525740

Expand Down
4 changes: 2 additions & 2 deletions packages/docker-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/moby/moby/archive/v20.10.4/moby-20.10.4.tar.gz"
sha512 = "6cbead817d37dc3a4d2686556562d3b52f802ac2cd611a1ff6e373db0464080d8babefd3af31175487b700905fbc876ec8ce235989780b037a4408febdf70985"
url = "https://github.com/moby/moby/archive/v20.10.7/moby-20.10.7.tar.gz"
sha512 = "2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073"

# RPM BuildRequires
[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions packages/docker-engine/docker-engine.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
%global goorg github.com/docker
%global goimport %{goorg}/docker

%global gover 20.10.4
%global gover 20.10.7
%global rpmver %{gover}
%global gitrev 363e9a88a11be517d9e8c65c998ff56f774eb4dc
%global gitrev b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0

%global source_date_epoch 1363394400

Expand Down
4 changes: 2 additions & 2 deletions packages/e2fsprogs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz"
sha512 = "5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d"
url = "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/e2fsprogs-1.46.3.tar.xz"
sha512 = "27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/e2fsprogs/e2fsprogs.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}e2fsprogs
Version: 1.46.2
Version: 1.46.3
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,32 @@ index 080f18c4d..ef14970ce 100644
DataDirOnHost: "/var/lib/ecs",
DisableMetrics: BooleanDefaultFalse{Value: ExplicitlyDisabled},
ReservedMemory: 0,
diff --git a/agent/ecscni/plugin.go b/agent/ecscni/plugin.go
index 192cfccaa..93f56f3ae 100644
--- a/agent/ecscni/plugin.go
+++ b/agent/ecscni/plugin.go
@@ -36,7 +36,7 @@ const (
currentECSCNIVersion = "2020.09.0"
currentECSCNIGitHash = "55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1"
currentVPCCNIGitHash = "a21d3a41f922e14c19387713df66be3e4ee1e1f6"
- vpcCNIPluginPath = "/log/vpc-branch-eni.log"
+ vpcCNIPluginPath = "/var/log/ecs/vpc-branch-eni.log"
diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go
index 6fc0111d..d3ef6641 100644
--- a/agent/ecscni/plugin_linux.go
+++ b/agent/ecscni/plugin_linux.go
@@ -32,7 +32,7 @@ import (
const (
vpcCNIPluginInterfaceType = "vlan"
// vpcCNIPluginPath is the path of the cni plugin's log file.
- vpcCNIPluginPath = "/log/vpc-branch-eni.log"
+ vpcCNIPluginPath = "/var/log/ecs/vpc-branch-eni.log"
)

// 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
--- a/agent/ecscni/plugin_unsupported.go
+++ b/agent/ecscni/plugin_unsupported.go
@@ -25,7 +25,7 @@ import (

const (
// vpcCNIPluginPath is the path of the cni plugin's log file.
- vpcCNIPluginPath = "/log/vpc-branch-eni.log"
+ vpcCNIPluginPath = "/var/log/ecs/vpc-branch-eni.log"
)

// 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
--- a/agent/utils/license.go
Expand Down
22 changes: 11 additions & 11 deletions packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ host's `procfs` at `/host/proc`. Because Bottlerocket does not run the
ECS agent in a container, the ECS agent can directly read the host's
`procfs` at `/proc`.
---
agent/ecscni/types.go | 2 +-
agent/ecscni/types_linux.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/ecscni/types.go b/agent/ecscni/types.go
index 8561eb51b..957aa3877 100644
--- a/agent/ecscni/types.go
+++ b/agent/ecscni/types.go
@@ -38,7 +38,7 @@ const (
ecsSubnet = "169.254.172.0/22"

diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go
index 06a134f4..3705ad24 100644
--- a/agent/ecscni/types_linux.go
+++ b/agent/ecscni/types_linux.go
@@ -39,7 +39,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
- NetnsFormat = "/host/proc/%s/ns/net"
+ NetnsFormat = "/proc/%s/ns/net"
// ECSIPAMPluginName is the binary of the ipam plugin
ECSIPAMPluginName = "ecs-ipam"
// ECSBridgePluginName is the binary of the bridge plugin
)

//IPAMNetworkConfig is the config format accepted by the plugin
--
2.32.0

8 changes: 4 additions & 4 deletions packages/ecs-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ path = "pkg.rs"

# ECS agent
[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-ecs-agent/archive/v1.53.0/amazon-ecs-agent-v1.53.0.tar.gz"
sha512 = "9619291b19ed38b423b8788fce11c03be6fc6c28023fe3c7442824347b84b2250890f1c44832d23a5adea8646f57f656920fa20063eab5f3e7b7c235e7b98691"
url = "https://github.com/aws/amazon-ecs-agent/archive/v1.54.1/amazon-ecs-agent-v1.54.1.tar.gz"
sha512 = "b3f92920ce327ff5a6d77268f927882d25097da65813d4f4c60787772109aa49952ec4130f83bfd00bf77ee86af1e60ca0b0967c02276126ccc378c954bc6047"

# The ECS agent repository includes two CNI plugins as git submodules. git
# archive does not include submodules, so the tarball above does not include
Expand All @@ -22,8 +22,8 @@ url = "https://github.com/aws/amazon-ecs-cni-plugins/archive/55b2ae77ee0bf22321b
sha512 = "42e2dad0741f02a3b0d675c0f512557a118cef6df7e9d989a35c73d02484912d800453148abbf6d8424c5e40d2662745a9aef4a68cb2f610d9defc976e394f1f"

[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-vpc-cni-plugins/archive/a21d3a41f922e14c19387713df66be3e4ee1e1f6/amazon-vpc-cni-plugins.tar.gz"
sha512 = "86011a1d7a8d4a2fe824c9eea6ad2ef9394059475ffa421c3636afd4f4031d60898992022e34ce2b1e9594fa79766f747a6c239e26be5d71fe96addc46bf7f54"
url = "https://github.com/aws/amazon-vpc-cni-plugins/archive/199bfc65cced4951cbb6a38e6e828afa8c2b023c/amazon-vpc-cni-plugins.tar.gz"
sha512 = "ee1c2230c43fa7b8b9a25319bd334abfc08210ea8956ccc4525fe936b48b22b85df778823138d58687e847762b436daa0e0ba69c210a00b173f9b933f656386d"

# RPM BuildRequires
[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions packages/ecs-agent/ecs-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
%global agent_gorepo amazon-ecs-agent
%global agent_goimport %{agent_goproject}/%{agent_gorepo}

%global agent_gover 1.53.0
%global agent_gover 1.54.1
# git rev-parse --short=8
%global agent_gitrev 225bc3a5
%global agent_gitrev 3e20420f

%global ecscni_goproject github.com/aws
%global ecscni_gorepo amazon-ecs-cni-plugins
Expand All @@ -14,7 +14,7 @@
%global vpccni_goproject github.com/aws
%global vpccni_gorepo amazon-vpc-cni-plugins
%global vpccni_goimport %{vpccni_goproject}/%{vpccni_gorepo}
%global vpccni_gitrev a21d3a41f922e14c19387713df66be3e4ee1e1f6
%global vpccni_gitrev 199bfc65cced4951cbb6a38e6e828afa8c2b023c
%global vpccni_gover 1.2

# Construct reproducible tar archives
Expand Down
13 changes: 13 additions & 0 deletions packages/iputils/1000-skip-ipv6-test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git iputils.orig/ping/meson.build iputils/ping/meson.build
index 1e678ec..eedd04b 100644
--- iputils.orig/ping/meson.build
+++ iputils/ping/meson.build
@@ -35,7 +35,7 @@ endif
# https://github.com/actions/virtual-environments/issues/668
ipv6_dst = []
ipv6_switch = []
-r = run_command('ip', '-6', 'a')
+r = run_command('/bin/false')
if r.stdout().strip().contains('::1')
message('IPv6 enabled')
ipv6_dst = [ '::1' ]
6 changes: 3 additions & 3 deletions packages/iputils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
path = "iputils-20210202.tar.gz"
url = "https://github.com/iputils/iputils/archive/20210202.tar.gz"
sha512 = "af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526"
path = "iputils-20210722.tar.gz"
url = "https://github.com/iputils/iputils/archive/20210722.tar.gz"
sha512 = "8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
9 changes: 8 additions & 1 deletion packages/iputils/iputils.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
Name: %{_cross_os}iputils
Version: 20210202
Version: 20210722
Release: 1%{?dist}
Summary: A set of network monitoring tools
License: GPL-2.0-or-later AND BSD-3-Clause
URL: https://github.com/iputils/iputils
Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz#/iputils-%{version}.tar.gz

# iputils' IPv6 testing requires iproute for 'ip' to check whether IPv6 is
# enabled, since they switchd to GitHub Actions CI where it's not. Skip IPv6
# testing rather than adding an iproute requirement.
# Note: After version 20210722, this check moved into ping/test/meson.build, so
# the patch will need to be rebased in the next update.
Patch1000: 1000-skip-ipv6-test.patch

BuildRequires: %{_cross_os}glibc-devel
BuildRequires: %{_cross_os}libcap-devel
Requires: %{_cross_os}libcap
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.19/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ package-name = "kubernetes-1.19"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes/kubernetes/archive/v1.19.12/kubernetes-1.19.12.tar.gz"
sha512 = "ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b"
url = "https://github.com/kubernetes/kubernetes/archive/v1.19.13/kubernetes-1.19.13.tar.gz"
sha512 = "d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509"

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

%global gover 1.19.12
%global gover 1.19.13
%global rpmver %{gover}

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

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes/kubernetes/archive/v1.20.8/kubernetes-1.20.8.tar.gz"
sha512 = "172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac"
url = "https://github.com/kubernetes/kubernetes/archive/v1.20.9/kubernetes-1.20.9.tar.gz"
sha512 = "9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f"

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

%global gover 1.20.8
%global gover 1.20.9
%global rpmver %{gover}

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

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes/kubernetes/archive/v1.21.2/kubernetes-1.21.2.tar.gz"
sha512 = "20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff"
url = "https://github.com/kubernetes/kubernetes/archive/v1.21.3/kubernetes-1.21.3.tar.gz"
sha512 = "d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0"

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

%global gover 1.21.2
%global gover 1.21.3
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/libaudit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.2/audit-userspace-3.0.2.tar.gz"
sha512 = "4ea6b2f2fe7006ff44b0bdfdd248e0ecbfc4f0db47f6861f1e339c5e091757c2672ac70e7056454849227065123c87d7891d6c8396b2f61f5f4c8b164a311609"
url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.3/audit-userspace-3.0.3.tar.gz"
sha512 = "b248398ed4aa3c52eaf6272ce618d2dcc8d88494d1bf3d530178d61906f4f7dac3c0c56862f5bdafa43d72b5c327898d82e95e83d09057b4fc90e917ba83bfad"

[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.0.2
Version: 3.0.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/libcap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.50.tar.gz"
sha512 = "ef9659df65875ef4e987666337d99f4b93a6db5f108c9c885d9b835cba49ee750961ec83cd25f497b01158eb063e1a0675cfd451487c7e90936753e669743bbf"
url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.51.tar.gz"
sha512 = "032f52468323af68cc5cc1d9adcbf61bae962887d475b995629ea22428fbd6e4722599497394cccdb8443381d257187eb2ce80866b009ae84cd8cd45fd616716"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/libcap/libcap.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libcap
Version: 2.50
Version: 2.51
Release: 1%{?dist}
Summary: Library for getting and setting POSIX.1e capabilities
License: GPL-2.0-only OR BSD-3-Clause
Expand Down
4 changes: 2 additions & 2 deletions packages/libffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"
sha512 = "61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f"
url = "https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz"
sha512 = "31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/libffi/libffi.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}libffi
Version: 3.3
Version: 3.4.2
Release: 1%{?dist}
Summary: Library for FFI
License: MIT
Expand Down
1 change: 0 additions & 1 deletion packages/libglib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ sha512 = "fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c70
[build-dependencies]
glibc = { path = "../glibc" }
libffi = { path = "../libffi" }
libpcre = { path = "../libpcre" }
libselinux = { path = "../libselinux" }
libz = { path = "../libz" }
util-linux = { path = "../util-linux" }
2 changes: 0 additions & 2 deletions packages/libglib/libglib.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ BuildRequires: meson
BuildRequires: %{_cross_os}glibc-devel
BuildRequires: %{_cross_os}libffi-devel
BuildRequires: %{_cross_os}libmount-devel
BuildRequires: %{_cross_os}libpcre-devel
BuildRequires: %{_cross_os}libselinux-devel
BuildRequires: %{_cross_os}libz-devel
Requires: %{_cross_os}libffi
Requires: %{_cross_os}libmount
Requires: %{_cross_os}libpcre
tjkirch marked this conversation as resolved.
Show resolved Hide resolved
Requires: %{_cross_os}libselinux
Requires: %{_cross_os}libz

Expand Down
4 changes: 2 additions & 2 deletions packages/libxcrypt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/besser82/libxcrypt/archive/v4.4.22/libxcrypt-4.4.22.tar.gz"
sha512 = "360c5df9a8a239c8e63b5edeea4c99f451fe67c0ef3084f7659c9ad4c976486bb09328fa1e731238538d7ea05133078d4f890d11c030aaee7734ea6f4ae28b1c"
url = "https://github.com/besser82/libxcrypt/archive/v4.4.23/libxcrypt-4.4.23.tar.gz"
sha512 = "4d5854a082a8c707416507611881c1407f0ea0bda0557c5f7ae6b70d8dd1c7a0828afe29d8f2e7754f5f97b824aaa03671dae6d4dad329fcd131b94b77ddb713"

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