[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  403783ce05991e21a50d637398798a014e2c4f9d (commit)
       via  ffe7659f788300d924179209c854e6826f2c0332 (commit)
       via  58381f26c288505766daac9e0f20f879fcd06631 (commit)
       via  0e17281a9c35077263128f721e82199a89c36cb8 (commit)
       via  ed207080455147f76d575687f1a7743fa6b0ae0a (commit)
      from  7dac8144a760f0d9780cd7eb0771894874becd78 (commit)


- Log -----------------------------------------------------------------
commit 403783ce05991e21a50d637398798a014e2c4f9d
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)
    
    (cherry picked from commit 3be389435fc7b94623d972b622dbd9f0cd5c34f7)

commit ffe7659f788300d924179209c854e6826f2c0332
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)
    
    (cherry picked from commit b741f153b2f24139d7210b1b0c9caf561f4900e8)

commit 58381f26c288505766daac9e0f20f879fcd06631
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)
    
    (cherry picked from commit 76bc401cc63219a462224884cb4af787e17725ed)

commit 0e17281a9c35077263128f721e82199a89c36cb8
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)
    
    (cherry picked from commit b9a694717902af796639e1dff641ba620703303b)

commit ed207080455147f76d575687f1a7743fa6b0ae0a
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)
    
    (cherry picked from commit b42922ea2f605fd6c42faad1743fb27be5f7f1f3)

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

Summary of changes:
 .gitattributes                    |  4 ++++
 CHANGES                           |  5 ++++-
 Configurations/unix-Makefile.tmpl |  3 ++-
 util/mktar.sh                     | 11 ++++++++++-
 4 files changed, 20 insertions(+), 3 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 60c0dd1..e19b976 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,10 @@
 
  Changes between 1.1.0j and 1.1.0k [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]
 
  Changes between 1.1.0i and 1.1.0j [20 Nov 2018]
 
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b35db4f..af84bd4 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -201,6 +201,7 @@ MAKEDEPEND={- $config{makedepprog} -}
 
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
+# Relative to $(SRCDIR)
 TARFILE=        ../$(NAME).tar
 
 # We let the C compiler driver to take care of .s files. This is done in
@@ -666,7 +667,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"