NetBSD Problem Report #52787

From dholland@netbsd.org  Wed Dec  6 07:27:37 2017
Return-Path: <dholland@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 137F27A1D2
	for <gnats-bugs@gnats.NetBSD.org>; Wed,  6 Dec 2017 07:27:37 +0000 (UTC)
Message-Id: <20171206072736.B7D5084E66@mail.netbsd.org>
Date: Wed,  6 Dec 2017 07:27:36 +0000 (UTC)
From: dholland@NetBSD.org
Reply-To: dholland@NetBSD.org
To: gnats-bugs@NetBSD.org
Subject: postgresql92 ignores kerberos option
X-Send-Pr-Version: 3.95

>Number:         52787
>Category:       pkg
>Synopsis:       postgresql92 ignores kerberos option
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    adam
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 06 07:30:00 +0000 2017
>Closed-Date:    Fri Dec 15 17:08:30 +0000 2017
>Last-Modified:  Fri Dec 15 17:08:30 +0000 2017
>Originator:     David A. Holland
>Release:        NetBSD 8.99.8 (20171205) pkgsrc 20171205
>Organization:
>Environment:
System: NetBSD valkyrie 8.99.8 NetBSD 8.99.8 (VALKYRIE) #24: Tue Dec  5 17:30:57 EST 2017  dholland@valkyrie:/usr/src/sys/arch/amd64/compile/VALKYRIE amd64
Architecture: x86_64
Machine: amd64
>Description:

Since the last update (on 11/13) postgresql92 contains an
unconditional --with-gssapi, in spite of the fact that it already has
a kerberos option. This causes it to not honor the option; then it
fails to build, since it doesn't actually depend on kerberos when the
option isn't enabled.

>How-To-Repeat:

make (even in postgresql92-docs!), watch it fail.

>Fix:

Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql92/Makefile.common,v
retrieving revision 1.33
diff -u -r1.33 Makefile.common
--- Makefile.common	13 Nov 2017 09:33:31 -0000	1.33
+++ Makefile.common	6 Dec 2017 07:23:35 -0000
@@ -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
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql92/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- options.mk	13 Nov 2017 09:33:31 -0000	1.4
+++ options.mk	6 Dec 2017 07:23:35 -0000
@@ -23,6 +23,7 @@
 .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"
@@ -33,6 +34,8 @@
 CFLAGS_KRB5!=	${SH_KRB5_CONFIG} --cflags
 CPPFLAGS+=	${CFLAGS_KRB5}
 .	endif
+.else
+CONFIGURE_ARGS+=	--without-gssapi
 .endif

 # LDAP authentication for the PostgreSQL backend

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->adam
Responsible-Changed-By: dholland@NetBSD.org
Responsible-Changed-When: Wed, 06 Dec 2017 07:30:37 +0000
Responsible-Changed-Why:
To maintainer.


From: Adam <adam@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: pkg-manager@netbsd.org,
 pkgsrc-bugs@netbsd.org,
 gnats-admin@netbsd.org,
 dholland@NetBSD.org
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Sun, 10 Dec 2017 13:18:07 +0100

 > Synopsis: postgresql92 ignores kerberos option
 >=20
 > Responsible-Changed-From-To: pkg-manager->adam
 > Responsible-Changed-By: dholland@NetBSD.org
 > Responsible-Changed-When: Wed, 06 Dec 2017 07:30:37 +0000
 > Responsible-Changed-Why:
 > To maintainer.

 I made some changes to the way PostgreSQL handles Kerberos. Can you =
 check if now it build for you?

 Thanks,
 Adam=

State-Changed-From-To: open->feedback
State-Changed-By: leot@NetBSD.org
State-Changed-When: Sun, 10 Dec 2017 20:38:56 +0000
State-Changed-Why:
Feedback requested.

