From a3bc118ed5430d61578ac2ad0164e44ae1ea93fc Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 22 Apr 2025 16:49:10 +0800 Subject: python3-m2crypto: upgrade 0.44.0 -> 0.45.0 python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch refreshed for 0.45.0 Changelog: =========== - chore: build Windows builds with Python 3.13 as well - fix: remove support for Engine - chore: mark actual license of the project BSD-2-Clause instead of wrong MIT - ci(Debian): make M2Crypto buildable on Debian - swig: Workaround for reading sys/select.h ending with wrong types. - ci: bump required setuptools version because of change in naming strategy - fix: add fix for build with older GCC - fix: remove AnyStr and Any types - chore: add .git-blame-ignore-revs - chore: blacken everything Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-setup.py-Make-the-cmd-available.patch | 9 ++-- .../python/python3-m2crypto_0.44.0.bb | 52 ---------------------- .../python/python3-m2crypto_0.45.0.bb | 52 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 58 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-m2crypto_0.44.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-m2crypto_0.45.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch index 819ecabf6c..c4262985ba 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch @@ -1,4 +1,4 @@ -From b14664fdab286485c5cbc0fbe5b0ff13f062edd8 Mon Sep 17 00:00:00 2001 +From eaeb95ec64762a58dde7cf368fc17188382e7df6 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 28 Mar 2025 12:13:26 +0800 Subject: [PATCH] setup.py: Make the cmd available @@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 7e295f3..cc414c9 100644 +index 9938e67..21e2346 100644 --- a/setup.py +++ b/setup.py -@@ -221,7 +221,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): +@@ -230,7 +230,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): with open( "src/SWIG/x509_v_flag.h", "w", encoding="utf-8" ) as x509_v_h: @@ -35,6 +35,3 @@ index 7e295f3..cc414c9 100644 cflags = os.environ.get("CFLAGS") if cflags is not None: cmd += cflags.split() --- -2.34.1 - diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.44.0.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.44.0.bb deleted file mode 100644 index 5201e704ea..0000000000 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.44.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A Python crypto and SSL toolkit" -HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" - -SRC_URI[sha256sum] = "384bb4cbd178ee0e74015311b7b1f9f2c377e3686e03fa070b3ec2f494671c0f" - -SRC_URI += " \ - file://0001-setup.py-Make-the-cmd-available.patch \ -" - -inherit pypi siteinfo python_setuptools_build_meta - -DEPENDS += "openssl swig-native" -RDEPENDS:${PN} += "\ - python3-datetime \ - python3-setuptools \ - python3-logging \ - python3-netclient \ - python3-netserver \ - python3-numbers \ - python3-xmlrpc \ -" - -DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" -DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" - -SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']} -DOPENSSL_NO_FILENAMES" - -SWIG_FEATURES:append:riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" -SWIG_FEATURES:append:riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" -SWIG_FEATURES:append:mipsarch = " -D_MIPS_SZPTR=${SITEINFO_BITS}" -SWIG_FEATURES:append:powerpc64le = " -D__powerpc64__" -SWIG_FEATURES:append:x86 = " -D__i386__" -SWIG_FEATURES:append:x32 = " -D__ILP32__" - -export SWIG_FEATURES - -export STAGING_DIR - -do_configure:prepend() { - # workaround for https://github.com/swiftlang/swift/issues/69311 - sed -i "/sys\/types.h/d" ${RECIPE_SYSROOT}${includedir}/openssl/e_os2.h -} - -do_install:append() { - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/M2Crypto/SSL/__pycache__/*.cpython-*.pyc - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/M2Crypto/__pycache__/*.cpython-*.pyc -} - -BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.45.0.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.45.0.bb new file mode 100644 index 0000000000..77f1f7df89 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.45.0.bb @@ -0,0 +1,52 @@ +SUMMARY = "A Python crypto and SSL toolkit" +HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" + +SRC_URI[sha256sum] = "ffc10d4d09901514f408dc74f60a4d7df21c44ebc9bf776c947bfdc7359421cf" + +SRC_URI += " \ + file://0001-setup.py-Make-the-cmd-available.patch \ +" + +inherit pypi siteinfo python_setuptools_build_meta + +DEPENDS += "openssl swig-native" +RDEPENDS:${PN} += "\ + python3-datetime \ + python3-setuptools \ + python3-logging \ + python3-netclient \ + python3-netserver \ + python3-numbers \ + python3-xmlrpc \ +" + +DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" +DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" + +SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']} -DOPENSSL_NO_FILENAMES" + +SWIG_FEATURES:append:riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" +SWIG_FEATURES:append:riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" +SWIG_FEATURES:append:mipsarch = " -D_MIPS_SZPTR=${SITEINFO_BITS}" +SWIG_FEATURES:append:powerpc64le = " -D__powerpc64__" +SWIG_FEATURES:append:x86 = " -D__i386__" +SWIG_FEATURES:append:x32 = " -D__ILP32__" + +export SWIG_FEATURES + +export STAGING_DIR + +do_configure:prepend() { + # workaround for https://github.com/swiftlang/swift/issues/69311 + sed -i "/sys\/types.h/d" ${RECIPE_SYSROOT}${includedir}/openssl/e_os2.h +} + +do_install:append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/M2Crypto/SSL/__pycache__/*.cpython-*.pyc + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/M2Crypto/__pycache__/*.cpython-*.pyc +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf