diff --git a/python-uamqp-openssl3.patch b/python-uamqp-openssl3.patch index f2aacd992ec0170e9836af03091441a59943199b..a26b0ad1316f9e0b107c84515a8bcef0c9a93515 100644 --- a/python-uamqp-openssl3.patch +++ b/python-uamqp-openssl3.patch @@ -1,34 +1,21 @@ -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 ++-- - 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 ---- 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 -@@ -1052,7 +1052,7 @@ static int create_openssl_instance(TLS_IO_INSTANCE* tlsInstance) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/tlsio_openssl.c 2024-10-31 10:25:00.749140293 +0800 +@@ -1062,7 +1062,7 @@ const SSL_METHOD* method = NULL; --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (OPENSSL_VERSION_NUMBER >= 0x20000000L) +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) if (tlsInstance->tls_version == VERSION_1_2) { method = TLSv1_2_method(); -@@ -1248,7 +1248,7 @@ void tlsio_openssl_deinit(void) +@@ -1264,7 +1264,7 @@ #if (OPENSSL_VERSION_NUMBER < 0x10000000L) ERR_remove_state(0); --#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) || (OPENSSL_VERSION_NUMBER >= 0x20000000L) +-#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) ERR_remove_thread_state(NULL); #endif #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && (OPENSSL_VERSION_NUMBER < 0x10010000L) && (SSL_COMP_free_compression_methods) --- -2.39.1 - diff --git a/python-uamqp-treat-warnings-as-warnings.patch b/python-uamqp-treat-warnings-as-warnings.patch index 8fb1ce7e09a8796bfeb931e3c664f8132b4f2811..831a40c99694aba9e2ba12fc98729e4267cbe52c 100644 --- a/python-uamqp-treat-warnings-as-warnings.patch +++ b/python-uamqp-treat-warnings-as-warnings.patch @@ -1,31 +1,16 @@ -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 ------ - .../azure-c-shared-utility/deps/umock-c/CMakeLists.txt | 9 --------- - .../deps/umock-c/deps/ctest/CMakeLists.txt | 6 ++---- - .../testtools/ctest/CMakeLists.txt | 6 ++---- - src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt | 9 --------- - .../azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt | 6 ++---- - 6 files changed, 6 insertions(+), 36 deletions(-) - -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake -index 63a75bc..1687491 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake -@@ -71,8 +71,6 @@ if(MSVC) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake 2024-10-31 10:19:56.284170169 +0800 +@@ -71,8 +71,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") elseif(UNIX) #LINUX OR APPLE - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") if(NOT (IN_OPENWRT OR APPLE)) - set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}") - endif() -@@ -209,10 +207,6 @@ IF((WIN32) AND (NOT(MINGW))) + # _XOPEN_SOURCE=500 is required for glibc to expose random and srandom. + set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500 ${CMAKE_C_FLAGS}") +@@ -210,10 +208,6 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Make warning as error add_definitions(/WX) @@ -35,12 +20,11 @@ index 63a75bc..1687491 100644 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") ENDIF() - -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt -index dead94d..d869028 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt -@@ -22,15 +22,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt 2024-10-31 10:19:56.284170169 +0800 +@@ -22,15 +22,6 @@ # Build with -fPIC always set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) @@ -56,11 +40,10 @@ index dead94d..d869028 100644 include (CTest) include (CheckIncludeFiles) -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt -index ddac93f..3bbf0b1 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt -@@ -51,21 +51,19 @@ if(MSVC) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt 2024-10-31 10:19:56.284170169 +0800 +@@ -51,21 +51,19 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") # WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX) @@ -84,11 +67,10 @@ index ddac93f..3bbf0b1 100644 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt) add_subdirectory(deps/azure-macro-utils-c) else() -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt -index ddac93f..3bbf0b1 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt -@@ -51,21 +51,19 @@ if(MSVC) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt 2024-10-31 10:19:56.285170176 +0800 +@@ -51,21 +51,19 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") # WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX) @@ -112,11 +94,10 @@ index ddac93f..3bbf0b1 100644 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt) add_subdirectory(deps/azure-macro-utils-c) else() -diff --git a/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt -index ac865be..d869028 100644 ---- a/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt -@@ -22,15 +22,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt 2024-10-31 10:19:56.285170176 +0800 +@@ -22,15 +22,6 @@ # Build with -fPIC always set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) @@ -132,11 +113,10 @@ index ac865be..d869028 100644 include (CTest) include (CheckIncludeFiles) -diff --git a/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt -index ddac93f..3bbf0b1 100644 ---- a/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt -@@ -51,21 +51,19 @@ if(MSVC) +diff -Nuar uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt +--- uamqp-1.6.11/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt 2024-10-29 02:40:44.000000000 +0800 ++++ uamqp-1.6.11.work/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt 2024-10-31 10:19:56.285170176 +0800 +@@ -51,21 +51,19 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") # WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX) @@ -160,6 +140,3 @@ index ddac93f..3bbf0b1 100644 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt) add_subdirectory(deps/azure-macro-utils-c) else() --- -2.39.1 - diff --git a/python-uamqp.spec b/python-uamqp.spec index 60461c6e869d870339d35a65e7328a6eb81ff89c..14b5d1e8833e5aedaf245438520779f42ccc1b71 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.10 +Version: 1.6.11 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/4c/d0/d2a86d6092c0b9f0d9ef6eda972c4de55caa8e7533f757fa9df14add7c52/uamqp-1.6.10.tar.gz +Source0: https://files.pythonhosted.org/packages/2e/99/e5fbdd1964f2b7f04fcfacd9c8252a998725af2c2b186d5436ff0499a886/uamqp-1.6.11.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.10 -p1 +%autosetup -n uamqp-%{version} -p1 %build %py3_build @@ -76,6 +76,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Oct 31 2024 liutao1 - 1.6.11-1 +- Update package to version 1.6.11 + * Mon Oct 21 2024 dongqi - 1.6.10-1 - Update package version to 1.6.10 diff --git a/uamqp-1.6.10.tar.gz b/uamqp-1.6.11.tar.gz similarity index 38% rename from uamqp-1.6.10.tar.gz rename to uamqp-1.6.11.tar.gz index 8cabb433f35ad99f38bd5c30aec5aa4a5e7c30e7..bb8c0a9912d8bbca6ead45619db56a73b944eb18 100644 Binary files a/uamqp-1.6.10.tar.gz and b/uamqp-1.6.11.tar.gz differ