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

* Remove the xauth dependency in openssh. We can set the xauth path

Browse Source 
in sshd_config.

svn path=/nixpkgs/trunk/; revision=7547
This commit is contained in:
Eelco Dolstra 2007-01-07 10:18:34 +00:00
parent 44cefeb142
commit 35a9f7ecb6
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,12 @@
{ stdenv, fetchurl, zlib, openssl, perl { stdenv, fetchurl, zlib, openssl, perl
, pamSupport ? false, pam ? null , pamSupport ? false, pam ? null
, xforwarding ? false, xauth ? null
}: }:
assert pamSupport -> pam != null; assert pamSupport -> pam != null;
assert xforwarding -> xauth != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openssh-4.5p1"; name = "openssh-4.5p1";
#builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://sunsite.cnlab-switch.ch/pub/OpenBSD/OpenSSH/portable/openssh-4.5p1.tar.gz; url = ftp://sunsite.cnlab-switch.ch/pub/OpenBSD/OpenSSH/portable/openssh-4.5p1.tar.gz;
md5 = "6468c339886f78e8a149b88f695839dd"; md5 = "6468c339886f78e8a149b88f695839dd";
@ -17,11 +14,9 @@ stdenv.mkDerivation {
buildInputs = [zlib openssl perl buildInputs = [zlib openssl perl
(if pamSupport then pam else null) (if pamSupport then pam else null)
(if xforwarding then xauth else null)
]; ];
configureFlags = " configureFlags = "
${if xforwarding then "--with-xauth=${xauth}/bin/xauth" else ""}
${if pamSupport then "--with-pam" else ""} ${if pamSupport then "--with-pam" else ""}
"; ";

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

@ -435,9 +435,7 @@ rec {
openssh = import ../tools/networking/openssh { openssh = import ../tools/networking/openssh {
inherit fetchurl stdenv zlib openssl pam perl; inherit fetchurl stdenv zlib openssl pam perl;
inherit (xlibs) xauth;
pamSupport = true; pamSupport = true;
xforwarding = true;
}; };
par2cmdline = import ../tools/networking/par2cmdline { par2cmdline = import ../tools/networking/par2cmdline {