Merge pull request #248 from r-dbi/rwinlib

- Upgrade to mariadb-connector-c 3.2.5 on Windows, with built-in support for the `caching_sha2_password` plugin (#134, #248, @jeroen).

.github/workflows/custom/before-install/action.yml

@@ -8,6 +8,16 @@ runs:
         echo 'RCMDCHECK_ERROR_ON="warning"' | tee -a $GITHUB_ENV
       shell: bash
 
+    - name: Clean up broken mysql apt
+      # FIXME: Remove if package becomes unavailable
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        if [ $(lsb_release --short --codename) == 'focal' ]; then
+          sudo apt-get install mysql-common=5.8+1.0.5ubuntu2 --allow-downgrades
+        fi
+      shell: bash
+
     - name: Install and check MariaDB client (macOS)
       if: runner.os == 'macOS' && ((matrix.config.mysql_client == '' ) || ! matrix.config.mysql_client)
       run: |

src/Makevars.ucrt

@@ -1,2 +1,3 @@
 CRT=-ucrt
+TLS_LIBS=-lbcrypt
 include Makevars.win

src/Makevars.win

@@ -1,10 +1,11 @@
-VERSION = 3.1.11
+VERSION = 3.2.5
 RWINLIB = ../windows/libmariadbclient-$(VERSION)
+TLS_LIBS ?= -lssl -lcrypto
 
 CXX_STD=CXX11
 PKG_CPPFLAGS = -I$(RWINLIB)/include/mariadb -Ivendor -DRCPP_DEFAULT_INCLUDE_CALL=false -DRCPP_USING_UTF8_ERROR_STRING -DBOOST_NO_AUTO_PTR
 PKG_LIBS= -L$(RWINLIB)/lib${R_ARCH}${CRT} \
-	-lmariadbclient -lssl -lcrypto -lz -lsecur32 -lshlwapi -lcrypt32 -lgdi32 -lws2_32 -pthread
+	-lmariadbclient $(TLS_LIBS) -lz -lsecur32 -lshlwapi -lcrypt32 -lgdi32 -lws2_32 -pthread
 
 # Necessary, so that the behavior of make called without arguments
 # is not changed: