From 9c56b2de11e5cec0fa936021d8de86d52658ad6a Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 27 Jan 2019 16:20:18 +0100 Subject: [PATCH 1/2] mariadb: move 50-client.cnf to lib pkg 50-client.cnf is used by the client library, so it should be installed with the library. This commit moves the configuration file to the correct package and updates its depend (50-client.cnf is sourced by my.cnf from mariadb-common). Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 6ee7894b4..2b3f0aa96 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -211,12 +211,17 @@ endef define Package/libmariadb $(call Package/libmariadb/Default) - DEPENDS:=$(MARIADB_COMMON_DEPENDS) + DEPENDS:=+mariadb-common \ + $(MARIADB_COMMON_DEPENDS) TITLE:=MariaDB database client library MENU:=1 PROVIDES:=libmariadbclient libmysqlclient libmysqlclient-r endef +define Package/libmariadb/conffiles +$(CONF_DIR)/conf.d/50-client.cnf +endef + define Package/libmariadb/description $(call Package/mariadb/description/Default) @@ -256,7 +261,6 @@ define Package/mariadb-client-base endef define Package/mariadb-client-base/conffiles -$(CONF_DIR)/conf.d/50-client.cnf $(CONF_DIR)/conf.d/50-mysql-clients.cnf endef @@ -513,11 +517,13 @@ define Build/InstallDev endef define Package/libmariadb/install + $(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d $(INSTALL_DIR) $(1)$(PLUGIN_DIR) $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{mariadb,mysqlclient}*.so* $(1)/usr/lib $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/dialog.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/mysql_clear_password.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/sha256_password.so $(1)$(PLUGIN_DIR) + $(INSTALL_CONF) conf/50-client.cnf $(1)$(CONF_DIR)/conf.d endef define Package/mariadb-client/install @@ -531,7 +537,6 @@ endef define Package/mariadb-client-base/install $(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d - $(INSTALL_CONF) conf/50-client.cnf $(1)$(CONF_DIR)/conf.d $(INSTALL_CONF) conf/50-mysql-clients.cnf $(1)$(CONF_DIR)/conf.d endef From db9ceb300ba4a73df351f1da313faae396de9f29 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 27 Jan 2019 16:26:52 +0100 Subject: [PATCH 2/2] mariadb: bump to 10.2.21 Version bump. Adds new upstream plugin caching_sha2_password.so to the client lib package. Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 2b3f0aa96..6a987d1c0 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.2.19 -PKG_RELEASE:=4 +PKG_VERSION:=10.2.21 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := \ @@ -18,7 +18,7 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727 +PKG_HASH:=637f0808b65ec06902897a2f885a60377828d019d35802402dca541f8113536c PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_LICENSE_FILES:=COPYING libmariadb/COPYING.LIB @@ -520,6 +520,7 @@ define Package/libmariadb/install $(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d $(INSTALL_DIR) $(1)$(PLUGIN_DIR) $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{mariadb,mysqlclient}*.so* $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/caching_sha2_password.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/dialog.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/mysql_clear_password.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/sha256_password.so $(1)$(PLUGIN_DIR)