From 7a23bd3ecdc60254e02efcb7f33d81e748ca09a7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 16 Apr 2021 15:26:24 +0100 Subject: [PATCH] dev-cmd/bottle: set uid/gid. This is a more complete version of `--numeric-owner`. --- Library/Homebrew/dev-cmd/bottle.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 6ba2c351d2..09777b99e6 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -389,7 +389,14 @@ module Homebrew sudo_purge # Unset the owner/group for reproducible bottles. # Tar then gzip for reproducible bottles. - safe_system "tar", "--create", "--numeric-owner", "--file", tar_path, "#{f.name}/#{f.pkg_version}" + owner_group_args = if OS.mac? + ["--uid", "0", "--gid", "0"] + else + ["--owner", "0", "--group", "0"] + end + safe_system "tar", "--create", "--numeric-owner", + *owner_group_args, + "--file", tar_path, "#{f.name}/#{f.pkg_version}" sudo_purge # Set more times for reproducible bottles. tar_path.utime(tab.source_modified_time, tab.source_modified_time)