From ee178e424b7f912463a002eecd4110af978aa4ce Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Wed, 31 Aug 2022 19:24:23 +0800 Subject: [PATCH] security/py-krb5: Update to 0.4.0 Changes: https://github.com/jborean93/pykrb5/releases --- security/py-krb5/Makefile | 6 ++++-- security/py-krb5/distinfo | 6 +++--- .../patch-build_helpers-heimdal-include-krb5.h | 10 +++------- security/py-krb5/files/patch-setup.py | 17 +++++++++-------- .../py-krb5/files/patch-src-krb5-_principal.c | 14 -------------- .../files/patch-src-krb5-_principal.pyi | 10 ++++++++++ .../files/patch-src-krb5-_principal.pyx | 18 +++++------------- 7 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 security/py-krb5/files/patch-src-krb5-_principal.c create mode 100644 security/py-krb5/files/patch-src-krb5-_principal.pyi diff --git a/security/py-krb5/Makefile b/security/py-krb5/Makefile index 9f723d0d3afcf..acad4382909d0 100644 --- a/security/py-krb5/Makefile +++ b/security/py-krb5/Makefile @@ -1,5 +1,5 @@ PORTNAME= krb5 -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +10,9 @@ COMMENT= Kerberos API bindings for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:3.6+ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0.29.29<3.0.0:lang/cython@${PY_FLAVOR} + +USES= python:3.7+ USE_PYTHON= autoplist concurrent cython distutils MAKE_ENV= KRB5_KRB5CONFIG=${KRB5CONFIG} diff --git a/security/py-krb5/distinfo b/security/py-krb5/distinfo index 01a441a14ac43..acaa321406e89 100644 --- a/security/py-krb5/distinfo +++ b/security/py-krb5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646058122 -SHA256 (krb5-0.3.0.tar.gz) = 1d97da68aa8e563bedbbd5ac5fd02d3d84023b3526fd4df20dcbf7a89ee65d58 -SIZE (krb5-0.3.0.tar.gz) = 1707212 +TIMESTAMP = 1661599323 +SHA256 (krb5-0.4.0.tar.gz) = 6eb0e91e044d37cb34c84b831310f4a48951f2902d4ebb65b97cbac5ff1b2264 +SIZE (krb5-0.4.0.tar.gz) = 218774 diff --git a/security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h b/security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h index 857928afdff6e..fb1695b1a167a 100644 --- a/security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h +++ b/security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h @@ -1,14 +1,10 @@ ---- build_helpers/heimdal/include/krb5.h.orig 2022-02-16 07:12:32 UTC +--- build_helpers/heimdal/include/krb5.h.orig 2022-08-08 21:14:44 UTC +++ build_helpers/heimdal/include/krb5.h -@@ -847,7 +847,11 @@ enum { +@@ -847,7 +847,6 @@ enum { KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Require that there are no realm */ KRB5_PRINCIPAL_PARSE_REQUIRE_REALM = 2, /**< Require a realm present */ KRB5_PRINCIPAL_PARSE_ENTERPRISE = 4, /**< Parse as a NT-ENTERPRISE name */ -+#if defined(KRB5_PRINCIPAL_PARSE_IGNORE_REALM) - KRB5_PRINCIPAL_PARSE_IGNORE_REALM = 8, /**< Ignore realm if present */ -+#elif defined(KRB5_PRINCIPAL_PARSE_NO_REALM) -+ KRB5_PRINCIPAL_PARSE_NO_REALM = 8, /**< Ignore realm if present */ -+#endif +- KRB5_PRINCIPAL_PARSE_IGNORE_REALM = 8, /**< Ignore realm if present */ KRB5_PRINCIPAL_PARSE_NO_DEF_REALM = 16 /**< Don't default the realm */ }; diff --git a/security/py-krb5/files/patch-setup.py b/security/py-krb5/files/patch-setup.py index c97047808a99e..182901798537d 100644 --- a/security/py-krb5/files/patch-setup.py +++ b/security/py-krb5/files/patch-setup.py @@ -1,10 +1,11 @@ ---- setup.py.orig 2021-09-13 20:29:11 UTC +--- setup.py.orig 2022-08-08 21:14:44 UTC +++ setup.py -@@ -189,7 +189,6 @@ if compile_args is None: - else: - compile_args = shlex.split(run_command(f"{kc} --cflags krb5")) +@@ -174,8 +174,6 @@ if not SKIP_EXTENSIONS: + else: + compile_args = shlex.split(run_command(f"{kc} --cflags krb5")) -- compile_args.append("-Werror") - - # Python 3.8 on macOS errors on these deprecation warnings. We ignore them as things are fixed on 3.9 but the - # code still needs to compile on 3.8. +- compile_args.append("-Werror") +- + # Python 3.8 on macOS errors on these deprecation warnings. We ignore them as things are fixed on 3.9 but the + # code still needs to compile on 3.8. + if sys.platform == "darwin" and sys.version_info[:2] == (3, 8): diff --git a/security/py-krb5/files/patch-src-krb5-_principal.c b/security/py-krb5/files/patch-src-krb5-_principal.c deleted file mode 100644 index 54911494578a0..0000000000000 --- a/security/py-krb5/files/patch-src-krb5-_principal.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/krb5/_principal.c.orig 2022-02-16 07:13:01 UTC -+++ src/krb5/_principal.c -@@ -19168,7 +19168,11 @@ if (!__Pyx_RefNanny) { - * - * - */ -+#if defined(KRB5_PRINCIPAL_PARSE_IGNORE_REALM) - __pyx_t_4 = __Pyx_PyInt_From_int32_t(KRB5_PRINCIPAL_PARSE_IGNORE_REALM); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 74, __pyx_L1_error) -+#elif defined(KRB5_PRINCIPAL_PARSE_NO_REALM) -+ __pyx_t_4 = __Pyx_PyInt_From_int32_t(KRB5_PRINCIPAL_PARSE_NO_REALM); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 74, __pyx_L1_error) -+#endif - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_ignore_realm, __pyx_t_4) < 0) __PYX_ERR(1, 74, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; diff --git a/security/py-krb5/files/patch-src-krb5-_principal.pyi b/security/py-krb5/files/patch-src-krb5-_principal.pyi new file mode 100644 index 0000000000000..2efafadd135c1 --- /dev/null +++ b/security/py-krb5/files/patch-src-krb5-_principal.pyi @@ -0,0 +1,10 @@ +--- src/krb5/_principal.pyi.orig 2022-08-08 21:14:44 UTC ++++ src/krb5/_principal.pyi +@@ -13,7 +13,6 @@ class PrincipalParseFlags(enum.IntEnum): + no_realm: PrincipalParseFlags = ... #: Error if realm is present + require_realm: PrincipalParseFlags = ... #: Error if realm is not present + enterprise: PrincipalParseFlags = ... #: Create single-component enterprise principal +- ignore_realm: PrincipalParseFlags = ... #: Ignore realm if present + + class PrincipalUnparseFlags(enum.IntEnum): + """Flags used to control :meth:`unparse_name_flags`.""" diff --git a/security/py-krb5/files/patch-src-krb5-_principal.pyx b/security/py-krb5/files/patch-src-krb5-_principal.pyx index e035fba96adfd..ab73e8208c554 100644 --- a/security/py-krb5/files/patch-src-krb5-_principal.pyx +++ b/security/py-krb5/files/patch-src-krb5-_principal.pyx @@ -1,26 +1,18 @@ ---- src/krb5/_principal.pyx.orig 2022-02-16 07:12:32 UTC +--- src/krb5/_principal.pyx.orig 2022-08-08 21:14:44 UTC +++ src/krb5/_principal.pyx -@@ -59,7 +59,11 @@ cdef extern from "python_krb5.h": +@@ -59,7 +59,6 @@ cdef extern from "python_krb5.h": int32_t KRB5_PRINCIPAL_PARSE_NO_REALM int32_t KRB5_PRINCIPAL_PARSE_REQUIRE_REALM int32_t KRB5_PRINCIPAL_PARSE_ENTERPRISE -+#if defined(KRB5_PRINCIPAL_PARSE_IGNORE_REALM) - int32_t KRB5_PRINCIPAL_PARSE_IGNORE_REALM -+#elif defined(KRB5_PRINCIPAL_PARSE_NO_REALM) -+ int32_t KRB5_PRINCIPAL_PARSE_NO_REALM -+#endif +- int32_t KRB5_PRINCIPAL_PARSE_IGNORE_REALM int32_t KRB5_PRINCIPAL_UNPARSE_SHORT int32_t KRB5_PRINCIPAL_UNPARSE_NO_REALM -@@ -71,7 +75,11 @@ class PrincipalParseFlags(enum.IntEnum): +@@ -71,7 +70,6 @@ class PrincipalParseFlags(enum.IntEnum): no_realm = KRB5_PRINCIPAL_PARSE_NO_REALM require_realm = KRB5_PRINCIPAL_PARSE_REQUIRE_REALM enterprise = KRB5_PRINCIPAL_PARSE_ENTERPRISE -+#if defined(KRB5_PRINCIPAL_PARSE_IGNORE_REALM) - ignore_realm = KRB5_PRINCIPAL_PARSE_IGNORE_REALM -+#elif defined(KRB5_PRINCIPAL_PARSE_NO_REALM) -+ ignore_realm = KRB5_PRINCIPAL_PARSE_NO_REALM -+#endif +- ignore_realm = KRB5_PRINCIPAL_PARSE_IGNORE_REALM class PrincipalUnparseFlags(enum.IntEnum):