CVS commit: pkgsrc/databases/mariadb106-server

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Wed Apr 20 17:29:07 UTC 2022

Modified Files:
        pkgsrc/databases/mariadb106-server: Makefile options.mk

Log Message:
mariadb106-server: provide auth-pam option

Provide a flexible way to enable auth_pam authentication plugin for
mariadb. Because older Solaris versions (<11.2 SRU 10) lack
getgrouplist() this option is disabled on the OS variant.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb106-server/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/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.13 pkgsrc/databases/mariadb106-server/Makefile:1.14
--- pkgsrc/databases/mariadb106-server/Makefile:1.13    Mon Apr 18 19:10:37 2022
+++ pkgsrc/databases/mariadb106-server/Makefile Wed Apr 20 17:29:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/04/18 19:10:37 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/20 17:29:06 tm Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 PKGREVISION=   1
@@ -13,11 +13,8 @@ BUILD_DEFS+=         VARBASE
 .include "../../mk/bsd.fast.prefs.mk"
 
 # mariabackup is not built on SunOS due to symbol resolution problems
-# auth_pam is not built on SunOS due to lack of getgrouplist
-
-PLIST_VARS+=           auth_pam mariabackup
+PLIST_VARS+=           mariabackup
 .if ${OPSYS} != "SunOS"
-PLIST.auth_pam=                yes
 PLIST.mariabackup=     yes
 .endif
 

Index: pkgsrc/databases/mariadb106-server/options.mk
diff -u pkgsrc/databases/mariadb106-server/options.mk:1.2 pkgsrc/databases/mariadb106-server/options.mk:1.3
--- pkgsrc/databases/mariadb106-server/options.mk:1.2   Wed Aug  4 16:01:28 2021
+++ pkgsrc/databases/mariadb106-server/options.mk       Wed Apr 20 17:29:06 2022
@@ -1,16 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2021/08/04 16:01:28 nia Exp $
+# $NetBSD: options.mk,v 1.3 2022/04/20 17:29:06 tm Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
 #PKG_SUPPORTED_OPTIONS+=       columnstore
 
-PKG_SUPPORTED_OPTIONS+=        embedded-server lzo lz4 oqgraph rocksdb
-PKG_SUPPORTED_OPTIONS+=        snappy ssl zstd
+PKG_SUPPORTED_OPTIONS+=        auth-pam embedded-server lzo lz4 oqgraph
+PKG_SUPPORTED_OPTIONS+=        rocksdb snappy ssl zstd
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 PKG_SUGGESTED_OPTIONS= ssl
 
+# auth_pam is not built on Solaris < 11.2 due to lack of getgrouplist
+# but will work on illumos
+.if ${OS_VARIANT} != "Solaris"
+PKG_SUGGESTED_OPTIONS+=        auth-pam
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcolumnstore)
@@ -90,3 +96,13 @@ CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=ON
 .else
 CMAKE_ARGS+=   -DWITH_ROCKSDB_zstd=OFF
 .endif
+
+PLIST_VARS+=   auth_pam
+.if !empty(PKG_OPTIONS:Mauth-pam)
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM=YES
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM_V1=YES
+PLIST.auth_pam=        yes
+.else
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM=NO
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM_V1=NO
+.endif