diff --git a/python-uamqp-openssl3.patch b/python-uamqp-openssl3.patch index 8168c846eba9c9c3f2abf03a2cdac446dcb30d90..f2aacd992ec0170e9836af03091441a59943199b 100644 --- a/python-uamqp-openssl3.patch +++ b/python-uamqp-openssl3.patch @@ -1,18 +1,11 @@ -From ada26c0d5e5316347936a934f9de9ab5b5571dee Mon Sep 17 00:00:00 2001 -From: Simon Chopin -Date: Wed, 24 Nov 2021 17:07:25 +0100 -Subject: [PATCH] Relax the range checks on the OpenSSL version - -OpenSSL 3.0 has a high degree of API compatibility with the 1.1.1 -branch, so the 1.1 code branches are also valid for higher versions. - -Note that this patch does *not* address the deprecation warnings -introduced by OpenSSL 3.0. +From f677a7a1ca28682e9fd3cf343450ea491006fc78 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Thu, 27 Jun 2024 18:53:32 +0800 +Subject: [PATCH] python-uamqp-openssl3 --- .../deps/azure-c-shared-utility/adapters/tlsio_openssl.c | 4 ++-- - .../deps/azure-c-shared-utility/adapters/x509_openssl.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c index 1832994..5e08d5c 100644 @@ -36,19 +29,6 @@ index 1832994..5e08d5c 100644 ERR_remove_thread_state(NULL); #endif #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && (OPENSSL_VERSION_NUMBER < 0x10010000L) && (SSL_COMP_free_compression_methods) -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c -index 12107ff..84a29f5 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c -@@ -345,7 +345,7 @@ int x509_openssl_add_certificates(SSL_CTX* ssl_ctx, const char* certificates) - else - { - /*Codes_SRS_X509_OPENSSL_02_012: [ x509_openssl_add_certificates shall get the memory BIO method function by calling BIO_s_mem. ]*/ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - const BIO_METHOD* bio_method; - #else - BIO_METHOD* bio_method; -- -2.35.1 +2.39.1 diff --git a/python-uamqp-treat-warnings-as-warnings.patch b/python-uamqp-treat-warnings-as-warnings.patch index e6947a03b38b0fb254fd148de46ca26330997a8c..8fb1ce7e09a8796bfeb931e3c664f8132b4f2811 100644 --- a/python-uamqp-treat-warnings-as-warnings.patch +++ b/python-uamqp-treat-warnings-as-warnings.patch @@ -1,7 +1,7 @@ -From 8ecfdb80f318e5907083812d1b39131f07145937 Mon Sep 17 00:00:00 2001 -From: Major Hayden -Date: Wed, 22 Sep 2021 06:28:20 -0500 -Subject: [PATCH] Disable treating warnings as errors +From de936ae43fc00970f2bfec6a2da09a60b820a5d7 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Thu, 27 Jun 2024 18:40:46 +0800 +Subject: [PATCH] python-uamqp-treat-warnings-as-warnings --- .../configs/azure_iot_build_rules.cmake | 6 ------ @@ -161,5 +161,5 @@ index ddac93f..3bbf0b1 100644 add_subdirectory(deps/azure-macro-utils-c) else() -- -2.35.1 +2.39.1 diff --git a/python-uamqp.spec b/python-uamqp.spec index 03d687b2bf82d74c049479e266890eff74e55462..a26d7496ad16f97a9c3ab4309b66d502c2356457 100644 --- a/python-uamqp.spec +++ b/python-uamqp.spec @@ -1,11 +1,11 @@ %global _empty_manifest_terminate_build 0 Name: python-uamqp -Version: 1.6.4 +Version: 1.6.9 Release: 1 Summary: AMQP 1.0 Client Library for Python License: MIT License URL: https://github.com/Azure/azure-uamqp-python -Source0: https://files.pythonhosted.org/packages/5d/2b/cb2adb0e27233fe5383ce944ea83a959901f26c727fe7d0d89a6839886ae/uamqp-1.6.4.tar.gz +Source0: https://files.pythonhosted.org/packages/aa/48/9c53d0d4911888e2d20685639602e580032b2467af6f0025478d5fe5caed/uamqp-1.6.9.tar.gz Patch0001: python-uamqp-treat-warnings-as-warnings.patch Patch0002: python-uamqp-openssl3.patch @@ -36,7 +36,7 @@ Provides: python3-uamqp-doc An AMQP 1.0 client library for Python. %prep -%autosetup -n uamqp-1.6.4 -p1 +%autosetup -n uamqp-1.6.9 -p1 %build %py3_build @@ -76,5 +76,8 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Jun 27 2024 liuzhilin - 1.6.9-1 +- Update to 1.6.9 + * Tue Mar 07 2023 Python_Bot - 1.6.4-1 - Package Spec generated diff --git a/uamqp-1.6.4.tar.gz b/uamqp-1.6.9.tar.gz similarity index 39% rename from uamqp-1.6.4.tar.gz rename to uamqp-1.6.9.tar.gz index 234f527c0aa629f65fe0e8f78f697a1d432e400c..d8f7b25366d966fa824320f93aed140d096e6e01 100644 Binary files a/uamqp-1.6.4.tar.gz and b/uamqp-1.6.9.tar.gz differ