public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: Compile in /etc/ssl/certs/ca-certificates.crt

This commit is contained in:
Eelco Dolstra 2016-02-03 13:45:05 +01:00
parent 9f358f809d
commit 788da6894f
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/openssl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl { stdenv, fetchurl, perl
, withCryptodev ? false, cryptodevHeaders , withCryptodev ? false, cryptodevHeaders
, defaultCertificate ? "/etc/ssl/certs/ca-certificates.crt" }: }:
with stdenv.lib; with stdenv.lib;
let let
@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch patches =
[ ./use-etc-ssl-certs.patch ]
++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch; ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -60,8 +62,7 @@ stdenv.mkDerivation rec {
# remove dependency on Perl at runtime # remove dependency on Perl at runtime
rm -r $out/etc/ssl/misc $out/bin/c_rehash rm -r $out/etc/ssl/misc $out/bin/c_rehash
# configure the default trust store rmdir $out/etc/ssl/certs
${optionalString (defaultCertificate != null) "ln -s ${defaultCertificate} $out/etc/ssl/cert.pem"}
''; '';
postFixup = '' postFixup = ''
@ -72,6 +73,11 @@ stdenv.mkDerivation rec {
fi fi
''; '';
setupHook = builtins.toFile "openssl-setup-hook"
''
export SSL_CERT_FILE=/no-cert-file.crt
'';
crossAttrs = { crossAttrs = {
# upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558 # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
postPatch = '' postPatch = ''

13
pkgs/development/libraries/openssl/use-etc-ssl-certs.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
--- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100
+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100
@@ -81,8 +81,8 @@
# ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR
# define X509_CERT_DIR OPENSSLDIR "/certs"
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
# else
# define X509_CERT_AREA "SSLROOT:[000000]"