ports/103399: [PATCH] add lpk patch (ldap stored public key)

[Dmitriy Kirhlarov]

>Number:         103399
>Category:       ports
>Synopsis:       [PATCH] add lpk patch (ldap stored public key)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 19 13:10:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dmitriy Kirhlarov
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD dimma 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed Aug 2 16:56:13 UTC 2006 root at jailhost1:/usr/obj/usr/src/sys/THINKPAD_KST i386

>Description:

Add patch from:
http://www.opendarwin.org/en/projects/openssh-lpk/
and fix checksum for hpn patch

>How-To-Repeat:

>Fix:

diff -urBN openssh-portable.orig/Makefile openssh-portable/Makefile
--- openssh-portable.orig/Makefile	Tue Sep 19 10:55:08 2006
+++ openssh-portable/Makefile	Tue Sep 19 12:32:10 2006
@@ -63,10 +63,15 @@
 		OPENSC		"Enable OpenSC smartcard support"	off \
 		OPENSCPINPATCH	"Enable OpenSC PIN patch"		off \
 		HPN		"Enable HPN-SSH patch"			off \
+		LPK		"Enable LPK-SSH patch"			off \
 		OVERWRITE_BASE	"OpenSSH overwrite base"		off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_HPN) && defined(WITH_LPK)
+BROKEN=		HPN and LPK patches incompatible
+.endif
+
 # Preserve deprecated OPENSSH_OVERWRITE_BASE settings
 .if defined(OPENSSH_OVERWRITE_BASE)
 WITH_OVERWRITE_BASE=	yes
@@ -137,6 +142,16 @@
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=		http://www.psc.edu/networking/projects/hpn-ssh/
 PATCHFILES+=		openssh-4.3p2-hpn12.diff.gz
+.endif
+
+.if defined(WITH_LPK)
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES+=		http://www.opendarwin.org/en/projects/openssh-lpk/files/
+PATCHFILES+=		openssh-lpk-4.3p1-0.3.7.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)
diff -urBN openssh-portable.orig/distinfo openssh-portable/distinfo
--- openssh-portable.orig/distinfo	Tue Sep 19 10:55:08 2006
+++ openssh-portable/distinfo	Tue Sep 19 11:17:16 2006
@@ -1,6 +1,9 @@
 MD5 (openssh-4.3p2.tar.gz) = 7e9880ac20a9b9db0d3fea30a9ff3d46
 SHA256 (openssh-4.3p2.tar.gz) = 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
 SIZE (openssh-4.3p2.tar.gz) = 941455
-MD5 (openssh-4.3p2-hpn12.diff.gz) = f2fef0ecd2315d940dbb5b9188546400
-SHA256 (openssh-4.3p2-hpn12.diff.gz) = 704ff6ac9737850ac04b77bbb613099c0d557be4a0b28925946a90a76d7d7ac0
-SIZE (openssh-4.3p2-hpn12.diff.gz) = 14891
+MD5 (openssh-4.3p2-hpn12.diff.gz) = 51a444a1c9e9a5848f965a63d37df0e2
+SHA256 (openssh-4.3p2-hpn12.diff.gz) = a7c7a11f5a7914815dc4b7a8614ff008ba5f4a3827242b69db3dcf29f75b7cc1
+SIZE (openssh-4.3p2-hpn12.diff.gz) = 14651
+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

>Release-Note:
>Audit-Trail:
>Unformatted: