gentoo resync : 25.11.2020

5 files changed, 3 insertions, 95 deletions

diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index e3524c792242..c175ed2c17e3 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,3 @@
-AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
-AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
-DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.2.ebuild 1025 BLAKE2B 4c85828eacc7f82d68ed6bc3e65b184aa7db65ed4875493c52a080eb36642fab3c4d30a1509e95be1f90d2ada2700a35d5ddc8279e66000affbc1fe6e2d8411d SHA512 650186ba94965305a4d5a3ae2087309a986aea413e7415e534e12091c5f63a07aee309bad6031dca399142598e4d798349e2823f071ccdcfbe2e42ca117cd71c
-MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
+DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
+EBUILD passlib-1.7.4.ebuild 931 BLAKE2B 24f5a43808adce071d8ae87b393e21278a927efd0533aff63ec107a0b290657a419b2974ddc51adb81d07eccb7ce9f51421f4ba2178195d497fb980549c2c8d6 SHA512 5d81b418e6c7c711c4b74509ab50801a484d21f3a437d893c945fb62a416ef763214a20038f1023acba3af1105cbbd466d2778c8470133e331481c7aabfc4f9a
+MISC metadata.xml 735 BLAKE2B 7e437ebacd95fbabf9484546eb1dccca655551a0d437c5e633b1504ee2fed7ec9de2ba0ce9eb6718f9eca7aec1858b2a5183e37802f7786b5bd4dc4e901f6109 SHA512 09d237f8d4b3ca0b5fc3d308ff07f8aa4bb5c1c66a26672aad42fbe9991e2a531f00f39447d5d9d5865b441754e52d09c7fb32bacbe35928bb93567559837ce2
diff --git a/dev-python/passlib/files/passlib-1.7.2-py39.patch b/dev-python/passlib/files/passlib-1.7.2-py39.patch
deleted file mode 100644
index c5dbc208a88b..000000000000
--- a/dev-python/passlib/files/passlib-1.7.2-py39.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/passlib/utils/__init__.py b/passlib/utils/__init__.py
-index 69b55e5..d18ec50 100644
---- a/passlib/utils/__init__.py
-+++ b/passlib/utils/__init__.py
-@@ -807,7 +807,13 @@ else:
- 
-             if isinstance(hash, bytes):
-                 hash = hash.decode("ascii")
--            result = _crypt(secret, hash)
-+            try:
-+                result = _crypt(secret, hash)
-+            except OSError:
-+                # new in py39 -- per https://bugs.python.org/issue39289,
-+                # crypt() now throws OSError for various things, mainly unknown hash formats
-+                # translating that to None for now (may revise safe_crypt behavior in future)
-+                return None
-             if PYPY and isinstance(result, bytes):
-                 result = result.decode("utf-8")
-             if not result or result[0:1] in _invalid_prefixes:
diff --git a/dev-python/passlib/files/passlib-1.7.2-pypy3.patch b/dev-python/passlib/files/passlib-1.7.2-pypy3.patch
deleted file mode 100644
index 304388196b23..000000000000
--- a/dev-python/passlib/files/passlib-1.7.2-pypy3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur a/passlib/utils/__init__.py b/passlib/utils/__init__.py
---- a/passlib/utils/__init__.py	2019-11-19 11:41:26.000000000 -0800
-+++ b/passlib/utils/__init__.py	2019-12-03 14:16:15.153791186 -0800
-@@ -57,7 +57,7 @@
- )
- from passlib.exc import ExpectedStringError
- from passlib.utils.compat import (add_doc, join_bytes, join_byte_values,
--                                  join_byte_elems, irange, imap, PY3, u,
-+                                  join_byte_elems, irange, imap, PY3, PYPY, u,
-                                   join_unicode, unicode, byte_elem_value, nextgetter,
-                                   unicode_or_bytes_types,
-                                   get_method_function, suppress_cause)
-@@ -776,23 +776,41 @@
-
-     if PY3:
-         def safe_crypt(secret, hash):
--            if isinstance(secret, bytes):
--                # Python 3's crypt() only accepts unicode, which is then
--                # encoding using utf-8 before passing to the C-level crypt().
--                # so we have to decode the secret.
--                orig = secret
-+            if not PYPY:
-+                if isinstance(secret, bytes):
-+                    # Python 3's crypt() only accepts unicode, which is then
-+                    # encoding using utf-8 before passing to the C-level crypt().
-+                    # so we have to decode the secret.
-+                    orig = secret
-+                    try:
-+                        secret = secret.decode("utf-8")
-+                    except UnicodeDecodeError:
-+                        return None
-+                    assert secret.encode("utf-8") == orig, \
-+                                "utf-8 spec says this can't happen!"
-+                if _NULL in secret:
-+                    raise ValueError("null character in secret")
-+            else:
-+                if isinstance(secret, str):
-+                    orig = secret
-+                    try:
-+                        secret = secret.encode("utf-8")
-+                    except UnicodeEncodeError:
-+                        return None
-+                    assert secret.decode("utf-8") == orig, \
-+                                "utf-8 spec says this can't happen!"
-                 try:
--                    secret = secret.decode("utf-8")
-+                    if _NULL in secret.decode("utf-8"):
-+                        raise ValueError("null character in secret")
-                 except UnicodeDecodeError:
-                     return None
--                assert secret.encode("utf-8") == orig, \
--                            "utf-8 spec says this can't happen!"
--            if _NULL in secret:
--                raise ValueError("null character in secret")
-+
-             if isinstance(hash, bytes):
-                 hash = hash.decode("ascii")
-             result = _crypt(secret, hash)
--            if not result or result[0] in _invalid_prefixes:
-+            if PYPY and isinstance(result, bytes):
-+                result = result.decode("utf-8")
-+            if not result or result[0:1] in _invalid_prefixes:
-                 return None
-             return result
-     else:
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index a4bd399c529a..ddfe55c4aac5 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -20,6 +20,5 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">passlib</remote-id>
-		<remote-id type="bitbucket">ecollins/passlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index b54d3c320eb5..b032c5ff2bdb 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -25,11 +25,6 @@ BDEPEND="
 		dev-python/scrypt[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}/passlib-1.7.2-pypy3.patch"
-	"${FILESDIR}/passlib-1.7.2-py39.patch"
-)
-
 distutils_enable_tests nose
 
 python_install_all() {