[pkgsrc/trunk]: pkgsrc/databases PR 52787: fix postgres kerberos handling. Tu...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/databases PR 52787: fix postgres kerberos handling. Tu...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:26:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb5838ec35c6
branches:  trunk
changeset: 372760:bb5838ec35c6
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Fri Dec 15 16:52:23 2017 +0000

description:
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:

 databases/postgresql10/Makefile.common |   4 +---
 databases/postgresql10/options.mk      |  13 +++++++++++--
 databases/postgresql92/Makefile.common |   4 +---
 databases/postgresql92/options.mk      |   8 +++++++-
 databases/postgresql93/Makefile.common |   4 +---
 databases/postgresql93/options.mk      |   8 +++++++-
 databases/postgresql94/Makefile.common |   4 +---
 databases/postgresql94/options.mk      |  13 +++++++++++--
 databases/postgresql95/Makefile.common |   4 +---
 databases/postgresql95/options.mk      |  13 +++++++++++--
 databases/postgresql96/Makefile.common |   4 +---
 databases/postgresql96/options.mk      |  13 +++++++++++--
 12 files changed, 64 insertions(+), 28 deletions(-)

diffs (truncated from 332 to 300 lines):

diff -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql10/Makefile.common
--- a/databases/postgresql10/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql10/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql10/options.mk
--- a/databases/postgresql10/options.mk Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql10/options.mk Fri Dec 15 16:52:23 2017 +0000
@@ -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 @@
 .  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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql92/Makefile.common
--- a/databases/postgresql92/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql92/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql92/options.mk
--- a/databases/postgresql92/options.mk Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql92/options.mk Fri Dec 15 16:52:23 2017 +0000
@@ -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 @@
 
 # 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 @@
 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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql93/Makefile.common
--- a/databases/postgresql93/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql93/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql93/options.mk
--- a/databases/postgresql93/options.mk Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql93/options.mk Fri Dec 15 16:52:23 2017 +0000
@@ -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 @@
 
 # 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 @@
 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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql94/Makefile.common
--- a/databases/postgresql94/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql94/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql94/options.mk
--- a/databases/postgresql94/options.mk Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql94/options.mk Fri Dec 15 16:52:23 2017 +0000
@@ -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 @@
 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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql95/Makefile.common
--- a/databases/postgresql95/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql95/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql95/options.mk
--- a/databases/postgresql95/options.mk Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql95/options.mk Fri Dec 15 16:52:23 2017 +0000
@@ -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 @@
 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 -r 867d1aa0037c -r bb5838ec35c6 databases/postgresql96/Makefile.common
--- a/databases/postgresql96/Makefile.common    Fri Dec 15 16:11:10 2017 +0000
+++ b/databases/postgresql96/Makefile.common    Fri Dec 15 16:52:23 2017 +0000
@@ -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+=       --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 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.include "../../mk/krb5.buildlink3.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc postgres
Next by Date: [pkgsrc/trunk]: pkgsrc/shells shells/Makefile: Add zsh-syntax-highlighting
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc postgres
Next by Thread: [pkgsrc/trunk]: pkgsrc/shells shells/Makefile: Add zsh-syntax-highlighting
Indexes:
Home | Main Index | Thread Index | Old Index