Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -29,6 +29,7 @@ stdenv.mkDerivation {
     ./symlinks-in-bin.patch
     ./git-sh-i18n.patch
     ./ssh-path.patch
+    ./ssl-cert-file.patch
   ];
 
   postPatch = ''
@@ -113,12 +114,12 @@ stdenv.mkDerivation {
 
       ''# wrap git-svn
         gitperllib=$out/lib/perl5/site_perl
-        for i in ${builtins.toString perlLibs} ${svn}; do
+        for i in ${builtins.toString perlLibs} ${svn.out}; do
           gitperllib=$gitperllib:$i/lib/perl5/site_perl
         done
         wrapProgram $out/libexec/git-core/git-svn     \
                      --set GITPERLLIB "$gitperllib"   \
-                     --prefix PATH : "${svn}/bin" ''
+                     --prefix PATH : "${svn.out}/bin" ''
        else '' # replace git-svn by notification script
         notSupported $out/libexec/git-core/git-svn
        '')

pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch

@@ -0,0 +1,11 @@
+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 @@
+ #if LIBCURL_VERSION_NUM >= 0x070908
+ 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
+ #endif
++	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");