ports/135968: security/openssh-portable-5.2.p1_1, 1 does not build with lpk patch

[Konstantin Kukushkin]

>Number:         135968
>Category:       ports
>Synopsis:       security/openssh-portable-5.2.p1_1,1 does not build with lpk patch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 23 15:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Konstantin Kukushkin
>Release:        FreeBSD 6.x/7.x
>Organization:
Rambler
>Environment:
FreeBSD mem01.plant.nakarte.ru 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #2: Tue Oct  3 03:20:01 MSD 2006     root at mem01.plant.nakarte.ru:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Openssh-portable doesn't build from ports because patch-files was renamed.
make output is:
===>  Extracting for openssh-portable-5.2.p1_1,1
=> MD5 Checksum OK for openssh-5.2p1.tar.gz.
=> SHA256 Checksum OK for openssh-5.2p1.tar.gz.
===>  Patching for openssh-portable-5.2.p1_1,1
===>  Applying extra patch /usr/ports/security/openssh-portable/files/gss-serv.c.patch
===>  Applying extra patch /usr/ports/security/openssh-portable/files/openssh-lpk-5.0p1-0.3.9.patch
cannot open /usr/ports/security/openssh-portable/files/openssh-lpk-5.0p1-0.3.9.patch: No such file or directory
*** Error code 2

Stop in /usr/ports/security/openssh-portable.

>How-To-Repeat:
csup -h cvsup.freebsd.org; # make -C /usr/ports/security/openssh-portable BATCH=1 WITH_LPK=1 install clean
>Fix:
Patch Makefile

Patch attached with submission follows:

--- Makefile	2009-06-23 19:06:15.000000000 +0400
+++ Makefile.new	2009-06-23 19:07:43.000000000 +0400
@@ -147,7 +147,7 @@
 
 # See http://dev.inversepath.com/trac/openssh-lpk
 .if defined(WITH_LPK)
-EXTRA_PATCHES+=		${FILESDIR}/openssh-lpk-5.0p1-0.3.9.patch
+EXTRA_PATCHES+=		${FILESDIR}/contrib-openssh-lpk-5.1p1-0.3.10.patch
 USE_OPENLDAP=		yes
 CPPFLAGS+=		"-I${LOCALBASE}/include -DWITH_LDAP_PUBKEY"
 CONFIGURE_ARGS+=	--with-libs='-lldap' --with-ldflags='-L${LOCALBASE}/lib' \
@@ -161,11 +161,11 @@
 .elif defined(WITH_HPN) && !defined(WITH_LPK)
 EXTRA_PATCHES+=		${FILESDIR}/openssh-5.2p1-hpn-servconf.patch
 .elif defined(WITH_LPK) && !defined(WITH_HPN)
-EXTRA_PATCHES+=		${FILESDIR}/openssh-lpk-5.0p1-0.3.9-servconv.patch
+EXTRA_PATCHES+=		${FILESDIR}/contrib-openssh-lpk-5.1p1-0.3.10-servconf.c.patch
 .endif
 
 .if defined(WITH_LPK) && ${ARCH} == "amd64"
-EXTRA_PATCHES+=		${FILESDIR}/openssh-lpk-5.0p1-64bit.patch
+EXTRA_PATCHES+=		${FILESDIR}/contrib-openssh-5.1_p1-lpk-64bit.patch
 .endif
 
 # See http://www.roumenpetrov.info/openssh/


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