CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "David A. Holland" <dholland%netbsd.org@localhost>
Date: Fri, 15 Dec 2017 16:52:24 +0000

Module Name:    pkgsrc
Committed By:   dholland
Date:           Fri Dec 15 16:52:24 UTC 2017

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common options.mk
        pkgsrc/databases/postgresql92: Makefile.common options.mk
        pkgsrc/databases/postgresql93: Makefile.common options.mk
        pkgsrc/databases/postgresql94: Makefile.common options.mk
        pkgsrc/databases/postgresql95: Makefile.common options.mk
        pkgsrc/databases/postgresql96: Makefile.common options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql10/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/postgresql92/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql92/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/postgresql93/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql93/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/postgresql94/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql94/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql95/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql96/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql96/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql10/Makefile.common
diff -u pkgsrc/databases/postgresql10/Makefile.common:1.4 pkgsrc/databases/postgresql10/Makefile.common:1.5
--- pkgsrc/databases/postgresql10/Makefile.common:1.4   Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql10/Makefile.common       Fri Dec 15 16:52:23 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql10/options.mk
diff -u pkgsrc/databases/postgresql10/options.mk:1.1 pkgsrc/databases/postgresql10/options.mk:1.2
--- pkgsrc/databases/postgresql10/options.mk:1.1        Mon Oct 23 20:33:49 2017
+++ pkgsrc/databases/postgresql10/options.mk    Fri Dec 15 16:52:23 2017
@@ -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"

Index: pkgsrc/databases/postgresql92/Makefile.common
diff -u pkgsrc/databases/postgresql92/Makefile.common:1.34 pkgsrc/databases/postgresql92/Makefile.common:1.35
--- pkgsrc/databases/postgresql92/Makefile.common:1.34  Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql92/Makefile.common       Fri Dec 15 16:52:23 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql92/options.mk
diff -u pkgsrc/databases/postgresql92/options.mk:1.5 pkgsrc/databases/postgresql92/options.mk:1.6
--- pkgsrc/databases/postgresql92/options.mk:1.5        Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql92/options.mk    Fri Dec 15 16:52:23 2017
@@ -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

Index: pkgsrc/databases/postgresql93/Makefile.common
diff -u pkgsrc/databases/postgresql93/Makefile.common:1.30 pkgsrc/databases/postgresql93/Makefile.common:1.31
--- pkgsrc/databases/postgresql93/Makefile.common:1.30  Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql93/Makefile.common       Fri Dec 15 16:52:24 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql93/options.mk
diff -u pkgsrc/databases/postgresql93/options.mk:1.4 pkgsrc/databases/postgresql93/options.mk:1.5
--- pkgsrc/databases/postgresql93/options.mk:1.4        Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql93/options.mk    Fri Dec 15 16:52:24 2017
@@ -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

Index: pkgsrc/databases/postgresql94/Makefile.common
diff -u pkgsrc/databases/postgresql94/Makefile.common:1.22 pkgsrc/databases/postgresql94/Makefile.common:1.23
--- pkgsrc/databases/postgresql94/Makefile.common:1.22  Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql94/Makefile.common       Fri Dec 15 16:52:24 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql94/options.mk
diff -u pkgsrc/databases/postgresql94/options.mk:1.3 pkgsrc/databases/postgresql94/options.mk:1.4
--- pkgsrc/databases/postgresql94/options.mk:1.3        Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql94/options.mk    Fri Dec 15 16:52:24 2017
@@ -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"

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.16 pkgsrc/databases/postgresql95/Makefile.common:1.17
--- pkgsrc/databases/postgresql95/Makefile.common:1.16  Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql95/Makefile.common       Fri Dec 15 16:52:24 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql95/options.mk
diff -u pkgsrc/databases/postgresql95/options.mk:1.3 pkgsrc/databases/postgresql95/options.mk:1.4
--- pkgsrc/databases/postgresql95/options.mk:1.3        Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql95/options.mk    Fri Dec 15 16:52:24 2017
@@ -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"

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.10 pkgsrc/databases/postgresql96/Makefile.common:1.11
--- pkgsrc/databases/postgresql96/Makefile.common:1.10  Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql96/Makefile.common       Fri Dec 15 16:52:24 2017
@@ -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
 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

Index: pkgsrc/databases/postgresql96/options.mk
diff -u pkgsrc/databases/postgresql96/options.mk:1.3 pkgsrc/databases/postgresql96/options.mk:1.4
--- pkgsrc/databases/postgresql96/options.mk:1.3        Thu Dec  7 14:19:32 2017
+++ pkgsrc/databases/postgresql96/options.mk    Fri Dec 15 16:52:24 2017
@@ -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"

Prev by Date: CVS commit: pkgsrc/devel/libnet10
Next by Date: CVS commit: pkgsrc/databases
Previous by Thread: CVS commit: pkgsrc/devel/libnet10
Next by Thread: CVS commit: pkgsrc/databases
Indexes:

Home | Main Index | Thread Index | Old Index