diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-auth/libnss-mysql/files | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-auth/libnss-mysql/files')
| -rw-r--r-- | sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch | 35 | ||||
| -rw-r--r-- | sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch | 21 |
2 files changed, 56 insertions, 0 deletions
diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch new file mode 100644 index 000000000000..b669d01c79f3 --- /dev/null +++ b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch @@ -0,0 +1,35 @@ +--- a/src/mysql.c ++++ b/src/mysql.c +@@ -196,6 +196,7 @@ + int retval; + sql_server_t *server = &conf.sql.server; + unsigned int port; ++ my_bool reconnect = 1; + + DENTER + +@@ -238,8 +239,9 @@ + DSRETURN (NSS_UNAVAIL) + } + ci.valid = ntrue; +- ci.link.reconnect = 0; /* Safety: We can't let MySQL assume socket is +- still valid; see _nss_mysql_validate_socket */ ++ /* Safety: We can't let MySQL assume socket is still valid; ++ see _nss_mysql_validate_socket */ ++ mysql_options(&ci.link, MYSQL_OPT_RECONNECT, &reconnect); + DSRETURN (NSS_SUCCESS) + } + _nss_mysql_log (LOG_ALERT, "Connection to server '%s' failed: %s", +--- a/src/nss_mysql.h ++++ b/src/nss_mysql.h +@@ -72,6 +72,10 @@ typedef nss_status_t NSS_STATUS; + /* Default initializers */ + #define DEF_TIMEOUT 3 + ++#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 ++#define my_bool bool ++#endif ++ + #ifdef DEBUG + void _nss_mysql_debug (char *fmt, ...); + #define DEBUG_FILE "/tmp/libnss-mysql-debug.log" diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch new file mode 100644 index 000000000000..3a85b601b7e6 --- /dev/null +++ b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch @@ -0,0 +1,21 @@ +--- libnss-mysql-1.5/acinclude.m4 ++++ libnss-mysql-1.5.sal/acinclude.m4 +@@ -80,6 +80,18 @@ + fi + done + ++dnl Test also $libdir path ++if test -f "$libdir/libmysqlclient.so" ++then ++ MYSQL_LIB_DIR="$libdir" ++ break ++fi ++if test -f "$libdir/mysql/libmysqlclient.so" ++then ++ MYSQL_LIB_DIR="$libdir/mysql" ++ break ++fi ++ + if test -n "$MYSQL_LIB_DIR" + then + AC_MSG_RESULT([$MYSQL_LIB_DIR]) |