Re: [meta-python][PATCH] python3-m2crypto: Upgrade to 0.37.1


Martin Jansa
 

but this opensslconf.h is the same with 0.37.1 and 0.30.0 python3-m2crypto, right?

It is in my WORKDIRs, but I have no __MHWORDSIZE, only __WORDSIZE:

0.37.1-r0$ cat recipe-sysroot/usr/include/openssl/opensslconf.h
/*
 * Copyright (C) 2005-2011 by Wind River Systems, Inc.
 *
 * SPDX-License-Identifier: MIT
 *
 */

#include <bits/wordsize.h>

#if __WORDSIZE == 32

#ifdef _MIPS_SIM

#if _MIPS_SIM == _ABIO32
#include <openssl/opensslconf-32.h>
#elif _MIPS_SIM == _ABIN32
#include <openssl/opensslconf-n32.h>
#else
#error "Unknown _MIPS_SIM"
#endif

#else /* _MIPS_SIM is not defined */
#include <openssl/opensslconf-32.h>
#endif

#elif __WORDSIZE == 64
#include <openssl/opensslconf-64.h>
#else
#error "Unknown __WORDSIZE detected"
#endif /* matches #if __WORDSIZE == 32 */


if I drop the -includeall from swig call I get a bit more reasonable error message:
Preprocessing...
/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf.h:29: Error: CPP #error ""Unknown __WORDSIZE detected"". Use the -cpperraswarn option to continue swig processing.

If I run the same swig call in 0.30.1 version:
Language subdirectory: python
Search paths:
   ./
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include-fixed/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/lib/aarch64-oe-linux/11.1.0/include/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/python3.9/
   /usr/include/openssl/
   ./swig_lib/python/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot-native/usr/bin/../share/swig/3.0.12/python/
   ./swig_lib/
   /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot-native/usr/bin/../share/swig/3.0.12/
Preprocessing...
/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/features.h:399: Warning 204: CPP #warning, "_FORTIFY_SOURCE requires GCC 4.1 or later".
Starting language-specific parse...
SWIG/gcc_macros.h:102: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:202: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:256: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:284: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:298: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:300: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:306: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:442: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:472: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:476: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:484: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:492: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:564: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:568: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:580: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:588: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:618: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:664: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:690: Warning 305: Bad constant value (ignored).
SWIG/gcc_macros.h:706: Warning 305: Bad constant value (ignored).
/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/sys/cdefs.h:153: Warning 305: Bad constant value (ignored).
Processing unnamed structs...
Processing types...
C++ analysis...
Generating wrappers...

