[openssl-commits] [openssl] OpenSSL_1_1_1-stable update
Richard Levitte
levitte at openssl.org
Sat Nov 24 17:44:08 UTC 2018
The branch OpenSSL_1_1_1-stable has been updated
via 97afd2b6b13fd79bccf8b85abbc1c15af4b945d4 (commit)
via d4fd89996866f320d6193b5f5e2c2b9efeed31c5 (commit)
via 105d4c0cdf5de96ca4241bbdad735ed6a590ff90 (commit)
via a6d4cc8257b6852fa3b84935434d75aba396bdab (commit)
via 909ecd4f371a5de20e2d74985cee3258f4d1d6d3 (commit)
from 5f90d1b88204b893555b575cb1f22f9a4ea53522 (commit)
- Log -----------------------------------------------------------------
commit 97afd2b6b13fd79bccf8b85abbc1c15af4b945d4
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 d4fd89996866f320d6193b5f5e2c2b9efeed31c5
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 105d4c0cdf5de96ca4241bbdad735ed6a590ff90
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 a6d4cc8257b6852fa3b84935434d75aba396bdab
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 909ecd4f371a5de20e2d74985cee3258f4d1d6d3
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 9cc29b7..94ccdc0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,10 @@
Changes between 1.1.1a and 1.1.1b [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.1 and 1.1.1a [20 Nov 2018]
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 003b28a..3d99985 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -227,6 +227,7 @@ TARFLAGS= {- $target{TARFLAGS} -}
BASENAME= openssl
NAME= $(BASENAME)-$(VERSION)
+# Relative to $(SRCDIR)
TARFILE= ../$(NAME).tar
##### Project flags ##################################################
@@ -831,7 +832,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"
More information about the openssl-commits
mailing list