diff options
| author | dholland <dholland@pkgsrc.org> | 2017-12-15 16:52:23 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2017-12-15 16:52:23 +0000 |
| commit | e4a3dd2773aa0f5d568168fe39ef1b78e915b899 (patch) | |
| tree | 538e9f08f9b128986b2ffa0fd7fba2da05163d2e /databases/postgresql95 | |
| parent | 20501b09c6656a0b4418e4629785f965eb08251c (diff) | |
| download | pkgsrc-e4a3dd2773aa0f5d568168fe39ef1b78e915b899.tar.gz | |
PR 52787: fix postgres kerberos handling. Tuck the kerberos support
(whether "kerberos" or "gssapi") within an option so it can be turned
off. For 92/93 this is the existing "kerberos" option; for 94+ this
is the "gssapi" option instead, to satisfy the one person who cares
about the distinction.
For postgresql92 and 93 the kerberos option is now on by default (it
wasn't before, only the "gssapi" code has been on by default since the
last update) -- it isn't clear to what extent this may make the binary
packages different so precautionary revbumps will be coming in a
moment.
Technically for 92/93 the "gssapi" code could be attached to a
separate "gssapi" option so as to make the existing behavior entirely
unchanged, but this seems likely to be confusing in the long run and
thus not a good idea.
Diffstat (limited to 'databases/postgresql95')
| -rw-r--r-- | databases/postgresql95/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/postgresql95/options.mk | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index 6929826ac52..0650a26044d 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2017/12/07 14:19:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.17 2017/12/15 16:52:24 dholland Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -65,7 +65,6 @@ CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR} CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}} CONFIGURE_ARGS+= --enable-nls -CONFIGURE_ARGS+= --with-gssapi CONFIGURE_ARGS+= --with-libxml CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --without-perl @@ -112,7 +111,6 @@ LIBS.SunOS+= -lintl .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../mk/krb5.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .if ${READLINE_TYPE} == "editline" CONFIGURE_ARGS+= --with-libedit-preferred diff --git a/databases/postgresql95/options.mk b/databases/postgresql95/options.mk index 1238a43f7ab..f6f9da68e6c 100644 --- a/databases/postgresql95/options.mk +++ b/databases/postgresql95/options.mk @@ -1,7 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $ +# $NetBSD: options.mk,v 1.4 2017/12/15 16:52:24 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql95 -PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam +PKG_SUPPORTED_OPTIONS= bonjour dtrace gssapi ldap pam +PKG_SUGGESTED_OPTIONS= gssapi .include "../../mk/bsd.options.mk" @@ -19,6 +20,14 @@ LIBS+= -ldns_sd CONFIGURE_ARGS+= --enable-dtrace .endif +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend +.if !empty(PKG_OPTIONS:Mgssapi) +. include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --with-gssapi +.else +CONFIGURE_ARGS+= --without-gssapi +.endif + # LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" |