[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3eb99601b148e0019905b660d344508cccfc6943 (commit)
      from  b0614f0ae3c33182ad184dc82056b22aebf42956 (commit)


- Log -----------------------------------------------------------------
commit 3eb99601b148e0019905b660d344508cccfc6943
Author: Hu Keping <hukeping at huawei.com>
Date:   Wed Sep 9 16:01:17 2020 +0000

    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 at huawei.com>
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12841)

-----------------------------------------------------------------------

Summary of changes:
 util/mktar.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/mktar.sh b/util/mktar.sh
index ec47578f34..06a1f92150 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`