- Add OPTION to enable Kerberos/GSSAPI patch [1]

- Add OPTION to enable LPK patch (ldap stored public key) [2]

PR:		86384 [1], 103399 [2]
Submitted by:	Garrett Wollman <wollman___khavrinen.csail.mit.edu> [1], Dmitriy Kirhlarov <dkirhlarov___oilspace.com> [2]

security/openssh-portable/Makefile

@@ -53,17 +53,19 @@ PORTABLE_SUFFIX=	-portable
 SUDO?=		# empty
 MAKE_ENV+=	SUDO="${SUDO}"
 
-OPTIONS=	PAM		"Enable pam(3) support"			on \
-		TCP_WRAPPERS	"Enable tcp_wrappers support"		on \
-		LIBEDIT		"Enable readline support to sftp(1)"	on \
-		KERBEROS	"Enable kerberos (autodetection)"	on \
-		SUID_SSH	"Enable suid SSH (Recommended off)"	off \
-		GSSAPI		"Enable GSSAPI support"			off \
-		OPENSSH_CHROOT	"Enable CHROOT support"			off \
-		OPENSC		"Enable OpenSC smartcard support"	off \
-		OPENSCPINPATCH	"Enable OpenSC PIN patch"		off \
-		HPN		"Enable HPN-SSH patch"			off \
-		OVERWRITE_BASE	"OpenSSH overwrite base"		off
+OPTIONS=	PAM		"Enable pam(3) support"				on \
+		TCP_WRAPPERS	"Enable tcp_wrappers support"			on \
+		LIBEDIT		"Enable readline support to sftp(1)"		on \
+		KERBEROS	"Enable kerberos (autodetection)"		on \
+		SUID_SSH	"Enable suid SSH (Recommended off)"		off \
+		GSSAPI		"Enable GSSAPI support (req: KERBEROS)"		off \
+		KERB_GSSAPI	"Enable Kerberos/GSSAPI patch (req: GSSAPI)"	off \
+		OPENSSH_CHROOT	"Enable CHROOT support"				off \
+		OPENSC		"Enable OpenSC smartcard support"		off \
+		OPENSCPINPATCH	"Enable OpenSC PIN patch"			off \
+		HPN		"Enable HPN-SSH patch"				off \
+		LPK		"Enable LDAP Public Key (LPK) patch"		off \
+		OVERWRITE_BASE	"OpenSSH overwrite base"			off
 
 .include <bsd.port.pre.mk>
 
@@ -97,6 +99,11 @@ CONFIGURE_ARGS+=	--disable-suid-ssh
 
 .if !defined(WITHOUT_KERBEROS)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}) || defined(WITH_GSSAPI)
+.if defined(WITH_KERB_GSSAPI)
+PATCH_DIST_STRIP=	-p0
+PATCH_SITES+=		http://www.sxw.org.uk/computing/patches/
+PATCHFILES+=		openssh-4.4p1-gsskex-20061002.patch
+.endif
 PORTABLE_SUFFIX=	# empty
 GSSAPI_SUFFIX=		-gssapi
 CONFLICTS+=		openssh-portable-*-[0-9]*
@@ -133,12 +140,25 @@ CONFIGURE_ARGS+=	--with-opensc=${LOCALBASE}
 EXTRA_PATCHES+=		${FILESDIR}/scardpin.patch
 .endif
 
+.if defined(WITH_HPN) && defined(WITH_LPK)
+BROKEN=			HPN and LPK patches are incompatible
+.endif
+
 .if defined(WITH_HPN)
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=		http://www.psc.edu/networking/projects/hpn-ssh/
 PATCHFILES+=		openssh-4.4p1-hpn.diff.gz
 .endif
 
+.if defined(WITH_LPK)
+PATCH_DIST_STRIP=	-p0
+EXTRA_PATCHES+=		${FILESDIR}/openssh-lpk.patch
+USE_OPENLDAP=		yes
+CPPFLAGS+=		"-I${LOCALBASE}/include -DWITH_LDAP_PUBKEY"
+CONFIGURE_ARGS+=	--with-libs='-lldap' --with-ldflags='-L/usr/local/lib' \
+			--with-cppflags='-I/usr/local/include -DWITH_LDAP_PUBKEY'
+.endif
+
 .if defined(WITH_OVERWRITE_BASE)
 WITH_OPENSSL_BASE=	yes
 BASE_SUFFIX=		-overwrite-base

security/openssh-portable/distinfo

@@ -1,6 +1,12 @@
 MD5 (openssh-4.4p1.tar.gz) = 793a709a8de695c22f523024d7e9bf07
 SHA256 (openssh-4.4p1.tar.gz) = 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac
 SIZE (openssh-4.4p1.tar.gz) = 1044334
+MD5 (openssh-4.4p1-gsskex-20061002.patch) = 61e8573f7192eb1ff26036f486db445a
+SHA256 (openssh-4.4p1-gsskex-20061002.patch) = cc21b7038589be27924bdc0ba163cf059ea1f0b7b65d0f8d7ddc015cac6d9ac4
+SIZE (openssh-4.4p1-gsskex-20061002.patch) = 69152
 MD5 (openssh-4.4p1-hpn.diff.gz) = d5f07fcb10360b52bdcacf3c7de803b6
 SHA256 (openssh-4.4p1-hpn.diff.gz) = 6febe17260ff66a8dbb7b466252889f855dcc5dec50c93eff25050839cf65977
 SIZE (openssh-4.4p1-hpn.diff.gz) = 16258
+MD5 (openssh-lpk-4.3p1-0.3.7.patch) = d9eacb819a73daddb3d21ca7aa8e5c25
+SHA256 (openssh-lpk-4.3p1-0.3.7.patch) = 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4
+SIZE (openssh-lpk-4.3p1-0.3.7.patch) = 60451