From 926639171e6c27a087fd7cbd071b48b3100bfd0c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 8 Sep 2021 07:19:52 +0000
Subject: [PATCH] now that py-paramiko is py3-only, we can update py-bcrypt to
 3.2.0 which no longer supports py2.

---
 devel/quirks/Makefile        | 4 ++--
 devel/quirks/files/Quirks.pm | 3 ++-
 security/Makefile            | 3 +--
 security/py-bcrypt/Makefile  | 7 +++----
 security/py-bcrypt/distinfo  | 4 ++--
 security/py-bcrypt/pkg/PLIST | 6 ++++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index 50774b8928a..ca1f372c4a1 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1292 2021/09/02 13:07:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.1293 2021/09/08 07:19:52 sthen Exp $
 
 COMMENT =	exceptions to pkg_add rules
 CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-4.45
+PKGNAME =	quirks-4.46
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 43b24e12414..139792f51c6 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: Quirks.pm,v 1.1308 2021/09/02 13:07:32 sthen Exp $
+# $OpenBSD: Quirks.pm,v 1.1309 2021/09/08 07:19:52 sthen Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
@@ -487,6 +487,7 @@ my $stem_extensions = {
 	'py-paramiko' => 'py3-paramiko',
 	'py-nxos' => 'py3-nxos',
 	'py-scp' => 'py3-scp',
+	'py-bcrypt' => 'py3-bcrypt',
 };
 
 my $obsolete_reason = {};
diff --git a/security/Makefile b/security/Makefile
index 69a76932780..534f7028e80 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.631 2021/09/02 13:07:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.632 2021/09/08 07:19:52 sthen Exp $
 
      SUBDIR =
      SUBDIR += ADMsnmp
@@ -278,7 +278,6 @@
      SUBDIR += py-axolotl,python3
      SUBDIR += py-axolotl-curve25519
      SUBDIR += py-axolotl-curve25519,python3
-     SUBDIR += py-bcrypt
      SUBDIR += py-bcrypt,python3
      SUBDIR += py-cryptodome
      SUBDIR += py-cryptodome,python3
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index 231e4f2af7e..7a12b7f8cbe 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2021/05/21 19:50:34 kmos Exp $
+# $OpenBSD: Makefile,v 1.24 2021/09/08 07:19:52 sthen Exp $
 
 COMMENT=	bcrypt blowfish password hashing for Python
 
-MODPY_EGG_VERSION= 3.1.7
+MODPY_EGG_VERSION= 3.2.0
 DISTNAME=	bcrypt-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
-REVISION=	2
 
 CATEGORIES=	security
 
@@ -19,7 +18,7 @@ MODPY_PI=	Yes
 MODPY_SETUPTOOLS= Yes
 
 FLAVORS=        python3
-FLAVOR?=
+FLAVOR=		python3
 
 RUN_DEPENDS=	devel/py-cffi${MODPY_FLAVOR} \
 		devel/py-six${MODPY_FLAVOR}
diff --git a/security/py-bcrypt/distinfo b/security/py-bcrypt/distinfo
index d91cfcc6977..1473aea6c49 100644
--- a/security/py-bcrypt/distinfo
+++ b/security/py-bcrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bcrypt-3.1.7.tar.gz) = CwBpx1LsFBcsX3ggjxhj161nVab65v527CyA0TvkHkI=
-SIZE (bcrypt-3.1.7.tar.gz) = 42512
+SHA256 (bcrypt-3.2.0.tar.gz) = W5PBcm5QqToDPDblyn/c0ppcc5WvUKaJL12efGz7+yk=
+SIZE (bcrypt-3.2.0.tar.gz) = 42416
diff --git a/security/py-bcrypt/pkg/PLIST b/security/py-bcrypt/pkg/PLIST
index 178daa0ec5b..0bd6b4d0eea 100644
--- a/security/py-bcrypt/pkg/PLIST
+++ b/security/py-bcrypt/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2016/10/29 18:25:56 danj Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/09/08 07:19:52 sthen Exp $
+@pkgpath security/py-bcrypt
 lib/python${MODPY_VERSION}/site-packages/bcrypt/
 lib/python${MODPY_VERSION}/site-packages/bcrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/bcrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -12,4 +13,5 @@ lib/python${MODPY_VERSION}/site-packages/bcrypt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bcrypt/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/bcrypt/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bcrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bcrypt/_bcrypt${MODPY_ABI3SO}.so
+@so lib/python${MODPY_VERSION}/site-packages/bcrypt/_bcrypt${MODPY_ABI3SO}.so
+lib/python${MODPY_VERSION}/site-packages/bcrypt/py.typed