CVS commit: pkgsrc/databases/postgresql16

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Aug 15 18:54:24 UTC 2024

Modified Files:
        pkgsrc/databases/postgresql16: options.mk

Log Message:
postgresql16: disable gssapi by default on Linux

Since it causes conflicts between heimdal and mit-krb5 in the default
pkgsrc configuration. Add some comments to explain why the normal
krb5 selection logic is not in use here.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql16/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/postgresql16/options.mk
diff -u pkgsrc/databases/postgresql16/options.mk:1.5 pkgsrc/databases/postgresql16/options.mk:1.6
--- pkgsrc/databases/postgresql16/options.mk:1.5        Sat Mar 16 23:42:39 2024
+++ pkgsrc/databases/postgresql16/options.mk    Thu Aug 15 18:54:24 2024
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2024/03/16 23:42:39 nia Exp $
+# $NetBSD: options.mk,v 1.6 2024/08/15 18:54:24 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql16
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
-PKG_SUGGESTED_OPTIONS= gssapi icu nls lz4
+PKG_SUGGESTED_OPTIONS= icu nls lz4
+.if ${OPSYS} != "Linux"
+PKG_SUGGESTED_OTIONS+= gssapi
+.endif
 
 PLIST_VARS+=           gssapi llvm nls
 
@@ -25,6 +28,9 @@ CONFIGURE_ARGS+=      --enable-dtrace
 # GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mgssapi)
 BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.11  # gss_store_cred_into
+# This should be ../mk/krb5.buildlink3.mk. However, that may select
+# security/heimdal as the Kerberos implementation, and it doesn't have
+# gss_store_cred_into().
 .  include "../../security/mit-krb5/buildlink3.mk"
 PLIST.gssapi=          yes
 CONFIGURE_ARGS+=       --with-gssapi