diff options
author | Otto Kekäläinen <otto@kekalainen.net> | 2020-03-27 01:47:53 +0200 |
---|---|---|
committer | Otto Kekäläinen <otto@kekalainen.net> | 2020-04-13 14:33:50 +0300 |
commit | 4bc31a904f22290801075deed949733ba2133974 (patch) | |
tree | 0443615d38816cd6393bea81a5b9cdeebbc6dee3 /debian | |
parent | 91e79dff54c00bc46c66c8e0fb73da8552e047d9 (diff) | |
download | mariadb-git-4bc31a904f22290801075deed949733ba2133974.tar.gz |
MDEV-22053: Pass INSTALL_LAYOUT "DEB" correctly to CONC (libmariadb)
As this was missing, the libmariadb/install.cmake section for Debian
builds was not triggered at all, and existing fixes to make the
Debian paths correct did not apply.
Update libmariadb3 paths in Debian packaging after MariaDB Connector C
3.1.8 upgrade
Also now include caching_sha2_password.so which was previously omitted.
Keep old libmariadbclient.a as symbolic link for backwards compatibility.
Closes: CONC-304
Related: CONC-456, MDEV-22150
Diffstat (limited to 'debian')
-rw-r--r-- | debian/libmariadb-dev.install | 1 | ||||
-rw-r--r-- | debian/libmariadb3.install | 9 | ||||
-rw-r--r-- | debian/mariadb-plugin-gssapi-client.install | 2 | ||||
-rwxr-xr-x | debian/rules | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index d4d5f50ba87..dcc002c936f 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,5 +1,6 @@ usr/bin/mariadb_config usr/include/mariadb +usr/lib/*/libmariadb.a usr/lib/*/libmariadb.so usr/lib/*/libmariadbclient.a usr/lib/*/libmariadbclient.so diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 8636166a493..5cd0aad00e0 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,5 +1,6 @@ usr/lib/*/libmariadb.so.* -usr/lib/mysql/plugin/client_ed25519.so -usr/lib/mysql/plugin/dialog.so -usr/lib/mysql/plugin/mysql_clear_password.so -usr/lib/mysql/plugin/sha256_password.so +usr/lib/*/libmariadb3/plugin/caching_sha2_password.so +usr/lib/*/libmariadb3/plugin/client_ed25519.so +usr/lib/*/libmariadb3/plugin/dialog.so +usr/lib/*/libmariadb3/plugin/mysql_clear_password.so +usr/lib/*/libmariadb3/plugin/sha256_password.so diff --git a/debian/mariadb-plugin-gssapi-client.install b/debian/mariadb-plugin-gssapi-client.install index 5a089e9352e..4486070ffa8 100644 --- a/debian/mariadb-plugin-gssapi-client.install +++ b/debian/mariadb-plugin-gssapi-client.install @@ -1 +1 @@ -usr/lib/mysql/plugin/auth_gssapi_client.so +usr/lib/*/libmariadb3/plugin/auth_gssapi_client.so diff --git a/debian/rules b/debian/rules index d8ab4c5185b..3d453c55ce6 100755 --- a/debian/rules +++ b/debian/rules @@ -143,6 +143,9 @@ endif ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 + # Install libmariadbclient.a compatibility link + ln -s libmariadb.a $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.a + override_dh_fixperms: dh_fixperms chmod 04755 debian/mariadb-server-10.5/usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool |