Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f2e54ee6d2dee4896a672e7190882a2bd0163da4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f2e54ee6d2dee4896a672e7190882a2bd0163da4)
  • Date: Fri, 13 Jun 2008 04:10:50 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

crypto/openssh/DEPENDS | 17 +++++++++++------
crypto/openssh/HISTORY | 3 +++
2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit f2e54ee6d2dee4896a672e7190882a2bd0163da4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openssh: xauth is only available in xorg-modular #14532

diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index eeafc7b..6f8d43d 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 df5d5c5..aaa06b6 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2008-06-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: xauth is only available in xorg-modular #14532
+
2008-04-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0p1, SECURITY_PATCH=3, CVE-2008-1483
http://www.openssh.org/txt/release-5.0



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f2e54ee6d2dee4896a672e7190882a2bd0163da4), Jaka Kranjc, 06/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page