diff options
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/Manifest.gz | bin | 17936 -> 17937 bytes | |||
| -rw-r--r-- | app-arch/libarchive/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch | 27 | ||||
| -rw-r--r-- | app-arch/libarchive/libarchive-3.7.2-r3.ebuild (renamed from app-arch/libarchive/libarchive-3.7.2-r2.ebuild) | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex 7eb740b142e9..082e84d98ece 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index 2a7674ac622d..35885d675757 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,7 +1,8 @@ AUX libarchive-3.7.2-32bit-test.patch 1211 BLAKE2B 2cff16e77e244f07df26f81c879400da74010eaac5c87dd333b85d204fc7cb3acd3cabd67751ee19eed26c1897d1fd39c7284a0a85bb7eb755016219ec757a89 SHA512 f0a8e3881e742395afc74e418eceab419280152f0884fd6b9dc971d90e117de1cd0a7578c08f14f694c75b904f12fa71fb0102dde0d67a095f6369b3413f7348 AUX libarchive-3.7.2-lrzip.patch 1095 BLAKE2B 011c61282f5ad91436e8155458695c5f0b9144e21ae856ba319927e6431d9730257d6e7f7ebcc916ad784e24b2f4ff2af75955aa0493ea3705fa8826f632f163 SHA512 71e3aefe7d3e5faa6cd47e350e52135d594184d957cf3e2d592e3770971ff3fed8886b7fe6c897c94efa15b3b9e9d15be05686178d201b422d4503e3878b704d +AUX libarchive-3.7.2-safe-fprintf.patch 945 BLAKE2B 2f9a65b554360d43e3a7b6043df93d49db1c13a9dd4282db7aa08aa0ad6b1c404f1a51f06a4621059d55921cd1c7d0817091efd4b10561a0d554d1d012a4b764 SHA512 eef136388c5b26d82f706746965d756494e185ebb95542d79ceb55f4ec9ad9439049a0984086fe128c6fa9ad66150334bdd50edef6cbb800ee6f403226630e8e DIST libarchive-3.7.2.tar.xz 5237056 BLAKE2B 7221db4811a965ee61d879a2603480363628a19995a351b572d099be9f35576d76f0b0822f9a5a47d9929bc094d4444fd8eafcb4a073e39bb3aa797d4b926ca5 SHA512 a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971 DIST libarchive-3.7.2.tar.xz.asc 659 BLAKE2B 7141baf007b89b7ee38ec817b648cef5efb4d694953fcd49f6ed2dc95cf4da2d9259262b9eb4f01ff5d4ecee1257b266a8c6687a8e8ef8790121048229f1ad22 SHA512 c2ce850088245d7723720737d74d1cc1819984d01b3f9e4ed96b0757f4c6d6d511b78792181a12400c563632d74edcd0c2c3a4b7527cba40ada7ef74488078fc EBUILD libarchive-3.7.2-r1.ebuild 4335 BLAKE2B a79d448c6bb9099c106382bb376febf72719e910704e5fb04ab4af7a230be866665e3f38e3021cf45c128bd3ee16fd5c8fa63f1f5658be31368b4597568437ef SHA512 94d8fae095cea7f6525319069a289368c874bdbcfdb07a1a8a933faeb8adc86bf6dd7c6caf55f2e6d185caffb2726f787c385f275723acb88ba2624c96c9ff2f -EBUILD libarchive-3.7.2-r2.ebuild 4754 BLAKE2B 5b2a1f2edb322741a5c65d2d10e0094e3823123be52214c5cdfe19fe3af28ec7bb65321329e4f86c7e3665f14050c899d9793b1c01f103ed6c7e98ffa557f750 SHA512 9a28f9f8c9a34041bbef72f78b9502418de334462fa94f9ef190b3fbc381041ecc89a03605eabd14d03f74393e85ea0e4fc73611ca0906cc69aa534d5d419d63 +EBUILD libarchive-3.7.2-r3.ebuild 4847 BLAKE2B 70e5d004db15246d9e8872ff4947da4567e39420e122fd3ca0edb590f49c25e960b3c60e26ef8a41b2efb1c2c12a329039b31dc1ccb15f42075c561ddb7fcd06 SHA512 303dc1dd3210ad708c0f284a1ae3f59294470d0bee53de71e55146b916c60cfbb86e39d7ccef1f81db9994c76cd2896bd6d56316c0d97a6c3361cccdc8862f20 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b diff --git a/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch b/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch new file mode 100644 index 000000000000..6a351ba37fea --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch @@ -0,0 +1,27 @@ +From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001 +From: Ed Maste <emaste@freebsd.org> +Date: Fri, 29 Mar 2024 18:02:06 -0400 +Subject: [PATCH] tar: make error reporting more robust and use correct errno + (#2101) + +As discussed in #1609. +--- + tar/read.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tar/read.c b/tar/read.c +index af3d3f423..a7f14a07b 100644 +--- a/tar/read.c ++++ b/tar/read.c +@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) + if (r != ARCHIVE_OK) { + if (!bsdtar->verbose) + safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); +- fprintf(stderr, ": %s: ", archive_error_string(a)); +- fprintf(stderr, "%s", strerror(errno)); ++ safe_fprintf(stderr, ": %s: %s", ++ archive_error_string(a), ++ strerror(archive_errno(a))); + if (!bsdtar->verbose) + fprintf(stderr, "\n"); + bsdtar->return_value = 1; diff --git a/app-arch/libarchive/libarchive-3.7.2-r2.ebuild b/app-arch/libarchive/libarchive-3.7.2-r3.ebuild index 0e17daa7457c..5387e642a60c 100644 --- a/app-arch/libarchive/libarchive-3.7.2-r2.ebuild +++ b/app-arch/libarchive/libarchive-3.7.2-r3.ebuild @@ -76,6 +76,8 @@ PATCHES=( # https://github.com/libarchive/libarchive/issues/2069 # (we can simply update the command since we don't support old lrzip) "${FILESDIR}/${P}-lrzip.patch" + # https://github.com/libarchive/libarchive/pull/2101 + "${FILESDIR}/${P}-safe-fprintf.patch" ) src_prepare() { |