Mon Jan 1 16:19:57 2024 UTC (147d)
py-passlib: Access actual bcrypt version

Recent bcrypt package no longer has __about__ field, the version is directly
under __version__.

Noticed via:

 python3 -c 'import passlib.apache'

PKGREVISION++


(leot)
diff -r1.10 -r1.11 pkgsrc/security/py-passlib/Makefile
diff -r1.9 -r1.10 pkgsrc/security/py-passlib/distinfo
diff -r0 -r1.1 pkgsrc/security/py-passlib/patches/patch-passlib_handlers_bcrypt.py
cvs diff -r1.10 -r1.11 pkgsrc/security/py-passlib/Makefile (expand / switch to unified diff)

--- pkgsrc/security/py-passlib/Makefile 2022/01/04 20:54:43 1.10
+++ pkgsrc/security/py-passlib/Makefile 2024/01/01 16:19:57 1.11
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2022/01/04 20:54:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2024/01/01 16:19:57 leot Exp $
2 2
3DISTNAME= passlib-1.7.4 3DISTNAME= passlib-1.7.4
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= security python 6CATEGORIES= security python
7MASTER_SITES= ${MASTER_SITE_PYPI:=p/passlib/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/passlib/}
8 8
9MAINTAINER= kleink@NetBSD.org 9MAINTAINER= kleink@NetBSD.org
10HOMEPAGE= https://passlib.readthedocs.io/ 10HOMEPAGE= https://passlib.readthedocs.io/
11COMMENT= Comprehensive password hashing framework supporting over 30 schemes 11COMMENT= Comprehensive password hashing framework supporting over 30 schemes
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
15 15
16.include "../../lang/python/egg.mk" 16.include "../../lang/python/egg.mk"
17.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/security/py-passlib/distinfo (expand / switch to unified diff)

--- pkgsrc/security/py-passlib/distinfo 2021/10/26 11:17:48 1.9
+++ pkgsrc/security/py-passlib/distinfo 2024/01/01 16:19:57 1.10
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:17:48 nia Exp $ 1$NetBSD: distinfo,v 1.10 2024/01/01 16:19:57 leot Exp $
2 2
3BLAKE2s (passlib-1.7.4.tar.gz) = 7007ebe597e6b68cd7a180195629a5531b5a4f80374c00c1166561c030c45084 3BLAKE2s (passlib-1.7.4.tar.gz) = 7007ebe597e6b68cd7a180195629a5531b5a4f80374c00c1166561c030c45084
4SHA512 (passlib-1.7.4.tar.gz) = 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530 4SHA512 (passlib-1.7.4.tar.gz) = 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
5Size (passlib-1.7.4.tar.gz) = 689844 bytes 5Size (passlib-1.7.4.tar.gz) = 689844 bytes
 6SHA1 (patch-passlib_handlers_bcrypt.py) = f67386201a22d37dd502926a26d07741ded1daf1
File Added: pkgsrc/security/py-passlib/patches/patch-passlib_handlers_bcrypt.py
$NetBSD: patch-passlib_handlers_bcrypt.py,v 1.1 2024/01/01 16:19:57 leot Exp $

Version is available under __version__, __about__ field no longer
exists.

--- passlib/handlers/bcrypt.py.orig	2024-01-01 16:12:38.252193463 +0000
+++ passlib/handlers/bcrypt.py
@@ -617,7 +617,7 @@ class _BcryptBackend(_BcryptCommon):
         except ImportError: # pragma: no cover
             return False
         try:
-            version = _bcrypt.__about__.__version__
+            version = _bcrypt.__version__
         except:
             log.warning("(trapped) error reading bcrypt version", exc_info=True)
             version = '<unknown>'