summaryrefslogtreecommitdiff
path: root/security/openssh/options.mk
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2014-03-29 09:38:11 +0000
committertaca <taca@pkgsrc.org>2014-03-29 09:38:11 +0000
commitf74b0ead70c3794d704c5e0e6c9a120f325f50bd (patch)
treea5afa1fb380513eccc967371e6294fa46b16ee7d /security/openssh/options.mk
parent4428d29e612e2152e57fd2c85d4799cd6f10feb4 (diff)
downloadpkgsrc-f74b0ead70c3794d704c5e0e6c9a120f325f50bd.tar.gz
Update openssh to 6.6.1 (OpenSSH 6.6p1).
pkgsrc change * Use PLIST_VARS. * Update hpn-patch based on openssh-6.5p1-hpnssh14v4.diff.gz. Fixes security problem (SA57488). For full changes, please refer below release notes. http://www.openssh.com/txt/release-6.5 http://www.openssh.com/txt/release-6.6
Diffstat (limited to 'security/openssh/options.mk')
-rw-r--r--security/openssh/options.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index 794f752d35d..b3cc2b5677e 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2013/12/05 14:37:01 taca Exp $
+# $NetBSD: options.mk,v 1.28 2014/03/29 09:38:11 taca Exp $
.include "../../mk/bsd.prefs.mk"
@@ -16,14 +16,18 @@ CONFIGURE_ENV+= ac_cv_search_k_hasafs=no
.endif
.if !empty(PKG_OPTIONS:Mhpn-patch)
-PATCHFILES= openssh-6.4p1-hpn14v2.diff.gz
+PATCHFILES= openssh-6.6p1-hpnssh14v4.diff.gz
PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/openssh/
+PATCH_DIST_STRIP= -p1
.endif
.if !empty(PKG_OPTIONS:Mpam)
.include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
-PLIST_SRC+= ${.CURDIR}/PLIST.pam
MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam
MESSAGE_SUBST+= EGDIR=${EGDIR}
+PLIST_VARS+= pam
+.if ${OPSYS} == "Linux"
+PLIST.pam= yes
+.endif
.endif