heimdal: remove obsolete 1.3.x version
This commit is contained in:
parent
d4ec61c717
commit
c65a3e198c
@ -1,27 +0,0 @@
|
|||||||
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "heimdal-1.5.2";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
urls = [
|
|
||||||
"http://www.h5l.org/dist/src/${name}.tar.gz"
|
|
||||||
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
|
|
||||||
];
|
|
||||||
sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
|
|
||||||
};
|
|
||||||
|
|
||||||
## ugly, X should be made an option
|
|
||||||
configureFlags = [
|
|
||||||
"--with-openldap=${openldap}"
|
|
||||||
"--with-sqlite3=${sqlite}"
|
|
||||||
"--without-x"
|
|
||||||
];
|
|
||||||
# dont succeed with --libexec=$out/sbin, so
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/libexec/* $out/sbin/
|
|
||||||
rmdir $out/libexec
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
|
|
||||||
}
|
|
@ -1,18 +1,16 @@
|
|||||||
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
|
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "heimdal-1.3.3";
|
name = "heimdal-1.5.2";
|
||||||
|
|
||||||
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 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc";
|
sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./no-md2.patch ];
|
|
||||||
|
|
||||||
## ugly, X should be made an option
|
## ugly, X should be made an option
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-openldap=${openldap}"
|
"--with-openldap=${openldap}"
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
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
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -4107,13 +4107,9 @@ let
|
|||||||
gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
|
gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
|
||||||
|
|
||||||
# TODO : Add MIT Kerberos and let admin choose.
|
# TODO : Add MIT Kerberos and let admin choose.
|
||||||
kerberos = heimdal_1_5_2;
|
kerberos = heimdal;
|
||||||
|
|
||||||
heimdal = heimdal_1_5_2;
|
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
|
||||||
|
|
||||||
heimdal_1_3_3 = callPackage ../development/libraries/kerberos/heimdal.nix { };
|
|
||||||
|
|
||||||
heimdal_1_5_2 = callPackage ../development/libraries/kerberos/heimdal-1.5.2.nix { };
|
|
||||||
|
|
||||||
harfbuzz = callPackage ../development/libraries/harfbuzz { };
|
harfbuzz = callPackage ../development/libraries/harfbuzz { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user