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

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  544069175245b9826dc5f9ddf9e2f38f5b08e1c5 (commit)
      from  0e80714fb8175a7c059668e9fab25e4b26a3dae6 (commit)


- Log -----------------------------------------------------------------
commit 544069175245b9826dc5f9ddf9e2f38f5b08e1c5
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 2 10:24:33 2018 +0200

    Don't distribute team internal config targets
    
    Configurations/90-team.conf isn't for public consumption, so we rename
    it to 90-team.norelease.conf and make sure 'make dist' and 'make tar'
    don't include it in the tarball.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6016)

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

Summary of changes:
 Configurations/{90-team.conf => 90-team.norelease.conf} |  5 -----
 Configurations/dist.conf                                | 12 ++++++++++++
 Configurations/unix-Makefile.tmpl                       |  4 +++-
 3 files changed, 15 insertions(+), 6 deletions(-)
 rename Configurations/{90-team.conf => 90-team.norelease.conf} (97%)
 create mode 100644 Configurations/dist.conf

diff --git a/Configurations/90-team.conf b/Configurations/90-team.norelease.conf
similarity index 97%
rename from Configurations/90-team.conf
rename to Configurations/90-team.norelease.conf
index 0a83c22..c7f7095 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.norelease.conf
@@ -76,11 +76,6 @@
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-    "dist" => {
-        cc               => "cc",
-        cflags           => "-O",
-        thread_scheme    => "(unknown)",
-    },
     "debug-test-64-clang" => {
         inherit_from     => [ "x86_64_asm" ],
         cc               => "clang",
diff --git a/Configurations/dist.conf b/Configurations/dist.conf
new file mode 100644
index 0000000..4f58dad
--- /dev/null
+++ b/Configurations/dist.conf
@@ -0,0 +1,12 @@
+## -*- mode: perl; -*-
+## Build configuration targets for openssl-team members
+
+# This is to support 'make dist'
+%targets = (
+    "dist" => {
+        inherit_from     => [ 'BASE_unix' ],
+        cc               => "cc",
+        cflags           => "-O",
+        thread_scheme    => "(unknown)",
+    },
+);
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1bfaa97..034d93e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -664,8 +664,10 @@ tar:
 	DISTDIR=$(NAME); \
 	mkdir -p $$TMPDIR/$$DISTDIR; \
 	(cd $(SRCDIR); \
+	 excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf)"; \
+	 echo "$$excl_re"; \
 	 git ls-tree -r --name-only --full-tree HEAD \
-         | grep -v '^fuzz/corpora' \
+	 | egrep -v "$$excl_re" \
 	 | while read F; do \
 	       mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
 	       cp $$F $$TMPDIR/$$DISTDIR/$$F; \