Looks like this gcc_macros.h still generated by do_configure_prepend (but no longer included anywhere without the m2crypto-0.26.4-gcc_macros.patch

I'll send RFC patch which fixed the build for me, but I'm no expert on swig and this whole gcc_macros.h seems like a bit strange black magic to me.

Cheers,

On Wed, May 5, 2021 at 10:50 PM Khem Raj <raj.khem@...> wrote:
On Wed, May 5, 2021 at 1:13 PM Martin Jansa <martin.jansa@...> wrote:
>
> It doesn't seem to be missing header file as opensslconf-32.h doesn't exist in either of them.
>

32bit header file is not important, whats important is the wrapper
that OE generates for non-multilib cases which breaks such cases as I
pointed in the commit
so you have this in opensslconf.h

#if defined (__bpf__)
#define __MHWORDSIZE                    64
#elif defined (__arm__)
#define __MHWORDSIZE                    32
#elif defined (__aarch64__) && defined ( __LP64__)
#define __MHWORDSIZE                    64
#elif defined (__aarch64__)
#define __MHWORDSIZE                    32
#else
#include <bits/wordsize.h>
#if defined (__WORDSIZE)
#define __MHWORDSIZE                    __WORDSIZE
#else
#error "__WORDSIZE is not defined"
#endif
#endif

#if __MHWORDSIZE == 32

#ifdef _MIPS_SIM

#if _MIPS_SIM == _ABIO32
#include <openssl/opensslconf-32.h>
#elif _MIPS_SIM == _ABIN32
#include <openssl/opensslconf-n32.h>
#else
#error "Unknown _MIPS_SIM"
#endif

#else /* _MIPS_SIM is not defined */
#include <openssl/opensslconf-32.h>
#endif

#elif __MHWORDSIZE == 64
#include <openssl/opensslconf-64.h>
#else
#error "Unknown __WORDSIZE detected"
#endif /* matches #if __WORDSIZE == 32 */


injected by this multilib game. Now if you do not have __MHWORDSIZE
detected correctly then things take a very wrong course.
I proposed this fix for OE-core but it is not yet accpeted.

> oe-core$ find tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/ -name opensslconf\*
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/include/openssl/opensslconf.h
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf-64.h
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf.h
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0-copy/recipe-sysroot-native/usr/include/openssl/opensslconf.h
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0-copy/recipe-sysroot/usr/include/openssl/opensslconf-64.h
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0-copy/recipe-sysroot/usr/include/openssl/opensslconf.h
>
> and the swig call seems to be similar, but with the new version the -I flags are different, I wonder if that caused wrong header to be read from native sysroot or from host (ubuntu-21.04), will try to get some preprocessed output from swig to see which headers it really read:
>
> oe-core$ grep swig tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.*/temp/log.do_compile
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0-copy/temp/log.do_compile:swigging SWIG/_m2crypto.i to SWIG/_m2crypto_wrap.c
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0-copy/temp/log.do_compile:swig -python -py3
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/recipe-sysroot/usr/include/python3.9
> -I/usr/include/openssl
> -I/usr/lib/gcc/x86_64-linux-gnu/10/include
> -I/usr/local/include
> -I/usr/include/x86_64-linux-gnu
> -I/usr/include
> -includeall -modern -builtin -outdir /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.30.1-r0/M2Crypto-0.30.1/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
>
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/temp/log.do_compile:swigging SWIG/_m2crypto.i to SWIG/_m2crypto_wrap.c
> tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/temp/log.do_compile:swig -python -py3
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include-fixed
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/lib/aarch64-oe-linux/11.1.0/include
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include
> -I/OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/python3.9
> -I/usr/include/openssl
> -includeall -modern -builtin -outdir /OE/build/oe-core/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/M2Crypto-0.37.1/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
>
> On Wed, May 5, 2021 at 7:41 PM Khem Raj <raj.khem@...> wrote:
>>
>> hmmm I use
>>
>> https://github.com/YoeDistro/openembedded-core/commit/bbb5e56c6db0fc7997a093bb400021edce6c7639
>>
>> and i wonder thats why I do not see this ?
>>
>> On Wed, May 5, 2021 at 10:09 AM Martin Jansa <martin.jansa@...> wrote:
>> >
>> > This upgrade seems to break the build for aarch64:
>> > http://errors.yoctoproject.org/Errors/Details/580206/
>> >
>> > On Sat, May 1, 2021 at 9:06 PM Khem Raj <raj.khem@...> wrote:
>> >>
>> >> Unifiy .inc into .bb
>> >> Add patches to fix issues with openssl 1.1.x
>> >> Remove m2crypto-0.26.4-gcc_macros patch, its no longer needed
>> >> Refresh existing patches
>> >>
>> >> Signed-off-by: Khem Raj <raj.khem@...>
>> >> ---
>> >>  .../m2crypto-0.26.4-gcc_macros.patch          | 35 --------------
>> >>  ...verify_cb_-to-be-called-with-ok-True.patch | 47 +++++++++++++++++++
>> >>  ...A_SSLV23_PADDING-has-been-deprecated.patch | 29 ++++++++++++
>> >>  ...k-in-sysroot-not-in-host-directories.patch | 12 ++---
>> >>  .../cross-compile-platform.patch              |  8 ++--
>> >>  .../python/python3-m2crypto_0.30.1.bb         |  2 -
>> >>  ...2crypto.inc => python3-m2crypto_0.37.1.bb} |  8 ++--
>> >>  7 files changed, 88 insertions(+), 53 deletions(-)
>> >>  delete mode 100644 meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
>> >>  create mode 100644 meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch
>> >>  create mode 100644 meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch
>> >>  rename meta-python/recipes-devtools/python/{python-m2crypto => python3-m2crypto}/0001-setup.py-link-in-sysroot-not-in-host-directories.patch (75%)
>> >>  rename meta-python/recipes-devtools/python/{python-m2crypto => python3-m2crypto}/cross-compile-platform.patch (84%)
>> >>  delete mode 100644 meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb
>> >>  rename meta-python/recipes-devtools/python/{python-m2crypto.inc => python3-m2crypto_0.37.1.bb} (86%)
>> >>
>> >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch b/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
>> >> deleted file mode 100644
>> >> index 7f6dd29f8a..0000000000
>> >> --- a/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
>> >> +++ /dev/null
>> >> @@ -1,35 +0,0 @@
>> >> -Imported from Fedora
>> >> -
>> >> -Index: M2Crypto-0.30.1/SWIG/_m2crypto.i
>> >> -===================================================================
>> >> ---- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i
>> >> -+++ M2Crypto-0.30.1/SWIG/_m2crypto.i
>> >> -@@ -8,6 +8,11 @@
>> >> -  *
>> >> -  */
>> >> -
>> >> -+%import "gcc_macros.h"
>> >> -+
>> >> -+%ignore WCHAR_MAX;
>> >> -+%ignore WCHAR_MIN;
>> >> -+
>> >> - %module(threads=1) m2crypto
>> >> - /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
>> >> -    Disable threadallow as well, only enable it for operations likely to
>> >> -@@ -15,11 +20,6 @@
>> >> - %nothreadblock;
>> >> - %nothreadallow;
>> >> -
>> >> --#if SWIG_VERSION >= 0x030000
>> >> --#define __WCHAR_MAX__ __WCHAR_MAX
>> >> --#define __WCHAR_MIN__ __WCHAR_MIN
>> >> --#endif
>> >> --
>> >> - %{
>> >> - #ifdef _WIN32
>> >> - #define _WINSOCKAPI_
>> >> -@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu
>> >> - %constant int encrypt = 1;
>> >> - %constant int decrypt = 0;
>> >> - #endif
>> >> --
>> >> diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch
>> >> new file mode 100644
>> >> index 0000000000..3c836635a1
>> >> --- /dev/null
>> >> +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch
>> >> @@ -0,0 +1,47 @@
>> >> +From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
>> >> +From: Casey Deccio <casey@...>
>> >> +Date: Fri, 8 Jan 2021 12:43:09 -0700
>> >> +Subject: [PATCH] Allow verify_cb_* to be called with ok=True
>> >> +
>> >> +With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
>> >> +OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
>> >> +---
>> >> + tests/test_ssl.py | 14 ++++++++++++--
>> >> + 1 file changed, 12 insertions(+), 2 deletions(-)
>> >> +
>> >> +diff --git a/tests/test_ssl.py b/tests/test_ssl.py
>> >> +index 92b6942..7a3271a 100644
>> >> +--- a/tests/test_ssl.py
>> >> ++++ b/tests/test_ssl.py
>> >> +@@ -59,8 +59,13 @@ def allocate_srv_port():
>> >> +
>> >> +
>> >> + def verify_cb_new_function(ok, store):
>> >> +-    assert not ok
>> >> +     err = store.get_error()
>> >> ++    # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
>> >> ++    # aborting, this callback is called to retrieve additional error
>> >> ++    # information.  In this case, ok might not be False.
>> >> ++    # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
>> >> ++    if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
>> >> ++        assert not ok
>> >> +     assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
>> >> +                    m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
>> >> +                    m2.X509_V_ERR_CERT_UNTRUSTED,
>> >> +@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
>> >> +
>> >> +     def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
>> >> +         try:
>> >> +-            self.assertFalse(ok)
>> >> ++            # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
>> >> ++            # aborting, this callback is called to retrieve additional error
>> >> ++            # information.  In this case, ok might not be False.
>> >> ++            # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
>> >> ++            if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
>> >> ++                self.assertFalse(ok)
>> >> +             self.assertIn(err,
>> >> +                           [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
>> >> +                            m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
>> >> +--
>> >> +2.29.2
>> >> +
>> >> diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch
>> >> new file mode 100644
>> >> index 0000000000..2313a324a0
>> >> --- /dev/null
>> >> +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch
>> >> @@ -0,0 +1,29 @@
>> >> +From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
>> >> +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@...>
>> >> +Date: Fri, 19 Feb 2021 15:53:02 +0100
>> >> +Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
>> >> +
>> >> +Fixes #293.
>> >> +---
>> >> + tests/test_rsa.py | 5 -----
>> >> + 1 file changed, 5 deletions(-)
>> >> +
>> >> +diff --git a/tests/test_rsa.py b/tests/test_rsa.py
>> >> +index 3de5016..7299785 100644
>> >> +--- a/tests/test_rsa.py
>> >> ++++ b/tests/test_rsa.py
>> >> +@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
>> >> +             ptxt = priv.private_decrypt(ctxt, p)
>> >> +             self.assertEqual(ptxt, self.data)
>> >> +
>> >> +-        # sslv23_padding
>> >> +-        ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
>> >> +-        res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
>> >> +-        self.assertEqual(res, self.data)
>> >> +-
>> >> +         # no_padding
>> >> +         with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
>> >> +             priv.public_encrypt(self.data, RSA.no_padding)
>> >> +--
>> >> +2.29.2
>> >> +
>> >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
>> >> similarity index 75%
>> >> rename from meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
>> >> rename to meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
>> >> index b339d93f75..f4c74384f9 100644
>> >> --- a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
>> >> +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
>> >> @@ -10,19 +10,17 @@ Upstream-status: Unknown
>> >>   setup.py | 6 +++---
>> >>   1 file changed, 3 insertions(+), 3 deletions(-)
>> >>
>> >> -Index: M2Crypto-0.30.1/setup.py
>> >> -===================================================================
>> >> ---- M2Crypto-0.30.1.orig/setup.py
>> >> -+++ M2Crypto-0.30.1/setup.py
>> >> -@@ -130,6 +130,7 @@ class _M2CryptoBuildExt(build_ext.build_
>> >> +--- a/setup.py
>> >> ++++ b/setup.py
>> >> +@@ -135,6 +135,7 @@ class _M2CryptoBuildExt(build_ext.build_
>> >>           self.set_undefined_options('build', ('bundledlls', 'bundledlls'))
>> >>
>> >>           self.libraries = ['ssl', 'crypto']
>> >>  +        self.openssl = os.environ.get( "STAGING_DIR" )
>> >>           if sys.platform == 'win32':
>> >>               self.libraries = ['ssleay32', 'libeay32']
>> >> -             if self.openssl and openssl_version(self.openssl, 0x10100000, True):
>> >> -@@ -150,8 +151,8 @@ class _M2CryptoBuildExt(build_ext.build_
>> >> +             if self.openssl and openssl_version(self.openssl,
>> >> +@@ -159,8 +160,8 @@ class _M2CryptoBuildExt(build_ext.build_
>> >>
>> >>           if self.openssl is not None:
>> >>               log.debug('self.openssl = %s', self.openssl)
>> >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch b/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
>> >> similarity index 84%
>> >> rename from meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch
>> >> rename to meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
>> >> index 4b64f4613c..f039ae8665 100644
>> >> --- a/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch
>> >> +++ b/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
>> >> @@ -4,11 +4,9 @@ since it pokes at the system for getting architecture values
>> >>  Upstream-Status: Inappropriate
>> >>  Signed-off-by: Khem Raj <raj.khem@...>
>> >>
>> >> -Index: M2Crypto-0.30.1/setup.py
>> >> -===================================================================
>> >> ---- M2Crypto-0.30.1.orig/setup.py
>> >> -+++ M2Crypto-0.30.1/setup.py
>> >> -@@ -160,22 +160,6 @@ class _M2CryptoBuildExt(build_ext.build_
>> >> +--- a/setup.py
>> >> ++++ b/setup.py
>> >> +@@ -169,22 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
>> >>               log.debug('self.include_dirs = %s', self.include_dirs)
>> >>               log.debug('self.library_dirs = %s', self.library_dirs)
>> >>
>> >> diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb
>> >> deleted file mode 100644
>> >> index 4d63d4bd3a..0000000000
>> >> --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb
>> >> +++ /dev/null
>> >> @@ -1,2 +0,0 @@
>> >> -inherit setuptools3
>> >> -require python-m2crypto.inc
>> >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> >> similarity index 86%
>> >> rename from meta-python/recipes-devtools/python/python-m2crypto.inc
>> >> rename to meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> >> index 797a0354bf..896d9d2cc4 100644
>> >> --- a/meta-python/recipes-devtools/python/python-m2crypto.inc
>> >> +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> >> @@ -8,13 +8,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-m2crypto:"
>> >>
>> >>  SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \
>> >>              file://cross-compile-platform.patch \
>> >> -            file://m2crypto-0.26.4-gcc_macros.patch \
>> >> +            file://0001-Allow-verify_cb_-to-be-called-with-ok-True.patch \
>> >> +            file://0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch \
>> >>             "
>> >> -SRC_URI[md5sum] = "7fce3cbf85eb84a669682892b935746b"
>> >> -SRC_URI[sha256sum] = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6"
>> >> +SRC_URI[sha256sum] = "e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3"
>> >>
>> >>  PYPI_PACKAGE = "M2Crypto"
>> >> -inherit pypi siteinfo
>> >> +inherit pypi siteinfo setuptools3
>> >>
>> >>  DEPENDS += "openssl swig-native"
>> >>  RDEPENDS_${PN} += "\
>> >> --
>> >> 2.31.1
>> >>
>> >>
>> >>
>> >>

Join openembedded-devel@lists.openembedded.org to automatically receive all group messages.