From: Jeffery To <jeffery.to@gmail.com>
Date: Mon, 29 May 2023 08:49:23 +0000 (+0800)
Subject: bcrypt: Update to 3.2.2, rename source package
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3def783d3c72effdb87b1168315e51295cebc20f;p=feed%2Fpackages.git

bcrypt: Update to 3.2.2, rename source package

This is the last released version before bcrypt's Rust rewrite; this
package can be further updated after the OpenWrt Rust toolchain has
stablized.

This also renames the source package from bcrypt to python-bcrypt to
match other Python packages, and updates the list of dependencies.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---

diff --git a/lang/python/bcrypt/Makefile b/lang/python/bcrypt/Makefile
deleted file mode 100644
index 9e49ce333a..0000000000
--- a/lang/python/bcrypt/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bcrypt
-PKG_VERSION:=3.1.7
-PKG_RELEASE:=5
-
-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=libffi/host python-cffi/host  # cffi>=1.1
-
-include ../pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
-
-define Package/python3-bcrypt
-  SECTION:=lang
-  CATEGORY:=Languages
-  SUBMENU:=Python
-  TITLE:=Modern password hashing
-  URL:=https://github.com/pyca/bcrypt/
-  DEPENDS:= \
-	+python3 \
-	+python3-cffi \
-	+python3-six
-endef
-
-define Package/python3-bcrypt/description
-  Good password hashing for your software and your servers.
-endef
-
-$(eval $(call Py3Package,python3-bcrypt))
-$(eval $(call BuildPackage,python3-bcrypt))
-$(eval $(call BuildPackage,python3-bcrypt-src))
diff --git a/lang/python/python-bcrypt/Makefile b/lang/python/python-bcrypt/Makefile
new file mode 100644
index 0000000000..b3855a4734
--- /dev/null
+++ b/lang/python/python-bcrypt/Makefile
@@ -0,0 +1,39 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-bcrypt
+PKG_VERSION:=3.2.2
+PKG_RELEASE:=1
+
+PYPI_NAME:=bcrypt
+PKG_HASH:=433c410c2177057705da2a9f2cd01dd157493b2a7ac14c8593a16b3dab6b6bfb
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=libffi/host python-cffi/host  # cffi>=1.1
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-bcrypt
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Modern password hashing
+  URL:=https://github.com/pyca/bcrypt/
+  DEPENDS:=+python3-light +python3-cffi
+endef
+
+define Package/python3-bcrypt/description
+  Good password hashing for your software and your servers.
+endef
+
+$(eval $(call Py3Package,python3-bcrypt))
+$(eval $(call BuildPackage,python3-bcrypt))
+$(eval $(call BuildPackage,python3-bcrypt-src))