Merge upstream pull request #52 from kwlzn/kwlzn/none_principal_fix Allow `authGSSClientInit` principal kwarg to be None.diff -r1.1 -r1.2 pkgsrc/security/py-kerberos/Makefile
(markd)
@@ -1,15 +1,16 @@ | @@ -1,15 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.1 2016/06/09 02:06:18 markd Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2017/04/23 05:35:27 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= kerberos-1.2.4 | 3 | DISTNAME= kerberos-1.2.4 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= security | 6 | CATEGORIES= security | |
6 | MASTER_SITES= ${MASTER_SITE_PYPI:=k/kerberos/} | 7 | MASTER_SITES= ${MASTER_SITE_PYPI:=k/kerberos/} | |
7 | 8 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= https://svn.calendarserver.org/wiki/PyKerberos | 10 | HOMEPAGE= https://svn.calendarserver.org/wiki/PyKerberos | |
10 | COMMENT= Python Kerberos implementation | 11 | COMMENT= Python Kerberos implementation | |
11 | LICENSE= apache-2.0 | 12 | LICENSE= apache-2.0 | |
12 | 13 | |||
13 | .include "../../lang/python/egg.mk" | 14 | .include "../../lang/python/egg.mk" | |
14 | .include "../../mk/krb5.buildlink3.mk" | 15 | .include "../../mk/krb5.buildlink3.mk" | |
15 | .include "../../mk/bsd.pkg.mk" | 16 | .include "../../mk/bsd.pkg.mk" |
@@ -1,11 +1,12 @@ | @@ -1,11 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2016/06/09 02:06:18 markd Exp $ | 1 | $NetBSD: distinfo,v 1.2 2017/04/23 05:35:27 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (kerberos-1.2.4.tar.gz) = f9fcffd23b6082d71c2a073193ec5bb7547db25b | 3 | SHA1 (kerberos-1.2.4.tar.gz) = f9fcffd23b6082d71c2a073193ec5bb7547db25b | |
4 | RMD160 (kerberos-1.2.4.tar.gz) = e87105b0bc447fb06f6d81b5aab063326147345f | 4 | RMD160 (kerberos-1.2.4.tar.gz) = e87105b0bc447fb06f6d81b5aab063326147345f | |
5 | SHA512 (kerberos-1.2.4.tar.gz) = 5e1e7b3b9e421d15c18b67c09127de957ac193315c8e2e5d417c0f9fb4ba0fe5ff2f7654bd675ffd87e3d2f588788041083f130a13c8f6112a23d778a3903b62 | 5 | SHA512 (kerberos-1.2.4.tar.gz) = 5e1e7b3b9e421d15c18b67c09127de957ac193315c8e2e5d417c0f9fb4ba0fe5ff2f7654bd675ffd87e3d2f588788041083f130a13c8f6112a23d778a3903b62 | |
6 | Size (kerberos-1.2.4.tar.gz) = 19615 bytes | 6 | Size (kerberos-1.2.4.tar.gz) = 19615 bytes | |
7 | SHA1 (patch-setup.py) = a9dbfbba526c9c82f2c3180e3469fc5040362ffe | 7 | SHA1 (patch-setup.py) = a9dbfbba526c9c82f2c3180e3469fc5040362ffe | |
8 | SHA1 (patch-src_kerberos.c) = d29eff4a13eacc02bab54dfa38c2e7e384cba86a | |||
8 | SHA1 (patch-src_kerberosbasic.h) = 7afb1da96ef6ecfcfa619ad8e6235e81d1cf87e9 | 9 | SHA1 (patch-src_kerberosbasic.h) = 7afb1da96ef6ecfcfa619ad8e6235e81d1cf87e9 | |
9 | SHA1 (patch-src_kerberosgss.c) = 8207233909e0342da5f9440184621ac1f5b7476d | 10 | SHA1 (patch-src_kerberosgss.c) = 8207233909e0342da5f9440184621ac1f5b7476d | |
10 | SHA1 (patch-src_kerberosgss.h) = e142a4bfc60e7cf0b944f1df461c806b14dbfb15 | 11 | SHA1 (patch-src_kerberosgss.h) = e142a4bfc60e7cf0b944f1df461c806b14dbfb15 | |
11 | SHA1 (patch-src_kerberospw.h) = fc856dc69a0fd9b0bcba4fd29dacf731de3be308 | 12 | SHA1 (patch-src_kerberospw.h) = fc856dc69a0fd9b0bcba4fd29dacf731de3be308 |
$NetBSD: patch-src_kerberos.c,v 1.1 2017/04/23 05:35:27 markd Exp $
Merge pull request #52 from kwlzn/kwlzn/none_principal_fix
Allow `authGSSClientInit` principal kwarg to be None.
--- src/kerberos.c.orig 2016-01-25 17:51:33.000000000 +0000
+++ src/kerberos.c
@@ -147,7 +147,7 @@ static PyObject* authGSSClientInit(PyObj
int result = 0;
if (! PyArg_ParseTupleAndKeywords(
- args, keywds, "s|slOO", kwlist,
+ args, keywds, "s|zlOO", kwlist,
&service, &principal, &gss_flags, &pydelegatestate, &pymech_oid
)) {
return NULL;