From e58c99eda0fa23f8677cd60a3c9eb867a14a41f8 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 16 Jun 2006 18:43:18 +0000
Subject: Support checking passwords using either Kerberos or PAM via
 PKG_OPTIONS. This fixes the PLIST on systems that have PAM natively.  Bump
 the PKGREVISION to 5.

---
 security/lsh/Makefile   |  8 ++++++--
 security/lsh/PLIST      |  4 +++-
 security/lsh/options.mk | 30 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 security/lsh/options.mk

(limited to 'security')

diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index fa883990e74..12e9ce3f3c5 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/04/05 23:59:33 salo Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/16 18:43:18 jlam Exp $
 #
 
 DISTNAME=		lsh-1.4.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.lysator.liu.se/pub/security/lsh/
 
@@ -13,6 +13,10 @@ COMMENT=		SSH2 client/server (version 1 of lsh)
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
+.include "options.mk"
+
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/liboop/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/lsh/PLIST b/security/lsh/PLIST
index bf394402516..0a8056dbeb4 100644
--- a/security/lsh/PLIST
+++ b/security/lsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/04/30 12:23:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/06/16 18:43:18 jlam Exp $
 bin/lsftp
 bin/lsh
 bin/lsh-authorize
@@ -43,6 +43,8 @@ man/man5/SPKI.5
 man/man5/secsh.5
 man/man8/lshd.8
 sbin/lsh-execuv
+${KERBEROS}sbin/lsh-krb-checkpw
+${PAM}sbin/lsh-pam-checkpw
 sbin/lsh_proxy
 sbin/lshd
 sbin/sftp-server
diff --git a/security/lsh/options.mk b/security/lsh/options.mk
new file mode 100644
index 00000000000..61f27a40d93
--- /dev/null
+++ b/security/lsh/options.mk
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2006/06/16 18:43:18 jlam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lsh
+PKG_SUPPORTED_OPTIONS=	kerberos pam
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Kerberos password-checking support
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-kerberos
+PLIST_SUBST+=		KERBEROS=
+.else
+CONFIGURE_ARGS+=	--disable-kerberos
+PLIST_SUBST+=		KERBEROS="@comment "
+.endif
+
+###
+### PAM password-checking support
+###
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pam
+PLIST_SUBST+=		PAM=
+.else
+CONFIGURE_ARGS+=	--disable-pam
+PLIST_SUBST+=		PAM="@comment "
+.endif
-- 
cgit v1.2.3