Skip to content

Commit

Permalink
security/py-krb5: Update to 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sunpoet committed Mar 7, 2022
1 parent 9a4809c commit 52ce1a9
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 9 deletions.
2 changes: 1 addition & 1 deletion security/py-krb5/Makefile
@@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>

PORTNAME= krb5
PORTVERSION= 0.2.0
PORTVERSION= 0.3.0
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand Down
6 changes: 3 additions & 3 deletions security/py-krb5/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1635181095
SHA256 (krb5-0.2.0.tar.gz) = 67df5e0f974ea97d4bfb4ef8f8cc4a2172894b6cdba01f3315f33abcfb2cc41b
SIZE (krb5-0.2.0.tar.gz) = 1086940
TIMESTAMP = 1646058122
SHA256 (krb5-0.3.0.tar.gz) = 1d97da68aa8e563bedbbd5ac5fd02d3d84023b3526fd4df20dcbf7a89ee65d58
SIZE (krb5-0.3.0.tar.gz) = 1707212
14 changes: 14 additions & 0 deletions security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h
@@ -0,0 +1,14 @@
--- build_helpers/heimdal/include/krb5.h.orig 2022-02-16 07:12:32 UTC
+++ build_helpers/heimdal/include/krb5.h
@@ -847,7 +847,11 @@ 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_NO_DEF_REALM = 16 /**< Don't default the realm */
};

10 changes: 5 additions & 5 deletions security/py-krb5/files/patch-src-krb5-_principal.c
@@ -1,14 +1,14 @@
--- src/krb5/_principal.c.orig 2021-09-13 20:29:39 UTC
--- src/krb5/_principal.c.orig 2022-02-16 07:13:01 UTC
+++ src/krb5/_principal.c
@@ -18669,7 +18669,11 @@ if (!__Pyx_RefNanny) {
@@ -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, 68, __pyx_L1_error)
__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, 68, __pyx_L1_error)
+ __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, 68, __pyx_L1_error)
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;
26 changes: 26 additions & 0 deletions security/py-krb5/files/patch-src-krb5-_principal.pyx
@@ -0,0 +1,26 @@
--- src/krb5/_principal.pyx.orig 2022-02-16 07:12:32 UTC
+++ src/krb5/_principal.pyx
@@ -59,7 +59,11 @@ 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_UNPARSE_SHORT
int32_t KRB5_PRINCIPAL_UNPARSE_NO_REALM
@@ -71,7 +75,11 @@ 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


class PrincipalUnparseFlags(enum.IntEnum):

0 comments on commit 52ce1a9

Please sign in to comment.