From 488803740e69ea3594c5e60be00d780aa4fab58f Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 5 Dec 2022 10:59:50 -0500
Subject: [PATCH 1/2] grpc-tools: Force GNU format for artifact tarballs

---
 packages/grpc-tools/build_binaries.sh | 2 +-
 packages/grpc-tools/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grpc-tools/build_binaries.sh b/packages/grpc-tools/build_binaries.sh
index e4488108..e25eb1f5 100755
--- a/packages/grpc-tools/build_binaries.sh
+++ b/packages/grpc-tools/build_binaries.sh
@@ -47,7 +47,7 @@ artifacts() {
   arch=$2
   dir=$3
 
-  tar -czf $out_dir/$platform-$arch.tar.gz -C $(dirname $dir) $(basename $dir)
+  tar --format=gnu -czf $out_dir/$platform-$arch.tar.gz -C $(dirname $dir) $(basename $dir)
 }
 
 case $(uname -s) in
diff --git a/packages/grpc-tools/package.json b/packages/grpc-tools/package.json
index 333ef1eb..2d10b927 100644
--- a/packages/grpc-tools/package.json
+++ b/packages/grpc-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-tools",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "author": "Google Inc.",
   "description": "Tools for developing with gRPC on Node.js",
   "homepage": "https://grpc.io/",

From 2ddd628747c676302d56db86d5ce73eb00d32777 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 5 Dec 2022 11:24:33 -0500
Subject: [PATCH 2/2] Use BSD tar-specific options on Mac

---
 packages/grpc-tools/build_binaries.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/grpc-tools/build_binaries.sh b/packages/grpc-tools/build_binaries.sh
index e25eb1f5..c05d7da8 100755
--- a/packages/grpc-tools/build_binaries.sh
+++ b/packages/grpc-tools/build_binaries.sh
@@ -46,8 +46,14 @@ artifacts() {
   platform=$1
   arch=$2
   dir=$3
-
-  tar --format=gnu -czf $out_dir/$platform-$arch.tar.gz -C $(dirname $dir) $(basename $dir)
+  case $(uname -s) in
+    Linux)
+      tar -czf $out_dir/$platform-$arch.tar.gz -C $(dirname $dir) $(basename $dir)
+      ;;
+    Darwin)
+      tar --format=gnutar -czf $out_dir/$platform-$arch.tar.gz -C $(dirname $dir) $(basename $dir)
+      ;;
+  esac
 }
 
 case $(uname -s) in