diff options
| author | jlam <jlam> | 2000-08-11 05:19:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-08-11 05:19:42 +0000 |
| commit | a96069ab6780f0ec523595938aecf63dd2b8d09d (patch) | |
| tree | 422c498a6ec54abf6bb25b149ed530ef05388c6f /security | |
| parent | 7a2ce59e7c28f576c344dbec6af181a71ad224fb (diff) | |
| download | pkgsrc-a96069ab6780f0ec523595938aecf63dd2b8d09d.tar.gz | |
Set location of ssh-askpass to be ${X11PREFIX}/bin/ssh-askpass.
Closes PR#10774.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh/files/patch-sum | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ah | 13 |
3 files changed, 20 insertions, 5 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 60dd80266e5..ae82c446e21 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2000/08/09 17:47:31 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2000/08/11 05:19:42 jlam Exp $ # DISTNAME= openssh-2.1.1p4 @@ -67,6 +67,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${SSH_CONF_DIR} CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} +# The ssh-askpass program (security/ssh-askpass) is in ${X11BASE}/bin or +# ${LOCALBASE}/bin depending on if xpkgwedge is installed. Do the safe thing +# and assume it's in ${X11PREFIX}/bin. +# +MAKE_ENV+= ASKPASS_LOCATION=${X11PREFIX}/bin + pre-configure: cd ${WRKSRC} && autoreconf diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum index 97de850956c..7dbb44d9f41 100644 --- a/security/openssh/files/patch-sum +++ b/security/openssh/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.15 2000/07/22 08:22:02 jlam Exp $ +$NetBSD: patch-sum,v 1.16 2000/08/11 05:19:44 jlam Exp $ MD5 (patch-ae) = 62afcf06805bd3ae1337e4f9cf15fd93 -MD5 (patch-ah) = a3e7f9f636cf562a9312b45928ffe62d +MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344 MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329 MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609 diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index d939b58de0d..8e23dc53de9 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.7 2000/07/22 08:22:03 jlam Exp $ +$NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $ --- Makefile.in.orig Tue Jul 11 07:34:34 2000 -+++ Makefile.in Fri Jul 21 01:30:17 2000 ++++ Makefile.in Fri Aug 11 01:10:25 2000 @@ -6,6 +6,7 @@ mandir=@mandir@ mansubdir=@mansubdir@ @@ -10,6 +10,15 @@ $NetBSD: patch-ah,v 1.7 2000/07/22 08:22:03 jlam Exp $ piddir=@piddir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ +@@ -15,7 +16,7 @@ + VPATH=@srcdir@ + + SSH_PROGRAM=@bindir@/ssh +-ASKPASS_LOCATION=@libexecdir@/ssh ++#ASKPASS_LOCATION=@libexecdir@/ssh + ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass + + CC=@CC@ @@ -115,7 +116,7 @@ distprep: catman-do autoreconf |