JFTR the following revisions changed how postgresql* handles
Kerberos:

 cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql10/Makefile.common
 cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/postgresql92/Makefile.common
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql92/options.mk
 cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql93/Makefile.common
 cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql93/options.mk
 cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/postgresql94/Makefile.common
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql94/options.mk
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql95/Makefile.common
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql95/options.mk
 cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/postgresql96/Makefile.common
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql96/options.mk

Thank you!


From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Wed, 13 Dec 2017 18:17:48 +0000

 On Sun, Dec 10, 2017 at 12:20:01PM +0000, Adam wrote:
  >  I made some changes to the way PostgreSQL handles Kerberos. Can you =
  >  check if now it build for you?

 ...no?

 I'm test-building a real fix.

 -- 
 David A. Holland
 dholland@netbsd.org

From: coypu@sdf.org
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Wed, 13 Dec 2017 23:33:14 +0000

 Hi,
 Now PR pkg/52753 depends on this for all postgresql versions.

State-Changed-From-To: feedback->open
State-Changed-By: leot@NetBSD.org
State-Changed-When: Thu, 14 Dec 2017 07:56:20 +0000
State-Changed-Why:
Feedback provided


From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Thu, 14 Dec 2017 20:35:44 +0000

 On Wed, Dec 13, 2017 at 06:20:00PM +0000, David Holland wrote:
  >  On Sun, Dec 10, 2017 at 12:20:01PM +0000, Adam wrote:
  >   >  I made some changes to the way PostgreSQL handles Kerberos. Can you =
  >   >  check if now it build for you?
  >  
  >  ...no?
  >  
  >  I'm test-building a real fix.

 I will commit the following after I've test-built all of it. This
 moves all the kerberos back within package options, like it should be,
 and for the one person who cares about the technical difference the
 option is now "gssapi" for the versions (94+) that only support
 --with-gssapi and not --with-kerberos.


 Index: postgresql10/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql10/Makefile.common,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile.common
 --- postgresql10/Makefile.common	7 Dec 2017 14:19:32 -0000	1.4
 +++ postgresql10/Makefile.common	14 Dec 2017 20:32:13 -0000
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.4 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: Makefile.common,v 1.3 2017/11/13 09:33:31 adam 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
 Index: postgresql10/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql10/options.mk,v
 retrieving revision 1.1
 diff -u -r1.1 options.mk
 --- postgresql10/options.mk	23 Oct 2017 20:33:49 -0000	1.1
 +++ postgresql10/options.mk	14 Dec 2017 20:32:13 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: options.mk,v 1.1 2017/10/23 20:33:49 adam Exp $

  PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql10
 -PKG_SUPPORTED_OPTIONS=	bonjour dtrace icu ldap pam
 +PKG_SUPPORTED_OPTIONS=	bonjour dtrace icu gssapi ldap pam

  .include "../../mk/bsd.options.mk"

 @@ -26,6 +26,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"
 Index: postgresql92/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql92/Makefile.common,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile.common
 --- postgresql92/Makefile.common	7 Dec 2017 14:19:32 -0000	1.34
 +++ postgresql92/Makefile.common	14 Dec 2017 20:32:13 -0000
 @@ -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
 Index: postgresql92/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql92/options.mk,v
 retrieving revision 1.5
 diff -u -r1.5 options.mk
 --- postgresql92/options.mk	7 Dec 2017 14:19:32 -0000	1.5
 +++ postgresql92/options.mk	14 Dec 2017 20:32:13 -0000
 @@ -21,7 +21,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 +34,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
 Index: postgresql93/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql93/Makefile.common,v
 retrieving revision 1.30
 diff -u -r1.30 Makefile.common
 --- postgresql93/Makefile.common	7 Dec 2017 14:19:32 -0000	1.30
 +++ postgresql93/Makefile.common	14 Dec 2017 20:32:13 -0000
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.30 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: Makefile.common,v 1.29 2017/11/13 09:33:31 adam 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
 Index: postgresql93/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql93/options.mk,v
 retrieving revision 1.4
 diff -u -r1.4 options.mk
 --- postgresql93/options.mk	7 Dec 2017 14:19:32 -0000	1.4
 +++ postgresql93/options.mk	14 Dec 2017 20:32:13 -0000
 @@ -1,4 +1,4 @@
 -# $NetBSD: options.mk,v 1.4 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: options.mk,v 1.3 2017/11/13 09:33:31 adam Exp $

  PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql93
  PKG_SUPPORTED_OPTIONS=	bonjour dtrace kerberos ldap pam
 @@ -21,7 +21,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 +34,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
 Index: postgresql94/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql94/Makefile.common,v
 retrieving revision 1.22
 diff -u -r1.22 Makefile.common
 --- postgresql94/Makefile.common	7 Dec 2017 14:19:32 -0000	1.22
 +++ postgresql94/Makefile.common	14 Dec 2017 20:32:13 -0000
 @@ -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
 Index: postgresql94/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql94/options.mk,v
 retrieving revision 1.3
 diff -u -r1.3 options.mk
 --- postgresql94/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 +++ postgresql94/options.mk	14 Dec 2017 20:32:14 -0000
 @@ -1,7 +1,7 @@
 -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $

  PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql94
 -PKG_SUPPORTED_OPTIONS=	bonjour dtrace ldap pam
 +PKG_SUPPORTED_OPTIONS=	bonjour dtrace gssapi ldap pam

  .include "../../mk/bsd.options.mk"

 @@ -19,6 +19,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"
 Index: postgresql95/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql95/Makefile.common,v
 retrieving revision 1.16
 diff -u -r1.16 Makefile.common
 --- postgresql95/Makefile.common	7 Dec 2017 14:19:32 -0000	1.16
 +++ postgresql95/Makefile.common	14 Dec 2017 20:32:14 -0000
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.16 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: Makefile.common,v 1.15 2017/11/13 09:35:46 adam 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
 Index: postgresql95/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql95/options.mk,v
 retrieving revision 1.3
 diff -u -r1.3 options.mk
 --- postgresql95/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 +++ postgresql95/options.mk	14 Dec 2017 20:32:14 -0000
 @@ -1,7 +1,7 @@
 -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $

  PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql95
 -PKG_SUPPORTED_OPTIONS=	bonjour dtrace ldap pam
 +PKG_SUPPORTED_OPTIONS=	bonjour dtrace gssapi ldap pam

  .include "../../mk/bsd.options.mk"

 @@ -19,6 +19,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"
 Index: postgresql96/Makefile.common
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql96/Makefile.common,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile.common
 --- postgresql96/Makefile.common	7 Dec 2017 14:19:32 -0000	1.10
 +++ postgresql96/Makefile.common	14 Dec 2017 20:32:14 -0000
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.10 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: Makefile.common,v 1.9 2017/11/13 09:35:46 adam 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
 Index: postgresql96/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/databases/postgresql96/options.mk,v
 retrieving revision 1.3
 diff -u -r1.3 options.mk
 --- postgresql96/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 +++ postgresql96/options.mk	14 Dec 2017 20:32:14 -0000
 @@ -1,7 +1,7 @@
 -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:33 adam Exp $

  PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql96
 -PKG_SUPPORTED_OPTIONS=	bonjour dtrace ldap pam
 +PKG_SUPPORTED_OPTIONS=	bonjour dtrace gssapi ldap pam

  .include "../../mk/bsd.options.mk"

 @@ -19,6 +19,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"

 -- 
 David A. Holland
 dholland@netbsd.org

