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/postgresql10 | |
| 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/postgresql10')
| -rw-r--r-- | databases/postgresql10/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/postgresql10/options.mk | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index 869cdcc9183..19d0dcab541 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2017/12/07 14:19:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.5 2017/12/15 16:52:23 dholland Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -63,7 +63,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 @@ -113,7 +112,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/postgresql10/options.mk b/databases/postgresql10/options.mk index fb48e4cbe59..2096f696280 100644 --- a/databases/postgresql10/options.mk +++ b/databases/postgresql10/options.mk @@ -1,7 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2017/10/23 20:33:49 adam Exp $ +# $NetBSD: options.mk,v 1.2 2017/12/15 16:52:23 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql10 -PKG_SUPPORTED_OPTIONS= bonjour dtrace icu ldap pam +PKG_SUPPORTED_OPTIONS= bonjour dtrace icu gssapi ldap pam +PKG_SUGGESTED_OPTIONS= gssapi .include "../../mk/bsd.options.mk" @@ -26,6 +27,14 @@ CONFIGURE_ARGS+= --with-icu . include "../../textproc/icu/buildlink3.mk" .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" |