From eb82d715a9add734706f63cc3a4a6d4242b56c64 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Aug 2024 07:11:45 +0000 Subject: [PATCH] app-arch/libarchive: Sync with Gentoo It's from Gentoo commit 7a5e420e408012a569f8170b8138c318abcebda7. --- .../files/libarchive-3.7.4-INT_MAX.patch | 26 +++++++++++++++++++ .../libarchive/libarchive-3.7.4.ebuild | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch new file mode 100644 index 0000000000..150216b334 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch @@ -0,0 +1,26 @@ +From 6ff1cd1e487ddf545337b88da3f1f5ca69a2f958 Mon Sep 17 00:00:00 2001 +From: Tim Kientzle +Date: Mon, 6 May 2024 20:46:26 -0700 +Subject: [PATCH] Define INT_MAX via `#include ` (#2170) + +#2110 added usages of INT_MAX here without adding the necessary header. + +Resolves #2162 +--- + tar/bsdtar.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tar/bsdtar.c b/tar/bsdtar.c +index 42baab286..f0e71afd1 100644 +--- a/tar/bsdtar.c ++++ b/tar/bsdtar.c +@@ -43,6 +43,9 @@ + #ifdef HAVE_LANGINFO_H + #include + #endif ++#ifdef HAVE_LIMITS_H ++#include ++#endif + #ifdef HAVE_LOCALE_H + #include + #endif diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild index 7c609d3a3f..695219f457 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild @@ -74,6 +74,8 @@ PATCHES=( # https://github.com/libarchive/libarchive/issues/2069 # (we can simply update the command since we don't support old lrzip) "${FILESDIR}/${PN}-3.7.2-lrzip.patch" + # https://github.com/libarchive/libarchive/commit/6ff1cd1e487ddf545337b88da3f1f5ca69a2f958 + "${FILESDIR}/${PN}-3.7.4-INT_MAX.patch" ) src_prepare() {