[pkgsrc/trunk]: pkgsrc/security/py-bcrypt py-bcrypt: update to 3.1.3

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c008d81ce672
branches:  trunk
changeset: 369922:c008d81ce672
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Oct 08 08:58:21 2017 +0000

description:
py-bcrypt: update to 3.1.3

3.1.3
Fixed a compilation issue on Solaris.
Added a warning when using too few rounds with kdf.

diffstat:

 security/py-bcrypt/Makefile                             |  17 +++++--------
 security/py-bcrypt/PLIST                                |  20 +---------------
 security/py-bcrypt/distinfo                             |  11 ++++-----
 security/py-bcrypt/options.mk                           |  11 ---------
 security/py-bcrypt/patches/patch-bcrypt_____init____.py |  16 -------------
 5 files changed, 14 insertions(+), 61 deletions(-)

diffs (116 lines):

diff -r a1111ee5ecfe -r c008d81ce672 security/py-bcrypt/Makefile
--- a/security/py-bcrypt/Makefile       Sun Oct 08 08:51:02 2017 +0000
+++ b/security/py-bcrypt/Makefile       Sun Oct 08 08:58:21 2017 +0000
@@ -1,23 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2017/09/16 19:27:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/10/08 08:58:21 adam Exp $
 
-DISTNAME=      bcrypt-1.1.1
+DISTNAME=      bcrypt-3.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
-CATEGORIES=    python security
+CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/bcrypt/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/pyca/bcrypt/
+HOMEPAGE=      https://github.com/pyca/bcrypt
 COMMENT=       Modern password hashing for your software and your servers
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
-DEPENDS+=      ${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
-DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.1:../../devel/py-cffi
+DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 CONFLICTS+=    ${PYPKGPREFIX}-py-bcrypt-[0-9]*
 
-.include "options.mk"
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a1111ee5ecfe -r c008d81ce672 security/py-bcrypt/PLIST
--- a/security/py-bcrypt/PLIST  Sun Oct 08 08:51:02 2017 +0000
+++ b/security/py-bcrypt/PLIST  Sun Oct 08 08:58:21 2017 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/04/25 13:48:50 wiz Exp $
-${PYSITELIB}/_bcrypt_cffi.so
+@comment $NetBSD: PLIST,v 1.4 2017/10/08 08:58:21 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -12,19 +11,4 @@
 ${PYSITELIB}/bcrypt/__init__.py
 ${PYSITELIB}/bcrypt/__init__.pyc
 ${PYSITELIB}/bcrypt/__init__.pyo
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/LINKS
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/Makefile
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/PERFORMANCE
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/README
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt.3
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt_blowfish.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt_blowfish.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt_gensalt.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/crypt_gensalt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/glibc-2.1.3-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/glibc-2.14-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/glibc-2.3.6-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/ow-crypt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/wrapper.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.3/x86.S
+${PYSITELIB}/bcrypt/_bcrypt.abi3.so
diff -r a1111ee5ecfe -r c008d81ce672 security/py-bcrypt/distinfo
--- a/security/py-bcrypt/distinfo       Sun Oct 08 08:51:02 2017 +0000
+++ b/security/py-bcrypt/distinfo       Sun Oct 08 08:58:21 2017 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:18:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/10/08 08:58:21 adam Exp $
 
-SHA1 (bcrypt-1.1.1.tar.gz) = 38d9973aeb5f0cea17ce01e457b1b8eafdf85797
-RMD160 (bcrypt-1.1.1.tar.gz) = be0cc2e808392001c183190db5825800da1ea5ee
-SHA512 (bcrypt-1.1.1.tar.gz) = b6388e69dfe4a7a40a304745607fe23fa2cd6c0f874b09c39849958f4d4c77cd5387c2baa79de69e8809c0df8841b085885c83f00bc13ee5a08b3af6c04d721f
-Size (bcrypt-1.1.1.tar.gz) = 39714 bytes
-SHA1 (patch-bcrypt_____init____.py) = cac83e359ca533abc1c60df20101ff71662baa5d
+SHA1 (bcrypt-3.1.3.tar.gz) = e952d64761390712fdd035d6dcb36dee98ee8235
+RMD160 (bcrypt-3.1.3.tar.gz) = efcd8f0eb67dbcbf2e88f70ec3e2c6dd646dfb8d
+SHA512 (bcrypt-3.1.3.tar.gz) = 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c
+Size (bcrypt-3.1.3.tar.gz) = 40806 bytes
diff -r a1111ee5ecfe -r c008d81ce672 security/py-bcrypt/options.mk
--- a/security/py-bcrypt/options.mk     Sun Oct 08 08:51:02 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2015/04/06 13:09:53 rodent Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.py-bcrypt
-PKG_SUPPORTED_OPTIONS= tests
-PKG_SUGGESTED_OPTIONS+=        # blank
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mtests)
-DEPENDS+=              ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-.endif
diff -r a1111ee5ecfe -r c008d81ce672 security/py-bcrypt/patches/patch-bcrypt_____init____.py
--- a/security/py-bcrypt/patches/patch-bcrypt_____init____.py   Sun Oct 08 08:51:02 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-bcrypt_____init____.py,v 1.2 2015/04/25 13:49:49 wiz Exp $
-
-Fix soname so cffi doesn't invent one for each python version + platform.
-
---- bcrypt/__init__.py.orig    2015-03-14 02:18:59.000000000 +0000
-+++ bcrypt/__init__.py
-@@ -50,7 +50,8 @@ def _create_modulename(cdef_sources, sou
-     k1 = k1.lstrip('0x').rstrip('L')
-     k2 = hex(binascii.crc32(key[1::2]) & 0xffffffff)
-     k2 = k2.lstrip('0').rstrip('L')
--    return '_bcrypt_cffi_{0}{1}'.format(k1, k2)
-+    #return '_bcrypt_cffi_{0}{1}'.format(k1, k2)
-+    return '_bcrypt_cffi'
- 
- 
- def _compile_module(*args, **kwargs):