diff --git a/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch b/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch deleted file mode 100644 index 3e7480b485..0000000000 --- a/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch +++ /dev/null @@ -1,39 +0,0 @@ -From eccc9ea5eef13ee353de610af36fb7759b70e2e4 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Mon, 26 Aug 2024 18:14:33 +0100 -Subject: [PATCH] Build bindings reproducibly - -`glob` output isn't guaranteed to be in any particular order, so -`_sodium.*.so` wasn't always reproducible. - -Upstream-Status: Backport [https://github.com/pyca/pynacl/pull/836] -Signed-off-by: Khem Raj ---- - src/bindings/build.py | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/bindings/build.py b/src/bindings/build.py -index 9634237..777237b 100644 ---- a/src/bindings/build.py -+++ b/src/bindings/build.py -@@ -22,12 +22,16 @@ from cffi import FFI - __all__ = ["ffi"] - - --HEADERS = glob.glob( -- os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h") -+HEADERS = sorted( -+ glob.glob(os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h")) - ) - --MINIMAL_HEADERS = glob.glob( -- os.path.join(os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h") -+MINIMAL_HEADERS = sorted( -+ glob.glob( -+ os.path.join( -+ os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h" -+ ) -+ ) - ) - - diff --git a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb b/meta-python/recipes-devtools/python/python3-pynacl_1.6.2.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb rename to meta-python/recipes-devtools/python/python3-pynacl_1.6.2.bb index 393066de9d..d72d2be2f1 100644 --- a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-pynacl_1.6.2.bb @@ -4,10 +4,9 @@ HOMEPAGE = "https://github.com/pyca/pynacl" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" -SRC_URI += "file://0001-Build-bindings-reproducibly.patch" -SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" +SRC_URI[sha256sum] = "018494d6d696ae03c7e656e5e74cdfd8ea1326962cc401bcf018f1ed8436811c" -PYPI_PACKAGE = "PyNaCl" +PYPI_PACKAGE = "pynacl" UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" inherit pypi python_setuptools_build_meta