From e7c652f22519163c277a4770fea66e38cbf5c2e3 Mon Sep 17 00:00:00 2001
From: Oleg Babin <babinoleg@mail.ru>
Date: Mon, 5 Jan 2026 18:21:48 +0400
Subject: [PATCH] drop ubsan fix patch

---
 CMakeLists.txt                     |  5 ++--
 librdkafka                         |  2 +-
 patches/librdkafka-fix-ubsan.patch | 42 ------------------------------
 3 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 patches/librdkafka-fix-ubsan.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e406d1a..bbfb606 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,8 +74,8 @@ if(STATIC_BUILD)
             --disable-lz4-ext
             --disable-curl
             --enable-static
-        BUILD_COMMAND make -C src -j
-        INSTALL_COMMAND make -C src install
+        BUILD_COMMAND $(MAKE) -C src -j
+        INSTALL_COMMAND $(MAKE) -C src install
         PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-47.patch"
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-52.patch"
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-55.patch"
@@ -84,7 +84,6 @@ if(STATIC_BUILD)
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-71.patch"
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-72.patch"
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-tarantool-security-94.patch"
-        COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-fix-ubsan.patch"
         COMMAND       patch -d <SOURCE_DIR> -p1 -i "${PATCHES_DIR}/librdkafka-fix-centos7.patch"
     )
 
diff --git a/librdkafka b/librdkafka
index 59b2f66..f703d01 160000
--- a/librdkafka
+++ b/librdkafka
@@ -1 +1 @@
-Subproject commit 59b2f66b95ce763c102437d50d4e2a548962e091
+Subproject commit f703d0188d83fe5a7a61142b5beb59ad6fe370b4
diff --git a/patches/librdkafka-fix-ubsan.patch b/patches/librdkafka-fix-ubsan.patch
deleted file mode 100644
index bff0ef0..0000000
--- a/patches/librdkafka-fix-ubsan.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/rdkafka_assignor.c b/src/rdkafka_assignor.c
-index 465568c4..124df9de 100644
---- a/src/rdkafka_assignor.c
-+++ b/src/rdkafka_assignor.c
-@@ -235,7 +235,8 @@ static int rd_kafka_member_subscription_match(
- }
- 
- 
--static void rd_kafka_assignor_topic_destroy(rd_kafka_assignor_topic_t *at) {
-+static void rd_kafka_assignor_topic_destroy(void *rkat) {
-+        rd_kafka_assignor_topic_t *at = (rd_kafka_assignor_topic_t *)rkat;
-         rd_list_destroy(&at->members);
-         rd_free(at);
- }
-@@ -267,7 +268,7 @@ rd_kafka_member_subscriptions_map(rd_kafka_cgrp_t *rkcg,
-             rd_kafka_metadata_get_internal(metadata);
- 
-         rd_list_init(eligible_topics, RD_MIN(metadata->topic_cnt, 10),
--                     (void *)rd_kafka_assignor_topic_destroy);
-+                     rd_kafka_assignor_topic_destroy);
- 
-         /* For each topic in the cluster, scan through the member list
-          * to find matching subscriptions. */
-@@ -451,7 +452,8 @@ rd_kafka_assignor_t *rd_kafka_assignor_find(rd_kafka_t *rk,
- /**
-  * Destroys an assignor (but does not unlink).
-  */
--static void rd_kafka_assignor_destroy(rd_kafka_assignor_t *rkas) {
-+static void rd_kafka_assignor_destroy(void *rkasp) {
-+        rd_kafka_assignor_t *rkas = (rd_kafka_assignor_t *) rkasp;
-         rd_kafkap_str_destroy(rkas->rkas_protocol_type);
-         rd_kafkap_str_destroy(rkas->rkas_protocol_name);
-         rd_free(rkas);
-@@ -580,7 +582,7 @@ int rd_kafka_assignors_init(rd_kafka_t *rk, char *errstr, size_t errstr_size) {
-         int idx = 0;
- 
-         rd_list_init(&rk->rk_conf.partition_assignors, 3,
--                     (void *)rd_kafka_assignor_destroy);
-+                     rd_kafka_assignor_destroy);
- 
-         /* Initialize builtin assignors (ignore errors) */
-         rd_kafka_range_assignor_init(rk);