diff options
| author | Jaka Kranjc | 2008-06-13 11:10:16 +0200 |
|---|---|---|
| committer | Arwed von Merkatz | 2008-06-18 19:39:31 +0200 |
| commit | 42f984fc98de694bffcf6764400398482894b6c5 (patch) | |
| tree | 913277f2209b4dd63ea84ea6f4002617f56334fd | |
| parent | 1f349af0c651ca7738557a96fdd80a4180ecf3f5 (diff) | |
openssh: xauth is only available in xorg-modular #14532
(cherry picked from commit f2e54ee6d2dee4896a672e7190882a2bd0163da4)
| -rwxr-xr-x | crypto/openssh/DEPENDS | 17 | ||||
| -rw-r--r-- | crypto/openssh/HISTORY | 3 |
2 files changed, 14 insertions, 6 deletions
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS index eeafc7bcee..6f8d43d5bd 100755 --- a/crypto/openssh/DEPENDS +++ b/crypto/openssh/DEPENDS @@ -4,11 +4,6 @@ depends openssl && depends smgl-fhs && depends zlib && -optional_depends "xauth" \ - "--with-xauth=${INSTALL_ROOT}/usr/bin/xauth" \ - "" \ - "X server auth (needed by X11Forwarding)" && - optional_depends "tcp_wrappers" \ "--with-tcp-wrappers" \ "" \ @@ -22,4 +17,14 @@ optional_depends "linux-pam" \ optional_depends "krb5" \ "--with-kerberos5=/usr" \ "" \ - "to enable Kerberos 5 support" + "to enable Kerberos 5 support" && + +optional_depends "X11-SERVER" \ + "" \ + "" \ + "X server auth (needed by X11Forwarding)" && + +. $GRIMOIRE/FUNCTIONS && +if check_if_xorg_modular_server; then + depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth" +fi diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY index df5d5c59d2..aaa06b65b3 100644 --- a/crypto/openssh/HISTORY +++ b/crypto/openssh/HISTORY @@ -1,3 +1,6 @@ +2008-06-13 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DEPENDS: xauth is only available in xorg-modular #14532 + 2008-04-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 5.0p1, SECURITY_PATCH=3, CVE-2008-1483 http://www.openssh.org/txt/release-5.0 |