Import of pkgsrc-2015Q2

security/py-bcrypt/Makefile

@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2014/11/04 21:41:20 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/25 13:48:50 wiz Exp $
 
-DISTNAME=	bcrypt-1.0.2
+DISTNAME=	bcrypt-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	python security
 MASTER_SITES=	https://pypi.python.org/packages/source/b/bcrypt/
 
 MAINTAINER=	rodent@NetBSD.org
-HOMEPAGE=	https://github.com/dstufft/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
+
+CONFLICTS+=	${PYPKGPREFIX}-py-bcrypt-[0-9]*
 
 .include "options.mk"
 

security/py-bcrypt/PLIST

@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/03 02:27:10 rodent Exp $
-${PYSITELIB}/_cffi_677459_d17cc0.so
+@comment $NetBSD: PLIST,v 1.3 2015/04/25 13:48:50 wiz Exp $
+${PYSITELIB}/_bcrypt_cffi.so
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -12,19 +12,19 @@ ${PYSITELIB}/bcrypt/__about__.pyo
 ${PYSITELIB}/bcrypt/__init__.py
 ${PYSITELIB}/bcrypt/__init__.pyc
 ${PYSITELIB}/bcrypt/__init__.pyo
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/LINKS
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/Makefile
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/PERFORMANCE
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/README
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt.3
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt_blowfish.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt_gensalt.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/crypt_gensalt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/glibc-2.1.3-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/glibc-2.14-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/glibc-2.3.6-crypt.diff
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/ow-crypt.h
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/wrapper.c
-${PYSITELIB}/bcrypt/crypt_blowfish-1.2/x86.S
+${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

security/py-bcrypt/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/05/03 02:27:10 rodent Exp $
+$NetBSD: distinfo,v 1.4 2015/04/25 13:49:49 wiz Exp $
 
-SHA1 (bcrypt-1.0.2.tar.gz) = 79ee90df35a3fb6a7b4c2675af3699b25918f09c
-RMD160 (bcrypt-1.0.2.tar.gz) = 7beeb9fc116418017143504f85c4eb0375b42fec
-Size (bcrypt-1.0.2.tar.gz) = 40386 bytes
+SHA1 (bcrypt-1.1.1.tar.gz) = 38d9973aeb5f0cea17ce01e457b1b8eafdf85797
+RMD160 (bcrypt-1.1.1.tar.gz) = be0cc2e808392001c183190db5825800da1ea5ee
+Size (bcrypt-1.1.1.tar.gz) = 39714 bytes
+SHA1 (patch-bcrypt_____init____.py) = cac83e359ca533abc1c60df20101ff71662baa5d

security/py-bcrypt/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/05/03 02:27:10 rodent Exp $
+# $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
@@ -8,5 +8,4 @@ PKG_SUGGESTED_OPTIONS+=	# blank
 
 .if !empty(PKG_OPTIONS:Mtests)
 DEPENDS+=		${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-DEPENDS+=		${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif

security/py-bcrypt/patches/patch-bcrypt_____init____.py

@@ -0,0 +1,16 @@
+$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):