646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
23 lines
926 B
Diff
23 lines
926 B
Diff
From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001
|
|
From: Emily <hello@emily.moe>
|
|
Date: Tue, 29 Jul 2025 16:53:15 +0100
|
|
Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash
|
|
|
|
---
|
|
libarchive/archive_read_disk_entry_from_file.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
|
|
index 19d049770b..87389642db 100644
|
|
--- a/libarchive/archive_read_disk_entry_from_file.c
|
|
+++ b/libarchive/archive_read_disk_entry_from_file.c
|
|
@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a,
|
|
tempdir = _PATH_TMP;
|
|
archive_string_init(&tempfile);
|
|
archive_strcpy(&tempfile, tempdir);
|
|
- archive_strcat(&tempfile, "tar.md.XXXXXX");
|
|
+ archive_strcat(&tempfile, "/tar.md.XXXXXX");
|
|
tempfd = mkstemp(tempfile.s);
|
|
if (tempfd < 0) {
|
|
archive_set_error(&a->archive, errno,
|