ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

* Remove MD2 support from Heimdal because OpenSSL 1.0.0 no longer has

Browse Source 
it.  See also
  2a842e90d3

svn path=/nixpkgs/branches/x-updates/; revision=22657
This commit is contained in:
Eelco Dolstra 2010-07-19 08:39:02 +00:00
parent ee182f843f
commit fbf2ed6067
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/kerberos/heimdal.nix
View File

@ -1,16 +1,18 @@
{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} : { stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "heimdal-1.3.2"; name = "heimdal-1.3.3";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"http://www.h5l.org/dist/src/${name}.tar.gz" "http://www.h5l.org/dist/src/${name}.tar.gz"
"http://ftp.pdc.kth.se/pub/heimdal/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 ## ugly, X should be made an option
configureFlags = "--with-openldap=${openldap} --without-x"; configureFlags = "--with-openldap=${openldap} --without-x";

46
pkgs/development/libraries/kerberos/no-md2.patch Normal file
View File

@ -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
};