summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2009-01-06 17:12:57 -0600
committerArwed von Merkatz2009-01-13 19:57:32 +0100
commit4e3b12447cf49174aa0bfcb98d8252174a0aae7c (patch)
treef0528043d1b771b6d975a2e964ee1d9b959766d0
parent8bcfc7fff413e5885af21ee43d1c4ed770500a0e (diff)
openssh: Removed depends xauth. It isn't needed unless
xorg-server is selcted and comes with that. Bug #15010 (cherry picked from commit c10c2bc1ed74d53f9a0a137ae113efed7b71afd2)
-rwxr-xr-xcrypto/openssh/DEPENDS3
-rw-r--r--crypto/openssh/HISTORY3
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 0b084ba17e..3f40199a58 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,7 +3,6 @@ depends gnupg &&
depends openssl &&
depends smgl-fhs &&
depends zlib &&
-depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"
optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
@@ -21,6 +20,6 @@ optional_depends "krb5" \
"to enable Kerberos 5 support" &&
optional_depends "X11-SERVER" \
- "" \
+ "--with-xauth="${INSTALL_ROOT}/usr/bin/xauth"" \
"" \
"X server auth (needed by X11Forwarding)"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 286bd88283..17d6694de1 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2009-01-06 George Sherwood <gsherwood@sourcemage.org>
+ * DEPENDS: Removed depends xauth. Bug #15010
+
2008-11-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: remove check_if_xorg_modular* reference #14708