public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* openssh updated to 5.3p1. Also enabled the HPN patch by default.

Browse Source 
svn path=/nixpkgs/trunk/; revision=19752
This commit is contained in:
Eelco Dolstra 2010-02-01 16:56:10 +00:00
parent f278489e98
commit 947e2c71ad
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pkgs/tools/networking/openssh/default.nix
View File

@ -6,47 +6,58 @@
assert pamSupport -> pam != null; assert pamSupport -> pam != null;
stdenv.mkDerivation (rec { let
name = "openssh-5.2p1";
hpnSrc = fetchurl {
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.3p1-hpn13v7.diff.gz;
sha256 = "1kqir6v14z77l0wn9j4jzdqsip5s1ky34w749psvbshbp9dzizn8";
};
in
stdenv.mkDerivation rec {
name = "openssh-5.3p1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz";
sha256 = "1bpc6i07hlakb9vrxr8zb1yxnc9avsv7kjwrcagdgcyh6w6728s0"; sha256 = "04pgqmb43p5lr5wrfnvyys8r504brghshm24n60495wn5131gjfh";
}; };
buildInputs = [zlib openssl perl patchPhase = stdenv.lib.optionalString hpnSupport
(if pamSupport then pam else null) ''
]; gunzip -c ${hpnSrc} | patch -p1
'';
buildInputs =
[ zlib openssl perl ]
++ stdenv.lib.optional pamSupport pam;
configureFlags = " configureFlags =
--with-mantype=man ''
${if pamSupport then "--with-pam" else "--without-pam"} --with-mantype=man
${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ${if pamSupport then "--with-pam" else "--without-pam"}
"; ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
'';
preConfigure = " preConfigure =
configureFlags=\"$configureFlags --with-privsep-path=$out/empty\" ''
ensureDir $out/empty configureFlags="$configureFlags --with-privsep-path=$out/empty"
"; ensureDir $out/empty
'';
postInstall = " postInstall =
# Install ssh-copy-id, it's very useful. ''
cp contrib/ssh-copy-id $out/bin/ # Install ssh-copy-id, it's very useful.
chmod +x $out/bin/ssh-copy-id cp contrib/ssh-copy-id $out/bin/
cp contrib/ssh-copy-id.1 $out/share/man/man1/ chmod +x $out/bin/ssh-copy-id
"; cp contrib/ssh-copy-id.1 $out/share/man/man1/
'';
installTargets = "install-nosysconf"; 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 = '' meta = {
gunzip -c ${hpnSrc} | patch -p1 homepage = http://www.openssh.org/;
''; description = "An implementation of the SSH protocol";
license = "bsd";
};
} }
else {}))

4
pkgs/top-level/all-packages.nix
View File

@ -1210,8 +1210,8 @@ let
openssh = import ../tools/networking/openssh { openssh = import ../tools/networking/openssh {
inherit fetchurl stdenv zlib openssl pam perl; inherit fetchurl stdenv zlib openssl pam perl;
pamSupport = getPkgConfig "openssh" "pam" true; pamSupport = getPkgConfig "openssh" "pam" true;
hpnSupport = getConfig [ "openssh" "hpn" ] false; hpnSupport = getPkgConfig "openssh" "hpn" true;
etcDir = getConfig [ "openssh" "etcDir" ] "/etc/ssh"; etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh";
}; };
opensp = import ../tools/text/sgml/opensp { opensp = import ../tools/text/sgml/opensp {