From 79b173a0c5e7cbb610a510ab759af1de488196c5 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 4 Oct 2023 08:54:15 -0300 Subject: [PATCH] pymysql: add meta-package for sha256 support Replace the PYTHON3_PYMYSQL_SHA_PASSWORD_SUPPORT option, which is causing circular dependencies, with a meta-package that installs both python3-pymysql and python3-cryptography. Signed-off-by: Eneas U de Queiroz --- lang/python/pymysql/Config.in | 11 ----------- lang/python/pymysql/Makefile | 27 ++++++++++++++++++++++----- 2 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 lang/python/pymysql/Config.in diff --git a/lang/python/pymysql/Config.in b/lang/python/pymysql/Config.in deleted file mode 100644 index 0dfa265b09..0000000000 --- a/lang/python/pymysql/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -menu "Configuration" - depends on PACKAGE_python3-pymysql - -config PYTHON3_PYMYSQL_SHA_PASSWORD_SUPPORT - bool "Enable support for SHA password authentication" - help - To use “sha256_password” or “caching_sha2_password” for authentication - this symbol needs to be enabled, to also install python3-cryptography. - default n - -endmenu diff --git a/lang/python/pymysql/Makefile b/lang/python/pymysql/Makefile index d5187bd57e..025a97adce 100644 --- a/lang/python/pymysql/Makefile +++ b/lang/python/pymysql/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pymysql PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=PyMySQL PKG_HASH:=4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 @@ -24,23 +24,40 @@ include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk -define Package/python3-pymysql +define Package/python3-pymysql/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Pure Python MySQL Client URL:=https://pymysql.readthedocs.io/ - DEPENDS:=+python3 +PYTHON3_PYMYSQL_SHA_PASSWORD_SUPPORT:python3-cryptography endef -define Package/python3-pymysql/config - source "$(SOURCE)/Config.in" +define Package/python3-pymysql +$(call Package/python3-pymysql/Default) + DEPENDS:=+python3 endef define Package/python3-pymysql/description This package contains a pure-Python MySQL client library, based on PEP 249. endef +define Package/python3-pymysql-sha-pwd +$(call Package/python3-pymysql/Default) + TITLE+=w/ SHA256 password auth + DEPENDS:=+python3-pymysql $(RUST_ARCH_DEPENDS) +PACKAGE_python3-pymysql-sha-pwd:python3-cryptography +endef + +define Package/python3-pymysql-sha-pwd/description + This is a meta-package installing python3-pymysql and python3-cryptography + packages to be able to use pymysql with “sha256_password” or + “caching_sha2_password” for authentication. +endef + +define Package/python3-pymysql-sha-pwd/install + true +endef + $(eval $(call Py3Package,python3-pymysql)) $(eval $(call BuildPackage,python3-pymysql)) $(eval $(call BuildPackage,python3-pymysql-src)) +$(eval $(call BuildPackage,python3-pymysql-sha-pwd))