diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-12-18 22:14:31 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-12-18 22:14:31 +0000 |
| commit | 272e44da1cb56b1c11f1c30953e8c7647f77f204 (patch) | |
| tree | 5302f1b4587af0891b35b08e9bd40ce04c2558b4 /pkgs/tools/security | |
| parent | 784605f8de509918b19905788e856b55ed88cb84 (diff) | |
| download | nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar.gz nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar.bz2 nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar.lz nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar.xz nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.tar.zst nixpkgs-272e44da1cb56b1c11f1c30953e8c7647f77f204.zip | |
* GnuPG updated to 1.4.2. Added support to optionally build it with
IDEA support (requires a license). svn path=/nixpkgs/trunk/; revision=4399
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/builder.sh | 7 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 18 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/builder.sh b/pkgs/tools/security/gnupg/builder.sh index 0b61d421abc..c5545c7456c 100644 --- a/pkgs/tools/security/gnupg/builder.sh +++ b/pkgs/tools/security/gnupg/builder.sh @@ -1,3 +1,10 @@ source $stdenv/setup +preConfigure=preConfigure +preConfigure() { + if test -n "$idea"; then + gunzip < $idea > ./cipher/idea.c + fi +} + genericBuild diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 135eab15391..78da80bda30 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -1,10 +1,20 @@ -{ stdenv, fetchurl }: +{ + # Support for the IDEA cipher (used by the old PGP) should only be + # enabled if it is legal for you to do so. + ideaSupport ? false + +, stdenv, fetchurl +}: stdenv.mkDerivation { - name = "gnupg-1.4.0"; + name = "gnupg-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz; - md5 = "74e407a8dcb09866555f79ae797555da"; + url = ftp://ftp.surfnet.nl/pub/security/gnupg/gnupg/gnupg-1.4.2.tar.bz2; + md5 = "c7afd50c7d01fcfada229326b3958404"; }; + idea = if ideaSupport then fetchurl { + url = ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz; + md5 = "9dc3bc086824a8c7a331f35e09a3e57f"; + } else null; } |