[openssl] OpenSSL_1_1_1-stable update

Richard Levitte levitte at openssl.org
Mon Aug 12 10:06:57 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  e17a712e763701e05f3e6965498e2697c7d1e30e (commit)
      from  027dcbfb5516672fd09ca09a3cc2c9182ac1528a (commit)


- Log -----------------------------------------------------------------
commit e17a712e763701e05f3e6965498e2697c7d1e30e
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Aug 12 11:46:23 2019 +0200

    Configurations/unit-Makefile.tmpl: Don't clean away dotted files
    
    A local 'make clean' did some sweeping removals of files execpt for
    the .git directory.  This is a little too sweeping, as other dotted
    files might be cleaned away if they happen to match the pattern that's
    searched for.
    
    An example is a symlink .dir-locals.el that would keep disappearing if
    you build in the source tree and do a make clean...
    
    So we change this to leave all dotted files alone.  Our builds do not
    produce such files anyway, so this is a harmless (or rather, less
    harmful) change.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9573)
    
    (cherry picked from commit 853094dbe15a49b334f3488fc99a557abf021c09)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 4b923fd890..7db7578a4b 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -516,13 +516,13 @@ libclean:
 clean: libclean
 	$(RM) $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
 	$(RM) $(GENERATED_MANDATORY) $(GENERATED)
-	-$(RM) `find . -name .git -prune -o -name '*{- $depext -}' -print`
-	-$(RM) `find . -name .git -prune -o -name '*{- $objext -}' -print`
+	-$(RM) `find . -name '*{- $depext -}' \! -name '.*' -print`
+	-$(RM) `find . -name '*{- $objext -}' \! -name '.*' -print`
 	$(RM) core
 	$(RM) tags TAGS doc-nits
 	$(RM) -r test/test-runs
 	$(RM) openssl.pc libcrypto.pc libssl.pc
-	-$(RM) `find . -name .git -prune -o -type l -print`
+	-$(RM) `find . -type l \! -name '.*' -print`
 	$(RM) $(TARFILE)
 
 distclean: clean


More information about the openssl-commits mailing list