[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Richard Levitte]

The branch OpenSSL_1_0_1-stable has been updated
       via  a19244a433a340275425a7fa6b85e4920eb32430 (commit)
       via  cf269a1a0e8ee9572e1d804449565fb749b6a968 (commit)
       via  4305622736dbbf63efe1637228ceeeb8a1132157 (commit)
      from  66a1ccf494b8fe1b842cd7bdda2d1a025d325753 (commit)


- Log -----------------------------------------------------------------
commit a19244a433a340275425a7fa6b85e4920eb32430
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Dec 8 15:34:52 2015 +0100

    Not all 'find's know -xtype, use -type instead
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 3cd7aef34d0d414d27ab00abadb99265a2cffde9)

commit cf269a1a0e8ee9572e1d804449565fb749b6a968
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Dec 8 12:43:05 2015 +0100

    Adapt the OS X build to use the OS X tar
    
    As part of this, move release creation to a script to be called from
    .travis.yml.  That makes it much easier to test outside of travis.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 382af61f6213e975b4c2a50fd8b9fedd23d86ab5)

commit 4305622736dbbf63efe1637228ceeeb8a1132157
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Dec 8 12:42:27 2015 +0100

    Make it possible to affect the way dists are made
    
    Introducing DISTTARVARS to propagate changed variables down to the
    tar-making target.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 4d3c30a1799bf7b4dc7223b84417c4de992a6b9c)

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

Summary of changes:
 .travis-create-release.sh | 10 ++++++++++
 .travis.yml               |  2 +-
 Makefile.org              |  5 ++---
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 .travis-create-release.sh

diff --git a/.travis-create-release.sh b/.travis-create-release.sh
new file mode 100644
index 0000000..0404fc1
--- /dev/null
+++ b/.travis-create-release.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+# $1 is expected to be $TRAVIS_OS_NAME
+
+if [ "$1" == osx ]; then
+    make -f Makefile.org \
+	 DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist
+else
+    make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist
+fi
diff --git a/.travis.yml b/.travis.yml
index 288a3f1..ad05909 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ matrix:
           env: CONFIG_OPTS="-d --strict-warnings"
 
 before_script:
-    - make -f Makefile.org TARFILE=_srcdist.tar NAME=_srcdist dist
+    - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
     - cd _srcdist
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
diff --git a/Makefile.org b/Makefile.org
index dbb7374..308a6e6 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -506,7 +506,7 @@ TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
 $(TARFILE).list:
 	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
 	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
-	       \! -name '*test' \! -name '.#*' \! -name '*~' \!	-xtype l \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \!	-type l \
 	    | sort > $(TARFILE).list
 
 tar: $(TARFILE).list
@@ -525,8 +525,7 @@ tar-snap: $(TARFILE).list
 dist:   
 	$(PERL) Configure dist
 	@$(MAKE) SDIRS='$(SDIRS)' clean
-	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' \
-	         TARFILE='$(TARFILE)' NAME='$(NAME)' tar
+	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
 
 install: all install_docs install_sw