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.

12 files changed, 64 insertions, 28 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"
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index 7b3df0b26e6..d262d0d660c 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.35 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.
@@ -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/postgresql92/options.mk b/databases/postgresql92/options.mk
index ca403739e8f..be8a9959d52 100644
--- a/databases/postgresql92/options.mk
+++ b/databases/postgresql92/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: options.mk,v 1.6 2017/12/15 16:52:23 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql92
 PKG_SUPPORTED_OPTIONS=	bonjour dtrace kerberos ldap pam
+PKG_SUGGESTED_OPTIONS=	kerberos
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,7 +22,9 @@ CONFIGURE_ARGS+=	--enable-dtrace
 
 # Kerberos5 authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-krb5
+CONFIGURE_ARGS+=	--with-gssapi
 
 CHECK_BUILTIN.${KRB5_TYPE}:=	yes
 .include	"../../security/${KRB5_TYPE}/builtin.mk"
@@ -32,6 +35,9 @@ CHECK_BUILTIN.${KRB5_TYPE}:=	no
 CFLAGS_KRB5!=	${SH_KRB5_CONFIG} --cflags
 CPPFLAGS+=	${CFLAGS_KRB5}
 .	endif
+.else
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-gssapi
 .endif
 
 # LDAP authentication for the PostgreSQL backend
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index fcf1538a483..441bb01401a 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 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/postgresql93/options.mk b/databases/postgresql93/options.mk
index b6fe36a67a6..87cf324ba4f 100644
--- a/databases/postgresql93/options.mk
+++ b/databases/postgresql93/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: options.mk,v 1.5 2017/12/15 16:52:24 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql93
 PKG_SUPPORTED_OPTIONS=	bonjour dtrace kerberos ldap pam
+PKG_SUGGESTED_OPTIONS=	kerberos
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,7 +22,9 @@ CONFIGURE_ARGS+=	--enable-dtrace
 
 # Kerberos5 authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-krb5
+CONFIGURE_ARGS+=	--with-gssapi
 
 CHECK_BUILTIN.${KRB5_TYPE}:=	yes
 .include	"../../security/${KRB5_TYPE}/builtin.mk"
@@ -32,6 +35,9 @@ CHECK_BUILTIN.${KRB5_TYPE}:=	no
 CFLAGS_KRB5!=	${SH_KRB5_CONFIG} --cflags
 CPPFLAGS+=	${CFLAGS_KRB5}
 .	endif
+.else
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-gssapi
 .endif
 
 # LDAP authentication for the PostgreSQL backend
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index a05a1fe53ad..2e0055fe5d7 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 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/postgresql94/options.mk b/databases/postgresql94/options.mk
index 132f00bdcc4..a839c9e6162 100644
--- a/databases/postgresql94/options.mk
+++ b/databases/postgresql94/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.postgresql94
-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"
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"
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 8b8870f96d1..8afd3d86aa1 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2017/12/07 14:19:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 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/postgresql96/options.mk b/databases/postgresql96/options.mk
index a1b45a48032..72a1e4b9130 100644
--- a/databases/postgresql96/options.mk
+++ b/databases/postgresql96/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.postgresql96
-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"