diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-19 08:39:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-19 08:39:02 +0000 |
| commit | fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7 (patch) | |
| tree | 89ad8dc5bd0ec8e8849c3d9b44ae0c45c8a43a8c /pkgs/development/libraries/kerberos | |
| parent | ee182f843f94145bc2bf957c7202d41234e6538a (diff) | |
| download | nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar.gz nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar.bz2 nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar.lz nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar.xz nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.tar.zst nixlib-fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7.zip | |
* Remove MD2 support from Heimdal because OpenSSL 1.0.0 no longer has
it. See also http://repo.or.cz/w/heimdal.git/commitdiff/2a842e90d3417b667de0c5ecea7afa97496bdb4b svn path=/nixpkgs/branches/x-updates/; revision=22657
Diffstat (limited to 'pkgs/development/libraries/kerberos')
| -rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/kerberos/no-md2.patch | 46 |
2 files changed, 51 insertions, 3 deletions
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 6cdd10166906..27890bd01e84 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} : +{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }: stdenv.mkDerivation rec { - name = "heimdal-1.3.2"; + name = "heimdal-1.3.3"; src = fetchurl { urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; - sha256 = "0qwcq79nffsv9iyz4cf854l85i3x1cq79rxb34prpmjbfvs3ynwn"; + sha256 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc"; }; + patches = [ ./no-md2.patch ]; + ## ugly, X should be made an option configureFlags = "--with-openldap=${openldap} --without-x"; diff --git a/pkgs/development/libraries/kerberos/no-md2.patch b/pkgs/development/libraries/kerberos/no-md2.patch new file mode 100644 index 000000000000..c13671c988e3 --- /dev/null +++ b/pkgs/development/libraries/kerberos/no-md2.patch @@ -0,0 +1,46 @@ +http://old.nabble.com/-patch--fix-build-with-openssl-1.0-td28388913.html + +diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h +--- heimdal-1.3.2/include/crypto-headers.h 2010-03-22 05:11:24.000000000 +0100 ++++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h 2010-04-28 14:54:53.000000000 +0200 +@@ -13,7 +13,9 @@ + #include <openssl/des.h> + #include <openssl/rc4.h> + #include <openssl/rc2.h> ++#ifdef HAVE_OPENSSL_MD2_H + #include <openssl/md2.h> ++#endif + #include <openssl/md4.h> + #include <openssl/md5.h> + #include <openssl/sha.h> +diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c +--- heimdal-1.3.2/lib/hx509/crypto.c 2010-03-22 05:11:24.000000000 +0100 ++++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c 2010-04-28 15:12:20.000000000 +0200 +@@ -1354,6 +1354,7 @@ + NULL + }; + ++#ifdef HAVE_OPENSSL_MD2_H + static const struct signature_alg md2_alg = { + "rsa-md2", + &asn1_oid_id_rsa_digest_md2, +@@ -1366,6 +1367,7 @@ + evp_md_verify_signature, + NULL + }; ++#endif + + /* + * Order matter in this structure, "best" first for each "key +@@ -1387,7 +1389,9 @@ + &sha256_alg, + &sha1_alg, + &md5_alg, ++#ifdef HAVE_OPENSSL_MD2_H + &md2_alg, ++#endif + NULL + }; + + + |