mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
git send-email: Respect $OPENSSL_X509_CERT_FILE
This commit is contained in:
parent
5e16621afc
commit
a1af25033a
2 changed files with 13 additions and 1 deletions
|
@ -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());
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||||
sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13";
|
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]
|
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
|
||||||
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
||||||
|
|
Loading…
Reference in a new issue