summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/PLIST.pam3
-rw-r--r--security/openssh/options.mk10
3 files changed, 5 insertions, 12 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 8aa7b4c4431..f79f2751383 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.204 2011/08/18 09:22:01 taca Exp $
+# $NetBSD: Makefile,v 1.205 2012/01/09 05:25:36 manu Exp $
DISTNAME= openssh-5.8p2
PKGNAME= openssh-5.8.2
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/PLIST.pam b/security/openssh/PLIST.pam
index 7c01bc07488..0cf58859226 100644
--- a/security/openssh/PLIST.pam
+++ b/security/openssh/PLIST.pam
@@ -1,2 +1 @@
-@comment $NetBSD: PLIST.pam,v 1.1 2002/02/05 04:17:32 jlam Exp $
-share/examples/openssh/sshd.pam
+@comment $NetBSD: PLIST.pam,v 1.2 2012/01/09 05:25:36 manu Exp $
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index ef74db76b0f..057e23a15a0 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,13 +1,9 @@
-# $NetBSD: options.mk,v 1.21 2011/09/01 19:24:01 shattered Exp $
+# $NetBSD: options.mk,v 1.22 2012/01/09 05:25:36 manu Exp $
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.openssh
-PKG_SUPPORTED_OPTIONS= kerberos hpn-patch
-
-.if !empty(OPSYS:MLinux)
-PKG_SUPPORTED_OPTIONS+= pam
-.endif
+PKG_SUPPORTED_OPTIONS= kerberos hpn-patch pam
.include "../../mk/bsd.options.mk"
@@ -26,8 +22,6 @@ PATCH_DIST_STRIP= -p1
.endif
.if !empty(PKG_OPTIONS:Mpam)
-# XXX: PAM authentication causes memory faults, and haven't tracked down
-# XXX: why yet. For the moment, disable PAM authentication for non-Linux.
.include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
PLIST_SRC+= ${.CURDIR}/PLIST.pam