From: Adam <adam@netbsd.org>
To: dholland@NetBSD.org,
 gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Thu, 14 Dec 2017 21:58:10 +0100

 David,

 My idea was to make Kerberos support on by default, as all modern =
 systems should have Kerberos on board. If you are having problems with =
 it, it is fine for me to make it an option, but could you just, please, =
 make it a suggested option?

 Thanks,
 Adam


 >>> I made some changes to the way PostgreSQL handles Kerberos. Can you =
 =3D
 >>> check if now it build for you?
 >>=20
 >> ...no?
 >>=20
 >> I'm test-building a real fix.
 >=20
 > I will commit the following after I've test-built all of it. This
 > moves all the kerberos back within package options, like it should be,
 > and for the one person who cares about the technical difference the
 > option is now "gssapi" for the versions (94+) that only support
 > --with-gssapi and not --with-kerberos.
 >=20
 >=20
 > Index: postgresql10/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql10/Makefile.common,v
 > retrieving revision 1.4
 > diff -u -r1.4 Makefile.common
 > --- postgresql10/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.4
 > +++ postgresql10/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.4 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.3 2017/11/13 09:33:31 adam 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+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -113,7 +112,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql10/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql10/options.mk,v
 > retrieving revision 1.1
 > diff -u -r1.1 options.mk
 > --- postgresql10/options.mk	23 Oct 2017 20:33:49 -0000	1.1
 > +++ postgresql10/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -1,7 +1,7 @@
 >  # $NetBSD: options.mk,v 1.1 2017/10/23 20:33:49 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql10
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace icu ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace icu gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -26,6 +26,14 @@
 >  .  include "../../textproc/icu/buildlink3.mk"
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D       --with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D       --without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql92/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql92/Makefile.common,v
 > retrieving revision 1.34
 > diff -u -r1.34 Makefile.common
 > --- postgresql92/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.34
 > +++ postgresql92/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql92/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql92/options.mk,v
 > retrieving revision 1.5
 > diff -u -r1.5 options.mk
 > --- postgresql92/options.mk	7 Dec 2017 14:19:32 -0000	1.5
 > +++ postgresql92/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -21,7 +21,9 @@
 >=20
 >  # Kerberos5 authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mkerberos)
 > +.  include "../../mk/krb5.buildlink3.mk"
 >  CONFIGURE_ARGS+=3D	--with-krb5
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 >=20
 >  CHECK_BUILTIN.${KRB5_TYPE}:=3D	yes
 >  .include	"../../security/${KRB5_TYPE}/builtin.mk"
 > @@ -32,6 +34,9 @@
 >  CFLAGS_KRB5!=3D	${SH_KRB5_CONFIG} --cflags
 >  CPPFLAGS+=3D	${CFLAGS_KRB5}
 >  .	endif
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-krb5
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 >  .endif
 >=20
 >  # LDAP authentication for the PostgreSQL backend
 > Index: postgresql93/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql93/Makefile.common,v
 > retrieving revision 1.30
 > diff -u -r1.30 Makefile.common
 > --- postgresql93/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.30
 > +++ postgresql93/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.30 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.29 2017/11/13 09:33:31 adam 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+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql93/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql93/options.mk,v
 > retrieving revision 1.4
 > diff -u -r1.4 options.mk
 > --- postgresql93/options.mk	7 Dec 2017 14:19:32 -0000	1.4
 > +++ postgresql93/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: options.mk,v 1.4 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.3 2017/11/13 09:33:31 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql93
 >  PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace kerberos ldap pam
 > @@ -21,7 +21,9 @@
 >=20
 >  # Kerberos5 authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mkerberos)
 > +.  include "../../mk/krb5.buildlink3.mk"
 >  CONFIGURE_ARGS+=3D	--with-krb5
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 >=20
 >  CHECK_BUILTIN.${KRB5_TYPE}:=3D	yes
 >  .include	"../../security/${KRB5_TYPE}/builtin.mk"
 > @@ -32,6 +34,9 @@
 >  CFLAGS_KRB5!=3D	${SH_KRB5_CONFIG} --cflags
 >  CPPFLAGS+=3D	${CFLAGS_KRB5}
 >  .	endif
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-krb5
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 >  .endif
 >=20
 >  # LDAP authentication for the PostgreSQL backend
 > Index: postgresql94/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql94/Makefile.common,v
 > retrieving revision 1.22
 > diff -u -r1.22 Makefile.common
 > --- postgresql94/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.22
 > +++ postgresql94/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql94/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql94/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql94/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql94/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql94
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql95/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql95/Makefile.common,v
 > retrieving revision 1.16
 > diff -u -r1.16 Makefile.common
 > --- postgresql95/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.16
 > +++ postgresql95/Makefile.common	14 Dec 2017 20:32:14 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.16 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.15 2017/11/13 09:35:46 adam 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+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql95/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql95/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql95/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql95/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql95
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql96/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql96/Makefile.common,v
 > retrieving revision 1.10
 > diff -u -r1.10 Makefile.common
 > --- postgresql96/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.10
 > +++ postgresql96/Makefile.common	14 Dec 2017 20:32:14 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.10 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.9 2017/11/13 09:35:46 adam 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+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql96/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql96/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql96/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql96/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:33 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql96
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 >=20
 > --=20
 > David A. Holland
 > dholland@netbsd.org
 >=20

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Fri, 15 Dec 2017 07:42:22 +0000

 On Thu, Dec 14, 2017 at 09:00:02PM +0000, Adam wrote:
  >  My idea was to make Kerberos support on by default, as all modern =
  >  systems should have Kerberos on board. If you are having problems with =
  >  it, it is fine for me to make it an option, but could you just, please, =
  >  make it a suggested option?

 Oops, I wasn't intending to change the default... that's why I post
 patches instead of just committing :-/

 -- 
 David A. Holland
 dholland@netbsd.org

