Re: pkg/52787 (postgresql92 ignores kerberos option)

To: adam%NetBSD.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost, dholland%NetBSD.org@localhost
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
From: David Holland <dholland-pbugs%netbsd.org@localhost>
Date: Thu, 14 Dec 2017 20:40:01 +0000 (UTC)
The following reply was made to PR pkg/52787; it has been noted by GNATS.

From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
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@localhost
Prev by Date: Re: pkg/52817: devel/lldb build on i386 fails with undefined reference
Next by Date: Re: pkg/52787 (postgresql92 ignores kerberos option)
Previous by Thread: Re: pkg/52787 (postgresql92 ignores kerberos option)
Next by Thread: Re: pkg/52787 (postgresql92 ignores kerberos option)
Indexes:
Home | Main Index | Thread Index | Old Index