diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-01 16:56:10 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-01 16:56:10 +0000 |
commit | 947e2c71ad31e8e94c8b51963e26229ff2a2e981 (patch) | |
tree | abaa37b3eb0422a9c9c0ed3aa577b56e15b00875 /pkgs/tools/networking/openssh/default.nix | |
parent | f278489e980c1a16336974dfd4babfd94c351e9a (diff) | |
download | nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar.gz nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar.bz2 nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar.lz nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar.xz nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.tar.zst nixpkgs-947e2c71ad31e8e94c8b51963e26229ff2a2e981.zip |
* openssh updated to 5.3p1. Also enabled the HPN patch by default.
svn path=/nixpkgs/trunk/; revision=19752
Diffstat (limited to 'pkgs/tools/networking/openssh/default.nix')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8a1d4666342..81ff6803806 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,47 +6,58 @@ assert pamSupport -> pam != null; -stdenv.mkDerivation (rec { - name = "openssh-5.2p1"; +let - src = fetchurl { - url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; - sha256 = "1bpc6i07hlakb9vrxr8zb1yxnc9avsv7kjwrcagdgcyh6w6728s0"; + hpnSrc = fetchurl { + url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.3p1-hpn13v7.diff.gz; + sha256 = "1kqir6v14z77l0wn9j4jzdqsip5s1ky34w749psvbshbp9dzizn8"; }; - buildInputs = [zlib openssl perl - (if pamSupport then pam else null) - ]; +in - configureFlags = " - --with-mantype=man - ${if pamSupport then "--with-pam" else "--without-pam"} - ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} - "; +stdenv.mkDerivation rec { + name = "openssh-5.3p1"; - preConfigure = " - configureFlags=\"$configureFlags --with-privsep-path=$out/empty\" - ensureDir $out/empty - "; + src = fetchurl { + url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; + sha256 = "04pgqmb43p5lr5wrfnvyys8r504brghshm24n60495wn5131gjfh"; + }; - postInstall = " - # Install ssh-copy-id, it's very useful. - cp contrib/ssh-copy-id $out/bin/ - chmod +x $out/bin/ssh-copy-id - cp contrib/ssh-copy-id.1 $out/share/man/man1/ - "; + patchPhase = stdenv.lib.optionalString hpnSupport + '' + gunzip -c ${hpnSrc} | patch -p1 + ''; + + buildInputs = + [ zlib openssl perl ] + ++ stdenv.lib.optional pamSupport pam; + + configureFlags = + '' + --with-mantype=man + ${if pamSupport then "--with-pam" else "--without-pam"} + ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} + ''; + + preConfigure = + '' + configureFlags="$configureFlags --with-privsep-path=$out/empty" + ensureDir $out/empty + ''; + + postInstall = + '' + # Install ssh-copy-id, it's very useful. + cp contrib/ssh-copy-id $out/bin/ + chmod +x $out/bin/ssh-copy-id + cp contrib/ssh-copy-id.1 $out/share/man/man1/ + ''; installTargets = "install-nosysconf"; -} // -(if hpnSupport then -rec { - hpnSrc = fetchurl { - url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz; - sha256 = "1g91xl1vfg772072qcbcfzyqj7yfvm38xgk8zyy8wsl2g81rb8wh"; - }; - - patchPhase = '' - gunzip -c ${hpnSrc} | patch -p1 - ''; + + meta = { + homepage = http://www.openssh.org/; + description = "An implementation of the SSH protocol"; + license = "bsd"; + }; } -else {})) |