From 9e1a127e411c82939840166844ba3187c2475ae7 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 6 Mar 2024 16:43:25 +0800 Subject: python3-scrypt: upgrade 0.8.20 -> 0.8.24 0001-py-scrypt-remove-the-hard-coded-include-paths.patch refreshed for 0.8.24 Changelog: ========== -Remove travis and appveyor -Support building on MSYS2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...crypt-remove-the-hard-coded-include-paths.patch | 16 ++++++------- .../python/python3-scrypt_0.8.20.bb | 28 ---------------------- .../python/python3-scrypt_0.8.24.bb | 28 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 37 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb create mode 100644 meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch index d535e43261..3678d46cf6 100644 --- a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch +++ b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch @@ -1,4 +1,4 @@ -From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001 +From 47ede0950740e8919c28774840e77f223d5f3124 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sun, 11 Mar 2018 19:55:38 -0400 Subject: [PATCH] py-scrypt: remove the hard coded include paths @@ -11,16 +11,14 @@ Signed-off-by: Derek Straka 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index e36adc4..2ebfbf1 100644 +index 419a982..3f1fe52 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'): - ('HAVE_SYS_SYSINFO_H', '1'), - ('_FILE_OFFSET_BITS', '64')] +@@ -26,7 +26,6 @@ if sys.platform.startswith('linux'): + ('_FILE_OFFSET_BITS', '64'), + ] libraries = ['crypto', 'rt'] - includes = ['/usr/local/include', '/usr/include'] CFLAGS.append('-O2') - elif sys.platform.startswith('win32'): - define_macros = [('inline', '__inline')] --- -2.7.4 + elif sys.platform.startswith('win32') and os.environ.get('MSYSTEM'): + msys2_env = os.getenv('MSYSTEM') diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb deleted file mode 100644 index ce0d4de9c4..0000000000 --- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Bindings for the scrypt key derivation function library" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=05b5ac2824a7ae7489193b0f6a6f2cd1" -HOMEPAGE="https://github.com/holgern/py-scrypt" - -SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" - -SRC_URI[sha256sum] = "0d226c1c6744fb2e308b391410669b1df5cfe82637ffcb5ed489bf82b2d2eb78" - -inherit pypi ptest setuptools3 dos2unix - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - python3-pytest \ - python3-unittest-automake-output \ -" - -RDEPENDS:${PN} += " \ - python3-ctypes \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb new file mode 100644 index 0000000000..94c83e4952 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Bindings for the scrypt key derivation function library" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=05b5ac2824a7ae7489193b0f6a6f2cd1" +HOMEPAGE="https://github.com/holgern/py-scrypt" + +SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" + +SRC_URI[sha256sum] = "98ffde45e4a95461d73ded54ba7a26857679920d4f8ff320f6f7ade6e29531bd" + +inherit pypi ptest setuptools3 dos2unix + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-unittest-automake-output \ +" + +RDEPENDS:${PN} += " \ + python3-ctypes \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/ +} -- cgit v1.2.3-54-g00ecf