On Thu, May 18, 2017 at 11:42:57PM +0100, Stuart Henderson wrote:
> On 2017/05/18 18:24, Kurt Mosiejczuk wrote:
> > Here is the updated diff with sthen's feedback. It adds a gssapi flavor
> > for openldap.
>
> I'd keep the FULLPKG* overwrites up top where they're obvious.
>
> I think this should probably be about right, any comments from gssapi-
> knowledgeable porters?
Looks fine.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/Makefile,v
> retrieving revision 1.149
> diff -u -p -r1.149 Makefile
> --- Makefile 10 Apr 2017 11:45:24 -0000 1.149
> +++ Makefile 18 May 2017 22:40:39 -0000
> @@ -8,11 +8,11 @@ COMMENT-server = open-source LDAP softwa
> DISTNAME = openldap-2.4.44
> PKGNAME-main = ${DISTNAME:S/-/-client-/}
> PKGNAME-server = ${DISTNAME:S/-/-server-/}
> -REVISION = 3
> +REVISION = 4
>
> # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
> -FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}
> -FULLPKGPATH-main = databases/openldap,-main
> +FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
> +FULLPKGPATH-main = databases/openldap,-main${FLAVOR_EXT:S/-aci//:S/-/,/g}
>
> SHARED_LIBS += lber 12.0 # 12.6
> SHARED_LIBS += lber-2.4 12.0
> @@ -49,7 +49,7 @@ CONFIGURE_STYLE = autoconf
> USE_GROFF = Yes
>
> FLAVOR ?=
> -FLAVORS = aci
> +FLAVORS = aci gssapi
>
> CONFIGURE_ARGS += --enable-ipv6 \
> --with-tls=openssl
> @@ -92,6 +92,14 @@ CONFIGURE_ARGS += --disable-mdb
>
> .if ${FLAVOR:Maci}
> CONFIGURE_ARGS += --enable-aci
> +.endif
> +
> +.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
> Index: pkg/DESCR-main
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/pkg/DESCR-main,v
> retrieving revision 1.1
> diff -u -p -r1.1 DESCR-main
> --- pkg/DESCR-main 25 Nov 2006 16:50:24 -0000 1.1
> +++ pkg/DESCR-main 18 May 2017 22:40:39 -0000
> @@ -9,3 +9,6 @@ is distributed under a Perl-style "Artis
>
> This is the client portion of OpenLDAP, it provides the client binaries,
> libraries and headers.
> +
> +Flavors:
> + gssapi build with GSSAPI support
> Index: pkg/DESCR-server
> ===================================================================
> RCS file: /cvs/ports/databases/openldap/pkg/DESCR-server,v
> retrieving revision 1.7
> diff -u -p -r1.7 DESCR-server
> --- pkg/DESCR-server 17 Dec 2016 14:11:21 -0000 1.7
> +++ pkg/DESCR-server 18 May 2017 22:40:39 -0000
> @@ -12,3 +12,4 @@ various administrative binaries.
>
> Flavors:
> aci enable the *experimental* ACI dynamic access control
> + gssapi build with GSSAPI support
>
>
--
Antoine
