[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3be389435fc7b94623d972b622dbd9f0cd5c34f7 (commit)
       via  b741f153b2f24139d7210b1b0c9caf561f4900e8 (commit)
       via  76bc401cc63219a462224884cb4af787e17725ed (commit)
       via  b9a694717902af796639e1dff641ba620703303b (commit)
       via  b42922ea2f605fd6c42faad1743fb27be5f7f1f3 (commit)
      from  707c19f42113f90405b67cde59e5f1c1e42e6ab2 (commit)


- Log -----------------------------------------------------------------
commit 3be389435fc7b94623d972b622dbd9f0cd5c34f7
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Nov 24 17:51:24 2018 +0100

    Have util/mktar.sh display the absolute path to the tarball
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7696)

commit b741f153b2f24139d7210b1b0c9caf561f4900e8
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Nov 24 11:27:50 2018 +0100

    Make sure to run util/mktar.sh from the source directory
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7696)

commit 76bc401cc63219a462224884cb4af787e17725ed
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Nov 24 00:59:33 2018 +0100

    Don't export the submodules 'boringssl', 'krb5' and 'pyca-cryptography'
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7696)

commit b9a694717902af796639e1dff641ba620703303b
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 23 14:43:16 2018 +0100

    Don't export util/mktar.sh
    
    When creating a tarball, it's pointless to include scripts that assume
    a git workspace.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7696)

commit b42922ea2f605fd6c42faad1743fb27be5f7f1f3
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 23 14:40:39 2018 +0100

    Document the removed 'dist' target
    
    Also adds missing copyright boilerplate to util/mktar.sh
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7696)

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

Summary of changes:
 .gitattributes                    |  4 ++++
 CHANGES                           |  5 +++++
 Configurations/unix-Makefile.tmpl |  3 ++-
 util/mktar.sh                     | 11 ++++++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 912b4ae..96e40b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,7 @@
 fuzz/corpora/**                         export-ignore
 Configurations/*.norelease.conf         export-ignore
 .*                                      export-ignore
+util/mktar.sh                           export-ignore
+boringssl                               export-ignore
+krb5                                    export-ignore
+pyca-cryptography                       export-ignore
diff --git a/CHANGES b/CHANGES
index 95bced8..c554575 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,11 @@
 
  Changes between 1.1.1 and 1.1.2 [xx XXX xxxx]
 
+  *) Remove the 'dist' target and add a tarball building script.  The
+     'dist' target has fallen out of use, and it shouldn't be
+     necessary to configure just to create a source distribution.
+     [Richard Levitte]
+
   *) Recreate the OS390-Unix config target.  It no longer relies on a
      special script like it did for OpenSSL pre-1.1.0.
      [Richard Levitte]
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b5c6991..ecdd0c1 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -231,6 +231,7 @@ TARFLAGS= {- $target{TARFLAGS} -}
 
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
+# Relative to $(SRCDIR)
 TARFILE=        ../$(NAME).tar
 
 ##### Project flags ##################################################
@@ -873,7 +874,7 @@ tags TAGS: FORCE
 # Release targets (note: only available on Unix) #####################
 
 tar:
-	$(SRCDIR)/util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)'
+	(cd $(SRCDIR); ./util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)')
 
 # Helper targets #####################################################
 
diff --git a/util/mktar.sh b/util/mktar.sh
index 0848b7b..17115cf 100755
--- a/util/mktar.sh
+++ b/util/mktar.sh
@@ -1,4 +1,10 @@
 #! /bin/sh
+# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
 
 HERE=`dirname $0`
 
@@ -24,4 +30,7 @@ if [ -z "$TARFILE" ]; then TARFILE="$NAME.tar"; fi
 git archive --worktree-attributes --format=tar --prefix="$NAME/" -v HEAD \
     | gzip -9 > "$TARFILE.gz"
 
-ls -l "$TARFILE.gz"
+# Good old way to ensure we display an absolute path
+td=`dirname $TARFILE`
+tf=`basename $TARFILE`
+ls -l "`cd $td; pwd`/$tf.gz"