From bcf12552a09d0c40139e5a7c64e0e806a7c04439 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Tue, 7 Dec 2021 06:32:27 -0500
Subject: [PATCH] Set uid and gid to 0 in archiveDirectory() since we don't
 need to store ownership info.

---
 src/system.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/system.cpp b/src/system.cpp
index f882e22b..0fc3b9a5 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -434,7 +434,9 @@ static void archiveDirectory(const std::string& archivePath, std::vector<uint8_t
 #else
 		entryPath = archive_entry_pathname(entry);
 #endif
+
 		entryPath = getRelativePath(entryPath, dirPath);
+
 #if defined ARCH_WIN
 		// FIXME This doesn't seem to set UTF-8 paths on Windows.
 		archive_entry_copy_pathname_w(entry, string::UTF8toUTF16(entryPath).c_str());
@@ -442,6 +444,12 @@ static void archiveDirectory(const std::string& archivePath, std::vector<uint8_t
 		archive_entry_set_pathname(entry, entryPath.c_str());
 #endif
 
+		// Set uid and gid to 0 because we don't need to store these.
+		archive_entry_set_uid(entry, 0);
+		archive_entry_set_uname(entry, NULL);
+		archive_entry_set_gid(entry, 0);
+		archive_entry_set_gname(entry, NULL);
+
 		// Write file to archive
 		r = archive_write_header(a, entry);
 		if (r < ARCHIVE_OK)