[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  36b82b346454b4d0d0c4c19e0e9ca9e888f23a3e (commit)
       via  2b0e65d0f6cacbc5b6217b650fa050eb85d39e96 (commit)
      from  c5eed2775eced6f324516c0fcb981c67e2d04fc3 (commit)


- Log -----------------------------------------------------------------
commit 36b82b346454b4d0d0c4c19e0e9ca9e888f23a3e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 26 01:47:00 2016 +0100

    Configure first in travis create release
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2b0e65d0f6cacbc5b6217b650fa050eb85d39e96
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 26 01:40:13 2016 +0100

    Base the tarfile list of files on git ls-files instead of find
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 .travis-create-release.sh | 8 +++++---
 Makefile.in               | 8 +++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis-create-release.sh b/.travis-create-release.sh
index a636606..a153a92 100644
--- a/.travis-create-release.sh
+++ b/.travis-create-release.sh
@@ -2,9 +2,11 @@
 
 # $1 is expected to be $TRAVIS_OS_NAME
 
+./Configure dist
 if [ "$1" == osx ]; then
-    make -f Makefile.in \
-	 DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist
+    make NAME='_srcdist' TARFLAGS='-n' TARFILE='_srcdist.tar' \
+	 TAR_COMMAND='$(TAR) $(TARFLAGS) -s "|^|$(NAME)/|" -T $(TARFILE).list -cvf -' \
+	 SHELL='sh -vx' tar
 else
-    make -f Makefile.in DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist
+    make TARFILE='_srcdist.tar' NAME='_srcdist' SHELL='sh -v' dist
 fi
diff --git a/Makefile.in b/Makefile.in
index 842da88..a973031 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -485,15 +485,13 @@ TABLE: Configure Configurations/*.conf
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
 TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
-	                       --owner 0 --group 0 \
+			       --owner 0 --group 0 \
 			       --transform 's|^|$(NAME)/|' \
 			       -cvf -
 
 $(TARFILE).list:
-	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
-	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
-	       \! -name '*test' \! -name '.#*' \! -name '*~' \!	-type l \
-	    | sort > $(TARFILE).list
+	git diff --quiet HEAD
+	git ls-files | sort > $(TARFILE).list
 
 tar: $(TARFILE).list
 	find . -type d -print | xargs chmod 755