From: Hu Keping <hukeping@huawei.com>
Date: Wed, 9 Sep 2020 16:01:17 +0000 (+0000)
Subject: Simplify the tarball generating scripts
X-Git-Tag: openssl-3.0.0-alpha7~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb99601b148e0019905b660d344508cccfc6943;p=thirdparty%2Fopenssl.git

Simplify the tarball generating scripts

As per discussed in issue #12364 [1], since the format of git archive is
inferred from the output file, it's safe to remove the pipe for gzip.

[1] https://github.com/openssl/openssl/issues/12364

Fixes #12364

Signed-off-by: Hu Keping <hukeping@huawei.com>

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12841)
---

diff --git a/util/mktar.sh b/util/mktar.sh
index ec47578f341..06a1f92150a 100755
--- a/util/mktar.sh
+++ b/util/mktar.sh
@@ -31,8 +31,7 @@ done
 if [ -z "$TARFILE" ]; then TARFILE="$NAME.tar"; fi
 
 # This counts on .gitattributes to specify what files should be ignored
-git archive --worktree-attributes --format=tar --prefix="$NAME/" -v HEAD \
-    | gzip -9 > "$TARFILE.gz"
+git archive --worktree-attributes -9 --prefix="$NAME/" -o $TARFILE.gz -v HEAD
 
 # Good old way to ensure we display an absolute path
 td=`dirname $TARFILE`