From: "David A. Holland" <dholland@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/52787 CVS commit: pkgsrc/databases
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.

From: "David A. Holland" <dholland@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/52787 CVS commit: pkgsrc/databases
Date: Fri, 15 Dec 2017 16:57:25 +0000

 Module Name:	pkgsrc
 Committed By:	dholland
 Date:		Fri Dec 15 16:57:25 UTC 2017

 Modified Files:
 	pkgsrc/databases/postgresql92: Makefile
 	pkgsrc/databases/postgresql92-client: Makefile
 	pkgsrc/databases/postgresql92-contrib: Makefile
 	pkgsrc/databases/postgresql92-docs: Makefile
 	pkgsrc/databases/postgresql92-plperl: Makefile
 	pkgsrc/databases/postgresql92-plpython: Makefile
 	pkgsrc/databases/postgresql92-pltcl: Makefile
 	pkgsrc/databases/postgresql92-server: Makefile
 	pkgsrc/databases/postgresql93: Makefile
 	pkgsrc/databases/postgresql93-client: Makefile
 	pkgsrc/databases/postgresql93-contrib: Makefile
 	pkgsrc/databases/postgresql93-docs: Makefile
 	pkgsrc/databases/postgresql93-plperl: Makefile
 	pkgsrc/databases/postgresql93-plpython: Makefile
 	pkgsrc/databases/postgresql93-pltcl: Makefile
 	pkgsrc/databases/postgresql93-server: Makefile

 Log Message:
 Bump PKGREVISION of postgresql92 and postgresql93 packages (all to 1)
 for the PR 52787 options adjustment, as a precaution.


 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/postgresql92/Makefile
 cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql92-client/Makefile
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql92-contrib/Makefile
 cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql92-docs/Makefile
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql92-plperl/Makefile
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql92-plpython/Makefile
 cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/postgresql92-pltcl/Makefile
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql92-server/Makefile
 cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql93/Makefile
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/postgresql93-client/Makefile
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql93-contrib/Makefile
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql93-docs/Makefile
 cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/postgresql93-plperl/Makefile
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql93-plpython/Makefile
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/postgresql93-pltcl/Makefile
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql93-server/Makefile

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

State-Changed-From-To: open->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Fri, 15 Dec 2017 17:08:30 +0000
State-Changed-Why:
fixed.


>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.