diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-16 18:43:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-16 18:43:39 +0200 |
| commit | a1af25033a248fc75fcff4ac7441676a61cde8a0 (patch) | |
| tree | 3a5c4b17b80e153efcc44450cf5cae73541bda94 /pkgs | |
| parent | 5e16621afcaffe833aa285e10b1d4b6a36e99631 (diff) | |
| download | nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar.gz nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar.bz2 nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar.lz nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar.xz nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.tar.zst nixlib-a1af25033a248fc75fcff4ac7441676a61cde8a0.zip | |
git send-email: Respect $OPENSSL_X509_CERT_FILE
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/cert-path.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 2 |
2 files changed, 13 insertions, 1 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 new file mode 100644 index 000000000000..846752f5bfe3 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch @@ -0,0 +1,12 @@ +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{'OPENSSL_X509_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 a7be9b5798ae..861030bae994 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13"; }; - patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; + patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x |