paho-mqtt-c: upgrade 1.3.4 -> 1.3.5

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 2 insertions, 42 deletions

diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch
deleted file mode 100644
index 12f9e7abcc..0000000000
--- a/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 96233a8382b9520293a48b08dc3b204a21205800 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@cn.fujitsu.com>
-Date: Fri, 24 Apr 2020 00:53:19 +0900
-Subject: [PATCH] Fix bug of free() with musl
-
-This fixes build error with musl C library:
-/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:24:
-error: expected declaration specifiers or '...' before string constant
-   55 | #define free(x) myfree(__FILE__, __LINE__, x)
-      |                        ^~~~~~~~
-/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:34:
-error: expected declaration specifiers or '...' before numeric constant
-   55 | #define free(x) myfree(__FILE__, __LINE__, x)
-      |                                  ^~~~~~~~
-
-Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
----
- src/MQTTReasonCodes.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/MQTTReasonCodes.c b/src/MQTTReasonCodes.c
-index 416eab5..479dbac 100644
---- a/src/MQTTReasonCodes.c
-+++ b/src/MQTTReasonCodes.c
-@@ -16,10 +16,10 @@
- 
- #include "MQTTReasonCodes.h"
- 
--#include "Heap.h"
- #include "StackTrace.h"
- 
- #include <memory.h>
-+#include "Heap.h"
- 
- #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
- 
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb
index 2d4e39bf97..673a24742f 100644
--- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb
+++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = " \
     file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \
 "
 
-SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http \
-           file://0001-Fix-bug-of-free-with-musl.patch"
+SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http"
 
-SRCREV = "2d3d0941a9233889d4d5cc37f5182bbefea261ad"
+SRCREV = "153dfd3a4a1d510697c5d55e169fa158db16e04a"
 
 DEPENDS = "openssl"