On Thu, May 18, 2017 at 11:04:46PM +0100, Stuart Henderson wrote:
> On 2017/04/25 13:36, Kurt Mosiejczuk wrote:
> > .if ${FLAVOR:Maci}
> > CONFIGURE_ARGS += --enable-aci
> > +
> > +# overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
> > +FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}
> > +FULLPKGPATH-main = databases/openldap,-main
> > +.endif
> The logic isn't correct for the 'FLAVOR="gssapi aci"' case. I think
> you want an unconditional
> FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
> FULLPKGPATH-main = databases/openldap,-main${FLAVOR_EXT:S/-aci//:S/-/,/g}
Yup. I was more thinking of undoing the damage the rewriting was doing to
the gssapi flavor and didn't think of a case where you'd be doing both.
> > +
> > +.if ${FLAVOR:Mgssapi}
> > +CONFIGURE_ARGS += --enable-gssapi=${LOCALBASE}/heimdal
> > +MODULES += security/heimdal
> > +WANTLIB += heimdal/lib/gssapi
> > +WANTLIB += heimdal/lib/heimntlm
> > +WANTLIB += heimdal/lib/heimsqlite
> > .endif
> > MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
> I don't have a way to test the gssapi support but that looks like it's
> probably correct.
I've tested the client package with the GSSAPI flavor and it works.
If desired, I may be able to set up an LDAP server for some testing
in order to test the server part.
Shall I re-spin the diff with your suggested package rewriting lines?
Thanks,
--Kurt
