python312Packages.uamqp: 1.6.9 -> 1.6.11 (#353152)

diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx

index b99647c..479cc9c 100644

--- a/src/message_receiver.pyx

+++ b/src/message_receiver.pyx

@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase):

 #### Callbacks (context is a MessageReceiver instance)

-cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state):

+cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state):

     if context != NULL:

         context_pyobj = <PyObject*>context

         if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback

From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001

From: Sandro <sandro.jaeckel@gmail.com>

Date: Sat, 16 Jan 2021 15:54:05 +0100

Subject: [PATCH] Fix finding apple libraries

---

 CMakeLists.txt | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499,

seems problem it's solving is nixpkgs-specific)

diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt

index 7bbfa6f3f..3567b18bc 100644

--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt

+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt

@@ -120,8 +120,9 @@ endif()

 if(${use_applessl})

     # MACOSX only has native tls and open ssl, so use the native apple tls

-    find_library(cf_foundation Foundation)

+    find_library(cf_foundation CoreFoundation)

     find_library(cf_network CFNetwork)

+    find_library(cf_security Security)

 endif()

 if(${no_logging})

@@ -581,7 +582,7 @@ endif()

 if(${use_applessl})

-    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network})

+    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security})

 endif()

 if(WIN32)

  stdenv,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  cython_0,

  fetchpatch2,

  setuptools,

  cython,

  certifi,

  CFNetwork,

  cmake,

buildPythonPackage rec {

  pname = "uamqp";

  version = "1.6.9";

  format = "setuptools";

  version = "1.6.11";

  pyproject = true;

  src = fetchFromGitHub {

    owner = "Azure";

    repo = "azure-uamqp-python";

    rev = "refs/tags/v${version}";

    hash = "sha256-sDRIM41zey1F6/x1ZioJJBAQCVyf1NKzhS82Ew08pgM=";

    hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";

  };

  patches =

    lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [

      ./darwin-azure-c-shared-utility-corefoundation.patch

    ]

    ++ [

      (fetchpatch {

        name = "CVE-2024-25110.patch";

        url = "https://github.com/Azure/azure-uamqp-c/commit/30865c9ccedaa32ddb036e87a8ebb52c3f18f695.patch";

        stripLen = 1;

        extraPrefix = "src/vendor/azure-uamqp-c/";

        hash = "sha256-igzZqTLUUyuNcpCUbYHI4RXmWxg+7EC/yyD4DBurR2M=";

  patches = [

    (fetchpatch2 {

      name = "fix-clang16-compatibility.patch";

      url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch";

      hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM=";

    })

      (fetchpatch {

        name = "CVE-2024-27099.patch";

        url = "https://github.com/Azure/azure-uamqp-c/commit/2ca42b6e4e098af2d17e487814a91d05f6ae4987.patch";

        stripLen = 1;

        extraPrefix = "src/vendor/azure-uamqp-c/";

        # other files are just tests which aren't run from the python

        # builder anyway

        includes = [ "src/vendor/azure-uamqp-c/src/link.c" ];

        hash = "sha256-EqDfG1xAz5CG8MssSSrz8Yrje5qwF8ri1Kdw+UUu5ms=";

      })

      # Fix incompatible function pointer conversion error with clang 16.

      ./clang-fix-incompatible-function-pointer-conversion.patch

  ];

  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) ''

      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt

  '';

  build-system = [

    cython

    setuptools

  ];

  nativeBuildInputs = [

    cmake

    cython_0

  ];

  buildInputs =

      Security

    ];

  propagatedBuildInputs = [ certifi ];

  dependencies = [ certifi ];

  dontUseCmakeConfigure = true;