CVS commit: pkgsrc/databases/mariadb106-client

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

Module Name:    pkgsrc
Committed By:   tm
Date:           Thu Apr 14 10:55:33 UTC 2022

Modified Files:
        pkgsrc/databases/mariadb106-client: distinfo
Added Files:
        pkgsrc/databases/mariadb106-client/patches:
            patch-plugin_auth__pam_testing_pam__mariadb__mtr.c

Log Message:
mariadb106: Build fix for Solaris / SmartOS by re-order includes

On Solaris / SmartOS it's required to provide the correct order of
including pam_appl.h before pam_modules.h.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb106-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c

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-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.7 pkgsrc/databases/mariadb106-client/distinfo:1.8
--- pkgsrc/databases/mariadb106-client/distinfo:1.7     Wed Apr  6 18:04:51 2022
+++ pkgsrc/databases/mariadb106-client/distinfo Thu Apr 14 10:55:32 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2022/04/06 18:04:51 brook Exp $
+$NetBSD: distinfo,v 1.8 2022/04/14 10:55:32 tm Exp $
 
 BLAKE2s (mariadb-10.6.7.tar.gz) = 5d4b482e6e06b337ff8180a2fe8b94b8e9f1cc1cea6b7dfe89eaa05c56eab701
 SHA512 (mariadb-10.6.7.tar.gz) = 2d26f56ea5f39b800a6f279c8411d4091b4f4d3acbf3ea1864068328d34a1437e7c46c08d3772009357fd89602e58f214266038e177c0a4fac914a5e5d01e3e6
@@ -9,6 +9,7 @@ SHA1 (patch-client_CMakeLists.txt) = 8fd
 SHA1 (patch-client_mysql.cc) = f49f942b765ccf427e9bcc9e4e0045ec74c94815
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
+SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 6062cfbb200af5b95ac05e4759f08b414f63db3d
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f

Added files:

Index: pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c
diff -u /dev/null pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c:1.1
--- /dev/null   Thu Apr 14 10:55:33 2022
+++ pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c       Thu Apr 14 10:55:33 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugin_auth__pam_testing_pam__mariadb__mtr.c,v 1.1 2022/04/14 10:55:33 tm Exp $
+
+Re-order include for pam_modules dependency (pam_appl.h) especially on SunOS.
+
+--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig     2021-11-05 20:03:30.000000000 +0000
++++ plugin/auth_pam/testing/pam_mariadb_mtr.c
+@@ -10,8 +10,8 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include <security/pam_modules.h>
+ #include <security/pam_appl.h>
++#include <security/pam_modules.h>
+ 
+ #define N 3
+