diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
3 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch deleted file mode 100644 index 7d5dca9abfeb..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.perl ---- git-1.9.2-orig/git-send-email.perl 2014-04-09 21:09:34.000000000 +0200 -+++ git-1.9.2/git-send-email.perl 2014-04-16 18:35:05.861132282 +0200 -@@ -1094,6 +1094,8 @@ - return; - } - -+ $smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'}; -+ - if (!defined $smtp_ssl_cert_path) { - # use the OpenSSL defaults - return (SSL_verify_mode => SSL_VERIFY_PEER()); diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 49ecce0456b2..f8223a7de396 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch - ./cert-path.patch - ./ssl-cert-file.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch deleted file mode 100644 index dd216b7bf6f8..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -This patch adds support for the OpenSSL SSL_CERT_FILE environment variable. -GIT_SSL_CAINFO still takes precedence. - ---- git-orig/http.c.orig 2014-11-25 23:27:56.000000000 +0100 -+++ git-orig/http.c 2014-11-25 23:28:48.000000000 +0100 -@@ -433,6 +433,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"); |