git: e1632363cd4d - 2021Q3 - security/py-gssapi: Update to 1.6.14

[Tobias C. Berner]

The branch 2021Q3 has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1632363cd4d08ac173f1bfc0dd5fe9f0143d9b2

commit e1632363cd4d08ac173f1bfc0dd5fe9f0143d9b2
Author:     John W. O'Brien <john at saltant.com>
AuthorDate: 2021-07-14 12:34:52 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-07-14 12:37:16 +0000

    security/py-gssapi: Update to 1.6.14
    
    PR:             257009
    (cherry picked from commit 681050945814ea6d4330bf6227781b4673cfd66b)
---
 security/py-gssapi/Makefile             | 11 +++++------
 security/py-gssapi/distinfo             |  6 +++---
 security/py-gssapi/files/patch-setup.py | 28 ----------------------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/security/py-gssapi/Makefile b/security/py-gssapi/Makefile
index 53a98bc65cf2..b519ec4c3f34 100644
--- a/security/py-gssapi/Makefile
+++ b/security/py-gssapi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gssapi
-DISTVERSION=	1.6.9
+DISTVERSION=	1.6.14
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,9 +9,9 @@ COMMENT=	High-level and low-level Python bindings to GSSAPI C libraries
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>1.4.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}
 
+# Officially: 3.6, 3.7, 3.8, 3.9
 USES=	python:3.6+
 USE_PYTHON=	distutils autoplist
 
@@ -23,10 +23,9 @@ GSSAPI_BASE_USES=	gssapi ssl
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%KRB5CONFIG%%|${KRB5CONFIG}|' ${WRKSRC}/setup.py
+MAKE_ENV+=	GSSAPI_KRB5CONFIG=${KRB5CONFIG}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/raw/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -type f -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/security/py-gssapi/distinfo b/security/py-gssapi/distinfo
index 3c84977c4632..233e033de8b4 100644
--- a/security/py-gssapi/distinfo
+++ b/security/py-gssapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595860695
-SHA256 (gssapi-1.6.9.tar.gz) = 0b0aac7138abd3c6d2d8b8400e83933c04a811734456e387e3cb7d59ec4547b9
-SIZE (gssapi-1.6.9.tar.gz) = 1062048
+TIMESTAMP = 1625524611
+SHA256 (gssapi-1.6.14.tar.gz) = 1bb0a41c9985ad78b973aa3c9f1fa200b543013e3a1b2a24463c2e5d8d1afaf1
+SIZE (gssapi-1.6.14.tar.gz) = 1069988
diff --git a/security/py-gssapi/files/patch-setup.py b/security/py-gssapi/files/patch-setup.py
deleted file mode 100644
index 04cda5d6a94a..000000000000
--- a/security/py-gssapi/files/patch-setup.py
+++ /dev/null
@@ -1,28 +0,0 @@
---- setup.py.orig	2019-08-10 14:36:16 UTC
-+++ setup.py
-@@ -84,7 +84,7 @@ if link_args is None:
-     elif os.environ.get('MINGW_PREFIX'):
-         link_args = ['-lgss']
-     else:
--        link_args = shlex.split(get_output('krb5-config --libs gssapi'))
-+        link_args = shlex.split(get_output('%%KRB5CONFIG%% --libs gssapi'))
- 
- if compile_args is None:
-     if osx_has_gss_framework:
-@@ -97,14 +97,14 @@ if compile_args is None:
-     elif os.environ.get('MINGW_PREFIX'):
-         compile_args = ['-fPIC']
-     else:
--        compile_args = shlex.split(get_output('krb5-config --cflags gssapi'))
-+        compile_args = shlex.split(get_output('%%KRB5CONFIG%% --cflags gssapi'))
- 
- # add in the extra workarounds for different include structures
- if winkrb_path:
-     prefix = winkrb_path
- else:
-     try:
--        prefix = get_output('krb5-config gssapi --prefix')
-+        prefix = get_output('%%KRB5CONFIG%% gssapi --prefix')
-     except Exception:
-         print("WARNING: couldn't find krb5-config; assuming prefix of %s"
-               % str(sys.prefix))