svn commit: r510794 - in head/security/py-gssapi: . files

[Steve Wills]

Author: swills
Date: Mon Sep  2 14:02:06 2019
New Revision: 510794
URL: https://svnweb.freebsd.org/changeset/ports/510794

Log:
  security/py-gssapi: Update to 1.6.1
  
  PR:		239786
  Submitted by:	John W. O'Brien <john at saltant.com> (maintainer)

Modified:
  head/security/py-gssapi/Makefile   (contents, props changed)
  head/security/py-gssapi/distinfo   (contents, props changed)
  head/security/py-gssapi/files/patch-setup.py   (contents, props changed)

Modified: head/security/py-gssapi/Makefile
==============================================================================
--- head/security/py-gssapi/Makefile	Mon Sep  2 13:59:19 2019	(r510793)
+++ head/security/py-gssapi/Makefile	Mon Sep  2 14:02:06 2019	(r510794)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gssapi
-DISTVERSION=	1.5.1
-PORTREVISION=	1
+DISTVERSION=	1.6.1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,6 +15,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PY_ENUM34}
 
+USES=	python
+USE_PYTHON=	distutils autoplist
+
 OPTIONS_RADIO=	GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_DEFAULT=	GSSAPI_BASE
@@ -23,9 +25,6 @@ OPTIONS_DEFAULT=	GSSAPI_BASE
 GSSAPI_BASE_USES=	gssapi ssl
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
-
-USES=	python
-USE_PYTHON=	distutils autoplist
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%KRB5CONFIG%%|${KRB5CONFIG}|' ${WRKSRC}/setup.py

Modified: head/security/py-gssapi/distinfo
==============================================================================
--- head/security/py-gssapi/distinfo	Mon Sep  2 13:59:19 2019	(r510793)
+++ head/security/py-gssapi/distinfo	Mon Sep  2 14:02:06 2019	(r510794)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533073767
-SHA256 (gssapi-1.5.1.tar.gz) = 76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc
-SIZE (gssapi-1.5.1.tar.gz) = 965050
+TIMESTAMP = 1565447441
+SHA256 (gssapi-1.6.1.tar.gz) = 99172a907ecc2d831390f389d3d2099863f48a16975f3c823f3ff3ad1579d5bf
+SIZE (gssapi-1.6.1.tar.gz) = 1042941

Modified: head/security/py-gssapi/files/patch-setup.py
==============================================================================
--- head/security/py-gssapi/files/patch-setup.py	Mon Sep  2 13:59:19 2019	(r510793)
+++ head/security/py-gssapi/files/patch-setup.py	Mon Sep  2 14:02:06 2019	(r510794)
@@ -1,28 +1,28 @@
---- setup.py.orig	2018-04-06 18:43:07 UTC
+--- setup.py.orig	2019-08-10 14:36:16 UTC
 +++ setup.py
-@@ -55,7 +55,7 @@ if link_args is None:
+@@ -84,7 +84,7 @@ if link_args is None:
      elif os.environ.get('MINGW_PREFIX'):
-         link_args = '-lgss'
+         link_args = ['-lgss']
      else:
--        link_args = get_output('krb5-config --libs gssapi')
-+        link_args = get_output('%%KRB5CONFIG%% --libs gssapi')
+-        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:
-@@ -63,14 +63,14 @@ if compile_args is None:
+@@ -97,14 +97,14 @@ if compile_args is None:
      elif os.environ.get('MINGW_PREFIX'):
-         compile_args = '-fPIC'
+         compile_args = ['-fPIC']
      else:
--        compile_args = get_output('krb5-config --cflags gssapi')
-+        compile_args = get_output('%%KRB5CONFIG%% --cflags gssapi')
+-        compile_args = shlex.split(get_output('krb5-config --cflags gssapi'))
++        compile_args = shlex.split(get_output('%%KRB5CONFIG%% --cflags gssapi'))
  
- link_args = link_args.split()
- compile_args = compile_args.split()
- 
  # add in the extra workarounds for different include structures
- 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))
+ 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))