[Buildroot] [PATCH 1/1] package/python-cryptography: bump to version 38.0.1

[Buildroot] [PATCH 1/1] package/python-cryptography: bump to version 38.0.1

[James Hilliard]

Drop patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...id-OPENSSL_NO_PSK-defined-guard-7146.patch | 56 -------------------
 .../python-cryptography.hash                  |  2 +-
 .../python-cryptography.mk                    |  4 +-
 3 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 package/python-cryptography/0001-Remove-invalid-OPENSSL_NO_PSK-defined-guard-7146.patch

diff --git a/package/python-cryptography/0001-Remove-invalid-OPENSSL_NO_PSK-defined-guard-7146.patch b/package/python-cryptography/0001-Remove-invalid-OPENSSL_NO_PSK-defined-guard-7146.patch
deleted file mode 100644
index 5d953b8931..0000000000
--- a/package/python-cryptography/0001-Remove-invalid-OPENSSL_NO_PSK-defined-guard-7146.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 891a06101d7b48c61d0d3174f79e9962b995770e Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Fri, 29 Apr 2022 16:06:10 -0600
-Subject: [PATCH] Remove invalid OPENSSL_NO_PSK defined guard (#7146)
-
-These symbols are not conditional on OPENSSL_NO_PSK in ssl.h
-
-SSL_CTX_set_psk_find_session_callback:
-https://github.com/openssl/openssl/blob/openssl-3.0.2/include/openssl/ssl.h.in#L847
-
-SSL_CTX_set_psk_use_session_callback:
-https://github.com/openssl/openssl/blob/openssl-3.0.2/include/openssl/ssl.h.in#L850-L851
-
-As such we can not guard the fallback with defined(OPENSSL_NO_PSK)
-as this will result in redeclaration errors.
-
-Fixes:
-build/temp.linux-sparc64-3.10/_openssl.c:2286:8: error: 'SSL_CTX_set_psk_find_session_callback' redeclared as different kind of symbol
- 2286 | void (*SSL_CTX_set_psk_find_session_callback)(SSL_CTX *,
-      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from build/temp.linux-sparc64-3.10/_openssl.c:832:
-/home/giuliobenetti/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:855:6: note: previous declaration of 'SSL_CTX_set_psk_find_session_callback' was here
-  855 | void SSL_CTX_set_psk_find_session_callback(SSL_CTX *ctx,
-      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-build/temp.linux-sparc64-3.10/_openssl.c:2293:8: error: 'SSL_CTX_set_psk_use_session_callback' redeclared as different kind of symbol
- 2293 | void (*SSL_CTX_set_psk_use_session_callback)(SSL_CTX *,
-      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from build/temp.linux-sparc64-3.10/_openssl.c:832:
-/home/giuliobenetti/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:858:6: note: previous declaration of 'SSL_CTX_set_psk_use_session_callback' was here
-  858 | void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx,
-      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
-[james.hilliard1@gmail.com: backport from upstream commit
-891a06101d7b48c61d0d3174f79e9962b995770e]
----
- src/_cffi_src/openssl/ssl.py | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
-index 1314b85b0..d036e4f2d 100644
---- a/src/_cffi_src/openssl/ssl.py
-+++ b/src/_cffi_src/openssl/ssl.py
-@@ -785,8 +785,7 @@ void (*SSL_CTX_set_cookie_verify_cb)(SSL_CTX *,
- static const long Cryptography_HAS_SSL_COOKIE = 1;
- #endif
- #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 || \
--    CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL || \
--    defined(OPENSSL_NO_PSK)
-+    CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL
- static const long Cryptography_HAS_PSK_TLSv1_3 = 0;
- void (*SSL_CTX_set_psk_find_session_callback)(SSL_CTX *,
-                                            int (*)(
--- 
-2.25.1
-
diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash
index 66ac9d094a..0f6a62164b 100644
--- a/package/python-cryptography/python-cryptography.hash
+++ b/package/python-cryptography/python-cryptography.hash
@@ -1,5 +1,5 @@
 # Locally calculated after vendoring
-sha256  49692c2a2b7c18f854d20ac5239cd5bbccef033e3efdc7647b3e29fd5970c823  cryptography-37.0.4.tar.gz
+sha256  59f77beef181a9e6643ad2c10b8c6551fc561452287bd3552bec76c86d55b774  cryptography-38.0.1.tar.gz
 # Locally computed sha256 checksums
 sha256  43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2  LICENSE
 sha256  aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE.APACHE
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 28ccc8a65c..c0265f5bfa 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CRYPTOGRAPHY_VERSION = 37.0.4
+PYTHON_CRYPTOGRAPHY_VERSION = 38.0.1
 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/89/d9/5fcd312d5cce0b4d7ee8b551a0ea99e4ea9db0fdbf6dd455a19042e3370b
+PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6d/0c/5e67831007ba6cd7e52c4095f053cf45c357739b0a7c46a45ddd50049019
 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
 PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
 PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/python-cryptography: bump to version 38.0.1

[Thomas Petazzoni]

On Sun, 11 Sep 2022 17:02:11 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> Drop patch which is now upstream.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  ...id-OPENSSL_NO_PSK-defined-guard-7146.patch | 56 -------------------
>  .../python-cryptography.hash                  |  2 +-
>  .../python-cryptography.mk                    |  4 +-
>  3 files changed, 3 insertions(+), 59 deletions(-)
>  delete mode 100644 package/python-cryptography/0001-Remove-invalid-OPENSSL_NO_PSK-defined-guard-7146.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot