[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f631f2ecea6051af489a7fd3a9a62582b80824e3 (commit)
      from  c5f9317fb51225fcaee41790841cfa388e9ec0e8 (commit)


- Log -----------------------------------------------------------------
commit f631f2ecea6051af489a7fd3a9a62582b80824e3
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 22 13:06:26 2016 +0100

    Cleanup .gitignore
    
    Some things to ignore need to be properly rooted, and use a bit more
    precision on ignoring 'lib', as that maybe be a perfectly valid
    directory name to add into git elsewhere in the source tree.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 .gitignore | 72 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0772abe..281905b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,17 +75,19 @@
 !/crypto/des/times/486-50.sol
 
 # Misc auto generated files
-include/openssl/opensslconf.h
+/include/openssl/opensslconf.h
 /tools/c_rehash
-lib
+/crypto/**/lib
+/engines/**/lib
+/ssl/**/lib
 Makefile.save
 *.bak
-tags
-TAGS
+/tags
+/TAGS
 cscope.out
 *.d
-crypto.map
-ssl.map
+/crypto.map
+/ssl.map
 
 # Windows
 /tmp32
@@ -98,35 +100,35 @@ ssl.map
 /out32dll.dbg
 /inc32
 /MINFO
-ms/bcb.mak
-ms/libeay32.def
-ms/nt.mak
-ms/ntdll.mak
-ms/ssleay32.def
-ms/version32.rc
+/ms/bcb.mak
+/ms/libeay32.def
+/ms/nt.mak
+/ms/ntdll.mak
+/ms/ssleay32.def
+/ms/version32.rc
 
 # Files created on other branches that are not held in git, and are not
 # needed on this branch
-include/openssl/asn1_mac.h
-include/openssl/des_old.h
-include/openssl/fips.h
-include/openssl/fips_rand.h
-include/openssl/krb5_asn.h
-include/openssl/kssl.h
-include/openssl/pq_compat.h
-include/openssl/ssl23.h
-include/openssl/tmdiff.h
-include/openssl/ui_compat.h
-test/fips_aesavs.c
-test/fips_desmovs.c
-test/fips_dsatest.c
-test/fips_dssvs.c
-test/fips_hmactest.c
-test/fips_randtest.c
-test/fips_rngvs.c
-test/fips_rsagtest.c
-test/fips_rsastest.c
-test/fips_rsavtest.c
-test/fips_shatest.c
-test/fips_test_suite.c
-test/shatest.c
+/include/openssl/asn1_mac.h
+/include/openssl/des_old.h
+/include/openssl/fips.h
+/include/openssl/fips_rand.h
+/include/openssl/krb5_asn.h
+/include/openssl/kssl.h
+/include/openssl/pq_compat.h
+/include/openssl/ssl23.h
+/include/openssl/tmdiff.h
+/include/openssl/ui_compat.h
+/test/fips_aesavs.c
+/test/fips_desmovs.c
+/test/fips_dsatest.c
+/test/fips_dssvs.c
+/test/fips_hmactest.c
+/test/fips_randtest.c
+/test/fips_rngvs.c
+/test/fips_rsagtest.c
+/test/fips_rsastest.c
+/test/fips_rsavtest.c
+/test/fips_shatest.c
+/test/fips_test_suite.c
+/test/shatest.c