[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dbb1dc1e97cc583d29b4a58667a4d8ce474f03b5 (commit)
      from  5768804d5ac543b2c899bcbb96cb6f571cef9eaa (commit)


- Log -----------------------------------------------------------------
commit dbb1dc1e97cc583d29b4a58667a4d8ce474f03b5
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Oct 19 13:35:16 2019 -0400

    Add/remove things from .gitignore
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10220)

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

Summary of changes:
 .gitignore | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50f461533e..f035ab1975 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /.dir-locals.el
 
 # Top level excludes
-/Makefile.orig
+/Makefile
 /MINFO
 /TABLE
 /*.pc
@@ -13,11 +13,6 @@
 /tmp.*
 /configdata.pm
 
-# *all* Makefiles
-Makefile
-# ... except in demos
-!/demos/*/Makefile
-
 # Links under apps
 /apps/CA.pl
 /apps/tsget
@@ -27,8 +22,8 @@ Makefile
 # Auto generated headers
 /crypto/buildinf.h
 /include/crypto/*_conf.h
-/openssl/include/opensslconf.h
-/util/domd
+/include/openssl/opensslconf.h
+/include/openssl/opensslv.h
 
 # error code files
 /crypto/err/openssl.txt.old
@@ -80,7 +75,6 @@ Makefile
 
 # Misc auto generated files
 /doc/man7/openssl_user_macros.pod
-/include/openssl/opensslconf.h
 /tools/c_rehash
 /tools/c_rehash.pl
 /util/shlib_wrap.sh