pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/mariadb106-server mariadb106-server: provide...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d860632a931e
branches:  trunk
changeset: 377398:d860632a931e
user:      tm <tm%pkgsrc.org@localhost>
date:      Wed Apr 20 17:29:06 2022 +0000

description:
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.

diffstat:

 databases/mariadb106-server/Makefile   |   7 ++-----
 databases/mariadb106-server/options.mk |  22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r 5e6416b0815b -r d860632a931e databases/mariadb106-server/Makefile
--- a/databases/mariadb106-server/Makefile      Wed Apr 20 17:21:40 2022 +0000
+++ b/databases/mariadb106-server/Makefile      Wed Apr 20 17:29:06 2022 +0000
@@ -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 @@
 .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
 
diff -r 5e6416b0815b -r d860632a931e databases/mariadb106-server/options.mk
--- a/databases/mariadb106-server/options.mk    Wed Apr 20 17:21:40 2022 +0000
+++ b/databases/mariadb106-server/options.mk    Wed Apr 20 17:29:06 2022 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index