From nobody Tue Feb 13 15:50:54 2024 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 4TZ5QQ5Ytnz595wg; Tue, 13 Feb 2024 15:50:54 +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 4TZ5QQ52gjz4glT; Tue, 13 Feb 2024 15:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707839454; 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=e+EAcQyjWTnpi1kwXOQfv1HWEpltr5wt8x9tOeVFwgU=; b=tePNsv7I5oRnEgnSd06sadjOEqUVyDHmgA+kXlpZTjsaP/oa9VvTqpqCGFdwO88egVo4aV 3vTz9GN8GdgbUKLdFbHBupqN24JxqoBxLr5S1vUrF3AWu3TAzVNAwdnL8uBfYvrv2APmOb dmdVfRMgDIQff6L5cc4rik7uBvuUB2cCzrPeWGrUiUQZjNzXQ3CCt7+dBIAQlJovzKLSsK gmod5w1qTpoeSbRh3LcxYAAWR2W9HV0cdGuxfSAkkMXSKWbyhko5rz0NrimAzj2exdqOww C6s/0Q7qZ+txII33lQTG8VlLpvG3F9cy5uxRLH0U1nntahW7koiCPnzSKs+H7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707839454; a=rsa-sha256; cv=none; b=oh4D1jf+8jiAyRorkiPxU+7YzvW6rRZb1vVgwX4gON/1S/Q5OLhlP/gvquAHeyQKFXqzLx g7N5p1ONrvhv5684xm6T2hFCGsjwKX2Y+546i2k2uTHkhVew/cJMXbgxHKInRsmT7A/C4w RTE4bRReL7klglGoABzB31KwBnKQUBvj01gk6H5kSSqEhpkGle6Rpxapj2/ytFqjVh3S5g 6QkOAkNyb4D+VMOxzivIcJGhlTCMohtsSTH8PG62/cfZodGAf2fiV6APmslc1vJUH3mMN1 tSEc8kE8z4MSJYhp7lfIAY4zDXKDov7mD6Kyiixn+sgaB9NSrxTWrS1WOiCScA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707839454; 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=e+EAcQyjWTnpi1kwXOQfv1HWEpltr5wt8x9tOeVFwgU=; b=BcxMtQKzGA9niTdHEXrxmD8B0ntP8FjjbflBPh7J+FpHYXrYvfK/PziVbs4Xx62PDaBNrM saZVYkreJFuS/NwNiZzHCW0PH/0AW9qWH/fizAb9NhoUIWh2fNvpdlyrJRIalyZu5htkWe PC83vAoWkzAVKz4BHQA/b2450IKfXNbfs5FwpP16QTveebfmt9TIwNle7PFEOUNbWjVNu+ ss9WS0wDKArSvGOGipWy3F/F5gFFJxXDUGFK4UGPIVWj3/x/xZVMv5M+AgCN6csp+biVza /aPvs1waWPFo5DSvZJKBb2J+9/qiAKgC1SnZtlwS7pUK2V/YK5D1DQM9/SewhQ== 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 4TZ5QQ46RkzL7x; Tue, 13 Feb 2024 15:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DFosh0046298; Tue, 13 Feb 2024 15:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DFosmO046295; Tue, 13 Feb 2024 15:50:54 GMT (envelope-from git) Date: Tue, 13 Feb 2024 15:50:54 GMT Message-Id: <202402131550.41DFosmO046295@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 509b5d8644a7 - main - security/py-xmlsec: unbreak build with xmlsec1-1.3.2 (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 509b5d8644a76b8b872b74f9a946e61d9d92f90e Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=509b5d8644a76b8b872b74f9a946e61d9d92f90e commit 509b5d8644a76b8b872b74f9a946e61d9d92f90e Author: Dima Panov AuthorDate: 2024-02-13 15:39:27 +0000 Commit: Dima Panov CommitDate: 2024-02-13 15:39:27 +0000 security/py-xmlsec: unbreak build with xmlsec1-1.3.2 (+) With hat: office --- security/py-xmlsec/Makefile | 2 +- security/py-xmlsec/files/patch-src_constants.c | 11 +++++++++++ security/py-xmlsec/files/patch-src_enc.c | 14 ++++++++++++++ security/py-xmlsec/files/patch-src_xmlsec_constants.pyi | 11 +++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile index 2c03a2c72c82..14e68043b4ce 100644 --- a/security/py-xmlsec/Makefile +++ b/security/py-xmlsec/Makefile @@ -1,6 +1,6 @@ PORTNAME= xmlsec DISTVERSION= 1.3.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-xmlsec/files/patch-src_constants.c b/security/py-xmlsec/files/patch-src_constants.c new file mode 100644 index 000000000000..9acf7084e1ac --- /dev/null +++ b/security/py-xmlsec/files/patch-src_constants.c @@ -0,0 +1,11 @@ +--- src/constants.c.orig 2022-08-20 20:42:41 UTC ++++ src/constants.c +@@ -316,8 +316,6 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) { + PYXMLSEC_ADD_NS_CONSTANT(XPathNs, "XPATH"); + PYXMLSEC_ADD_NS_CONSTANT(XPath2Ns, "XPATH2"); + PYXMLSEC_ADD_NS_CONSTANT(XPointerNs, "XPOINTER"); +- PYXMLSEC_ADD_NS_CONSTANT(Soap11Ns, "SOAP11"); +- PYXMLSEC_ADD_NS_CONSTANT(Soap12Ns, "SOAP12"); + PYXMLSEC_ADD_NS_CONSTANT(NsExcC14N, "EXC_C14N"); + PYXMLSEC_ADD_NS_CONSTANT(NsExcC14NWithComments, "EXC_C14N_WITH_COMMENT"); + diff --git a/security/py-xmlsec/files/patch-src_enc.c b/security/py-xmlsec/files/patch-src_enc.c new file mode 100644 index 000000000000..b0efb44c9329 --- /dev/null +++ b/security/py-xmlsec/files/patch-src_enc.c @@ -0,0 +1,14 @@ +--- src/enc.c.orig 2023-12-13 20:01:11 UTC ++++ src/enc.c +@@ -17,6 +17,11 @@ + #include + #include + ++// Backwards compatibility with xmlsec 1.2 ++#ifndef XMLSEC_KEYINFO_FLAGS_LAX_KEY_SEARCH ++#define XMLSEC_KEYINFO_FLAGS_LAX_KEY_SEARCH 0x00008000 ++#endif ++ + typedef struct { + PyObject_HEAD + xmlSecEncCtxPtr handle; diff --git a/security/py-xmlsec/files/patch-src_xmlsec_constants.pyi b/security/py-xmlsec/files/patch-src_xmlsec_constants.pyi new file mode 100644 index 000000000000..ad8f4f06a8f4 --- /dev/null +++ b/security/py-xmlsec/files/patch-src_xmlsec_constants.pyi @@ -0,0 +1,11 @@ +--- src/xmlsec/constants.pyi.orig 2022-08-20 20:42:41 UTC ++++ src/xmlsec/constants.pyi +@@ -85,8 +85,6 @@ NsExcC14NWithComments: Final[str] + Ns: Final[str] + NsExcC14N: Final[str] + NsExcC14NWithComments: Final[str] +-Soap11Ns: Final[str] +-Soap12Ns: Final[str] + TransformAes128Cbc: Final[__Transform] + TransformAes128Gcm: Final[__Transform] + TransformAes192Cbc: Final[__Transform]