Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
34 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
10 changes: 3 additions & 7 deletions
10
security/py-krb5/files/patch-build_helpers-heimdal-include-krb5.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 */ | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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): |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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`.""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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): |