* gnupg updated to 1.4.10. Also, build with bzip2 support. Duplicity
can use this to better compress backups. svn path=/nixpkgs/trunk/; revision=19915
This commit is contained in:
parent
62e31307ec
commit
81fabfeb04
|
@ -1,9 +0,0 @@
|
||||||
source $stdenv/setup
|
|
||||||
|
|
||||||
preConfigure() {
|
|
||||||
if test -n "$idea"; then
|
|
||||||
gunzip < $idea > ./cipher/idea.c
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
genericBuild
|
|
|
@ -1,25 +1,33 @@
|
||||||
{
|
{ # Support for the IDEA cipher (used by the old PGP) should only be
|
||||||
# Support for the IDEA cipher (used by the old PGP) should only be
|
|
||||||
# enabled if it is legal for you to do so.
|
# enabled if it is legal for you to do so.
|
||||||
ideaSupport ? false
|
ideaSupport ? false
|
||||||
|
|
||||||
, stdenv, fetchurl, readline
|
, stdenv, fetchurl, readline, bzip2
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
idea = fetchurl {
|
||||||
|
url = http://nixos.org/tarballs/idea.c.gz;
|
||||||
|
md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnupg-1.4.9";
|
name = "gnupg-1.4.10";
|
||||||
builder = ./builder.sh;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
|
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
|
||||||
sha256 = "1p86mdgij3llnkx8dvvjl19abgq86gdn6m4r6bc4xvgfjg6sp99w";
|
sha256 = "0f5v8c8fkxcnrlmnijaq2sqfqq6xhmbyi2p44pj98y6n6927z452";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [readline];
|
buildInputs = [ readline bzip2 ];
|
||||||
idea = if ideaSupport then fetchurl {
|
|
||||||
url = http://nixos.org/tarballs/idea.c.gz;
|
preConfigure = stdenv.lib.optionalString ideaSupport
|
||||||
md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
|
''
|
||||||
} else null;
|
gunzip < ${idea} > ./cipher/idea.c
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A free implementation of the OpenPGP standard for encrypting and signing data";
|
description = "A free implementation of the OpenPGP standard for encrypting and signing data";
|
||||||
|
|
|
@ -786,7 +786,7 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
gnupg = import ../tools/security/gnupg {
|
gnupg = import ../tools/security/gnupg {
|
||||||
inherit fetchurl stdenv readline;
|
inherit fetchurl stdenv readline bzip2;
|
||||||
ideaSupport = getPkgConfig "gnupg" "idea" false; # enable for IDEA crypto support
|
ideaSupport = getPkgConfig "gnupg" "idea" false; # enable for IDEA crypto support
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue