git, openssl, curl: Respect $NIX_SSL_CERT_FILE

Slightly modified version of 942dbf89c6
2017-03-20 14:11:20 +01:00
parent 72dc9c7f80
commit c3c9412c7d
5 changed files with 35 additions and 3 deletions
@@ -1,11 +1,14 @@
 diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c
 --- git-2.7.4-orig/http.c	2016-03-17 21:47:59.000000000 +0100
 +++ git-2.7.4/http.c	2016-04-12 11:38:33.187070848 +0200
-@@ -544,6 +544,7 @@
+@@ -544,6 +544,10 @@
 #if LIBCURL_VERSION_NUM >= 0x070908
 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
 #endif
-+	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
+	if (getenv("NIX_SSL_CERT_FILE"))
+	  set_from_env(&ssl_cainfo, "NIX_SSL_CERT_FILE");
+	else
+	  set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
 
 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");