From nobody Mon Mar 7 18:18:54 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2324C1A00705; Mon, 7 Mar 2022 18:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC6Cz4N5Rz3KTb; Mon, 7 Mar 2022 18:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PvoYhyGnmxSZKAp/sQjCiJMEkkRQmidOJt/qOEtEY98=; b=Oo5jESPlW+KzLu5R71jK4jwnnTKDrnQnJv6oMmFGGlDxSUD0cgyQh8z9mvgljAr0plhMxR RQvF6Hssf0Ql0Xi9QwRKQbtxWAiN28cheZEjpy64mR4xFpbum4Xrhn+w9RCos8UNV5hHOd /S5BAzoUOrF3oyL1KuGZJTx6Ud8i8/0o9SuwSRNfFrRJHgRjsdMGLElSeCnGLaXmTX5BOZ V5mddD8mZDcqTXi0SDmxc0ue+Ub630aXV4Rb2PdNc0uO7fapJVr5uFH12PMTrgGeTnBuC1 0g7sK6yxQFRv/C8c/KdgyJW+hrM4QBBtnV0M1xyc2nrIvh3bmRCSGkbnYWE4Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94B0A53DF; Mon, 7 Mar 2022 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227IIshh062274; Mon, 7 Mar 2022 18:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IIsTT062273; Mon, 7 Mar 2022 18:18:54 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:18:54 GMT Message-Id: <202203071818.227IIsTT062273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 52ce1a9e2d41 - main - security/py-krb5: Update to 0.3.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52ce1a9e2d415b55238fefb6e3a87e3d563b848f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PvoYhyGnmxSZKAp/sQjCiJMEkkRQmidOJt/qOEtEY98=; b=PB8YCQ59Hx22NIMHb3qeWZgZBFJRnGlwlVnDv32DAbf0LeUcoS0afgTD9QXCcrfvZo43lS eFi7YvlPGvNvxa2VeeaW2VYLQXUo8FvzbAlaT/JXk6KVyiniSCa/bnQ69VaMnz1rycuGwT uc4ZU4zeouH9rkJb7NH7LuLN3leMv0+csTLZ8tn53UzY2lOmb/cKkSFYWJdgnI62RKpUaL bSmwJfqaEoe07vypurgiHvam0wsmcvfrPbJJ/raxiVnPzUq4EOgMlR/iWF8LjB8rjiHwLE 6RJWkhu/TqtTPiaQaFFswa4hkVOr6axC4ezmYjm31uJYnJU6kARjfINeOGGa6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646677136; a=rsa-sha256; cv=none; b=eSQ5kACPdxrhYWEj6951NqwcHdnitZTAjLggMiliB1HNsvXIgrjNlAhvcI4gjjOHUy8C5D hrjSNpVnSHhBoP4UnRyHK9ivRlCRgvxPf9ZV+gHndkmXmr54iCBRt6bLqBncEq/CEmppaS vBKd96iZLI4XijwffxkANch4KzDGfImLigsAQUM56/2+CGUssvruo+xCXLr/p6hgfgxHkO EUpKmyBBl/R9NXj8hnSjfTnh6gCq4+cSEcCyY9Tii9ynE3QcMzO7nGRdyraWsU+xPOutv8 JW8wda1612KXqcMOH00bqfVfKUvOlfsaY9ZNKc4PV4ax9OX/iCnnvkZoXRMliQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=52ce1a9e2d415b55238fefb6e3a87e3d563b848f commit 52ce1a9e2d415b55238fefb6e3a87e3d563b848f Author: Po-Chuan Hsieh AuthorDate: 2022-03-07 17:56:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-07 18:11:27 +0000 security/py-krb5: Update to 0.3.0 Changes: https://github.com/jborean93/pykrb5/releases --- security/py-krb5/Makefile | 2 +- security/py-krb5/distinfo | 6 ++--- .../patch-build_helpers-heimdal-include-krb5.h | 14 ++++++++++++ security/py-krb5/files/patch-src-krb5-_principal.c | 10 ++++----- .../py-krb5/files/patch-src-krb5-_principal.pyx | 26 ++++++++++++++++++++++ 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/security/py-krb5/Makefile b/security/py-krb5/Makefile index 3b074ce54db8..674d5fac60d0 100644 --- a/security/py-krb5/Makefile +++ b/security/py-krb5/Makefile @@ -1,7 +1,7 @@ # Created by: Po-Chuan Hsieh PORTNAME= krb5 -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-krb5/distinfo b/security/py-krb5/distinfo index d9a1a39d5546..01a441a14ac4 100644 --- a/security/py-krb5/distinfo +++ b/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 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 new file mode 100644 index 000000000000..857928afdff6 --- /dev/null +++ b/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 */ + }; + diff --git a/security/py-krb5/files/patch-src-krb5-_principal.c b/security/py-krb5/files/patch-src-krb5-_principal.c index bd1158b9c18c..54911494578a 100644 --- a/security/py-krb5/files/patch-src-krb5-_principal.c +++ b/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; diff --git a/security/py-krb5/files/patch-src-krb5-_principal.pyx b/security/py-krb5/files/patch-src-krb5-_principal.pyx new file mode 100644 index 000000000000..e035fba96adf --- /dev/null +++ b/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):