gentoo Easter resync : 12.04.2020

4 files changed, 74 insertions, 6 deletions

diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest
index 25cb47c23036..ffb11eeb701a 100644
--- a/sys-auth/libnss-mysql/Manifest
+++ b/sys-auth/libnss-mysql/Manifest
@@ -1,4 +1,6 @@
+AUX libnss-mysql-1.5_p20060915-mariadb10.2.patch 1066 BLAKE2B 0634a036b9d66f705387e6a88098fefee3dbe5b115dd8c9ba025025684838d9575ecfeccf8eb2326ece14a9644e6c050523207aa835e6e9cf2c6363373539bd7 SHA512 c0c4693810fba474fcd81e8af05bc17b2cc65d5c40885731956d00d85d736f32e87b673c9b920a190d4af7f1a9f95ebb66d6023f06fb525b8168110630d0c9dd
+AUX libnss-mysql-1.5_p20060915-multiarch.patch 401 BLAKE2B 9eb9deecf5f35e225fb2222c19e77f216ee9c22e27212e83d3da0d0daeae0ed2d737bc57417d563387d8afe84866469372eba954296cfc720ee0ffab8997f6c7 SHA512 297cbaddc1e05968590c19f6b86dfbe27af443c6afef665b0e5899bb0c74f5f8addc4235077f428f49a66a05f246afa77c1cef94c983cafbd61bd72cace6f895
 AUX libnss-mysql-1.5_p20060915-no-automagic-debug.diff 610 BLAKE2B 2c1473fca6eddd1cf66db23268ca24dc824b90a2b155202110329c39083daa696142c85cfe50613a7da356275743a797f066d60d2c80c9b330aaac5c24a65d30 SHA512 f8e33bd221dd1662933510ccf9648a152e78c38e6b0d155ae82c3eff49f0f621b3661aa07bf8d8d84b53e14a048ea6765561c16c38e07286cb93bee6a51a91e7
 DIST libnss-mysql-20060915.tgz 689970 BLAKE2B 147b5bb6c2fb53ca18f6db87054fa6665829671e9abdd7aa439287e301fc2d5ed4c9e2e5968ce6dacb4f74d86debb0c26d5cda56c6fe8f64e92ff3c9eba26a85 SHA512 fc92438b413b175b9bcead222013eab3bf63088a33ece0c4b6cc69edbefb9cc9145138ce786059acf502c2378a2af45588a5a506e45928b9ac600fe05e62e0c7
-EBUILD libnss-mysql-1.5_p20060915-r4.ebuild 1202 BLAKE2B 0368413dbc87874e23b57a30867880504c17257f15fb91afa312a745f196d2ec906f5b51d66d0422e15a0454728fadbb5c51e4a7cb7cb411f92c5be544369c1a SHA512 edc809099f8b10ece31fb9392002d045af79391601bfccc425fd5f27ea8ad83db06f182c06a13ddc7617029ca23bdddae8535dff3e5d58b1c437287fd36e0b93
+EBUILD libnss-mysql-1.5_p20060915-r5.ebuild 1361 BLAKE2B ed4ce0f76169b3cfc6228920d8c8c4b80b08356db0e7ab0c06984c80b8238adf72e37fbbac9f3885b51c05068f24315eb11108858d159abf1b89a8261d2fda60 SHA512 922814786802d3f07fb296413dffc3db5b601a8de689d0bae39d0d36b8585e4c3725d53b25962c70fffbf374d303920783af2eb37b472c08afdb7908528d546e
 MISC metadata.xml 325 BLAKE2B 894a3b266d3cba95496ca172f31fdd30d900bf174fef1f475c97b9ebd0b6c6e728c33b30741b17b8cd6e8d521a965392aa3ad484d2d3a6e1d8970aca40d61495 SHA512 b4755442527c73f4bd3fc338ad753c6067b94c9462f92bf36b6bef75ebe1befc397cc177ea3e4fe0477b1de767d977108ab6a89e01e18e2386cb23548682ec8b
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])
diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r4.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild
index 4857774aea75..090feab7685a 100644
--- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r4.ebuild
+++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -16,16 +16,25 @@ IUSE="debug"
 
 DEPEND="dev-db/mysql-connector-c:="
 RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${PN}"
 
 DOCS=( AUTHORS DEBUGGING FAQ INSTALL NEWS README THANKS
 	TODO UPGRADING ChangeLog
 )
-PATCHES=( "${FILESDIR}"/${P}-no-automagic-debug.diff )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-automagic-debug.diff
+	"${FILESDIR}"/${PN}-1.5_p20060915-multiarch.patch
+	"${FILESDIR}"/${PN}-1.5_p20060915-mariadb10.2.patch
+)
 
 src_prepare() {
 	default
-	eautoconf
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -41,10 +50,11 @@ src_configure() {
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 
 	newdoc sample/README README.sample
 
+	local subdir
 	for subdir in sample/{linux,freebsd,complex,minimal} ; do
 		docinto "${subdir}"
 		dodoc "${subdir}/"{*.sql,*.cfg}