misc/159745: [patch] Fix improperly specified dependency list for secure/lib/libssh

[Garrett Cooper]

>Number:         159745
>Category:       misc
>Synopsis:       [patch] Fix improperly specified dependency list for secure/lib/libssh
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 13 17:20:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        9-CURRENT
>Organization:
iXsystems
>Environment:
FreeBSD bayonetta.local 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r223824M: Sun Jul 31 20:34:01 PDT 2011     gcooper at bayonetta.local:/usr/obj/usr/src/sys/BAYONETTA  amd64
>Description:
Running buildworld will fail if one invokes it like: make buildworld -DWITHOUT_GSSAPI -DWITH_KERBEROS

The problem is that the dependency list in Makefile.inc1 requires both GSSAPI and KERBEROS to be hardwired to no -- otherwise the build will fail looking for a non-existent dependency.

The attached patch describes what I mean, but might not be the correct solution. The correct solution might be to set WITHOUT_KERBEROS if WITHOUT_GSSAPI is set, because gssapi is a dependency of kerberos, and not the other way around.
>How-To-Repeat:
make buildworld -DWITHOUT_GSSAPI -DWITH_KERBEROS
>Fix:


Patch attached with submission follows:

Index: Makefile.inc1
===================================================================
--- Makefile.inc1	(revision 224801)
+++ Makefile.inc1	(working copy)
@@ -1257,8 +1257,9 @@
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
+.if ${MK_GSSAPI} == "no" || ${MK_KERBEROS_SUPPORT} == "no"
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.else
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L


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