Merge pull request NixOS#9557 from bryanhonof/bryanhonof.fix-apple-do…

…uble-shenanigans

Add option to libarchive so it behaves correctly

(cherry picked from commit c3827ff)
Change-Id: Ib0f928851093f4c644bac071d1c8f8aeec803198

src/libutil/tarfile.cc

@@ -52,6 +52,7 @@ TarArchive::TarArchive(Source & source, bool raw) : buffer(65536)
         archive_read_support_format_raw(archive);
         archive_read_support_format_empty(archive);
     }
+    archive_read_set_option(archive, NULL, "mac-ext", NULL);
     check(archive_read_open(archive, (void *)this, callback_open, callback_read, callback_close), "Failed to open archive (%s)");
 }
 
@@ -62,6 +63,7 @@ TarArchive::TarArchive(const Path & path)
 
     archive_read_support_filter_all(archive);
     archive_read_support_format_all(archive);
+    archive_read_set_option(archive, NULL, "mac-ext", NULL);
     check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s");
 }