diff options
| author | jlam <jlam> | 2004-04-28 04:00:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-04-28 04:00:17 +0000 |
| commit | c0f98ece19c918e50aee7da00d5a89a95bde15b9 (patch) | |
| tree | 4428b8184906b4f340761bda91004c5de6141bcd /security/openssh/Makefile | |
| parent | 57acef372300e8b3b710650d5d60983f1bc63fb8 (diff) | |
| download | pkgsrc-c0f98ece19c918e50aee7da00d5a89a95bde15b9.tar.gz | |
Fix up OpenSSH sources to allow building with S/Key support on NetBSD as
well. Bump the PKGREVISION.
XXX The right fix is to create a autoconf check for the number of args
XXX that skeychallenge takes and do the right thing accordingly.
Diffstat (limited to 'security/openssh/Makefile')
| -rw-r--r-- | security/openssh/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index f1540987e03..d1e87aff4ed 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.132 2004/04/28 03:54:08 jlam Exp $ +# $NetBSD: Makefile,v 1.133 2004/04/28 04:00:17 jlam Exp $ DISTNAME= openssh-3.8p1 PKGNAME= openssh-3.8.1 -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ @@ -74,15 +74,16 @@ CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} # CONFIGURE_ENV+= LD=${CC:Q} -# s/key support, enabled on Darwin and Solaris. NetBSD s/key has 4 args -# (4: sslen) to skeychallenge instead of 3, so disable s/key support. -# -.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" +# Enable S/Key support on NetBSD, Darwin, and Solaris. +.if (${OPSYS} == "NetBSD") || (${OPSYS} == "Darwin") || (${OPSYS} == "SunOS") . include "../../security/skey/buildlink3.mk" CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey} -.elif ${OPSYS} == "NetBSD" -#CONFIGURE_ARGS+= --with-skey=/usr -CONFIGURE_ARGS+= --without-skey +# +# NetBSD's skeychallenge() takes 4 args (int: sslen) instead of 3. +# +. if ${OPSYS} == "NetBSD" +CPPFLAGS+= -DSKEYCHALLENGE=SKEYCHALLENGE4 +. endif .else CONFIGURE_ARGS+= --without-skey .endif |