summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-04-15 23:53:51 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-04-19 16:32:18 +0300
commite34f89623c246d261efb7fd0f2ce4a30b10bd59d (patch)
treef61e6dd5e5fc96c077c7bf85bb78c55a4c777bbd /meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
parentf1e440673465aa768f31e78c0c201002f9f767b7 (diff)
downloadopenbmc-e34f89623c246d261efb7fd0f2ce4a30b10bd59d.tar.xz
meta-openembedded: subtree update:da393545a2..08c0280b7c
Andreas Müller (8): networkmanager-openvpn: Fix packageing mousepad: upgrade 0.5.3 -> 0.5.4 xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4 gigolo: upgrade 0.5.1 -> 0.5.2 thunar: upgrade 4.16.4 -> 4.16.6 poppler: upgrade 21.03.0 -> 21.04.0 catfish: add python3-dbus to RDEPENDS fluidsynth: upgrade 2.1.7 -> 2.2.0 Andrew Geissler (1): nodejs: ppc64le machine support Awais Belal (1): libnet-ssleay-perl: add rdep on perl-module-autoloader Hermes Zhang (1): gpsd: backport d-bus message time patch from upstream Hongxu Jia (1): debootstrap: 1.0.67 -> 1.0.123 Kamil Dziezyk (1): bats: upgrade 1.1.0 -> 1.3.0 Kartikey Rameshbhai Parmar (1): fluidsynth: update SRC_URI to remove non-existing 2.1.x branch Khem Raj (12): mariadb: Fix build on newer 32bit architectures iwd: Upgade to 1.13 libmanette: Add recipe pidgin-sipe: Fix build with glib-2.0 >= 2.68 gjs: Fix build with gcc11 poppler: Backport patches to fix build with glib-2.0 2.68+ and GCC11 opencv: Upgrade to 5.4.2 Revert "iwd: Upgade to 1.13" core-image-minimal-xfce: Use graphical.target as default tbb: Fix build with musl vnstat: Disable install parallism to fix a potential install race open-vm-tools: Fix build with gcc 11 Leon Anavi (57): python3-sqlalchemy: Upgrade 1.4.3 -> 1.4.4 python3-bitarray: Upgrade 1.8.1 -> 1.8.2 python3-httplib2: Upgrade 0.19.0 -> 0.19.1 python3-parso: Upgrade 0.8.1 -> 0.8.2 python3-matplotlib: Upgrade 3.3.4 -> 3.4.1 python3-pyroute2: Upgrade 0.5.15 -> 0.5.16 python3-h5py: Upgrade 3.1.0 -> 3.2.1 python3-cheetah: Upgrade 3.2.6 -> 3.2.6.post1 python3-google-api-python-client: Upgrade 2.0.2 -> 2.1.0 python3-xlsxwriter: Upgrade 1.3.7 -> 1.3.8 python3-pymisp: Upgrade 2.4.140 -> 2.4.141 python3-tqdm: Upgrade 4.58.0 -> 4.59.0 python3-contextlib2: Upgrade 0.6.0 -> 0.6.0.post1 python3-typeguard: Upgrade 2.11.1 -> 2.12.0 python3-decorator: Upgrade 4.4.2 -> 5.0.1 python3-pillow: Upgrade 8.1.2 -> 8.2.0 python3-aiohttp: Upgrade 3.7.4 -> 3.7.4.post0 python3-networkx: Upgrade 2.5 -> 2.5.1 python3-pysonos: Upgrade 0.0.40 -> 0.0.41 python3-docutils: Upgrade 0.16 -> 0.17 python3-bitarray: Upgrade 1.8.2 -> 1.9.0 python3-regex: Upgrade 2021.3.17 -> 2021.4.4 python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5 python3-pychromecast: Upgrade 9.1.1 -> 9.1.2 python3-decorator: Upgrade 5.0.1 -> 5.0.5 python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1 python3-pyroute2: Upgrade 0.5.16 -> 0.5.17 python3-transitions: Upgrade 0.8.7 -> 0.8.8 python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6 python3-bitarray: Upgrade 1.9.0 -> 1.9.1 python3-pysonos: Upgrade 0.0.41 -> 0.0.42 python3-django: Upgrade 3.1.7 -> 3.2 python3-tqdm: Upgrade 4.59.0 -> 4.60.0 python3-xmlschema: Upgrade 1.5.3 -> 1.6.0 python3-ruamel-yaml: Upgrade 0.17.2 -> 0.17.4 python3-croniter: Upgrade 1.0.10 -> 1.0.11 python3-decorator: Upgrade 5.0.5 -> 5.0.6 python3-grpcio-tools: Upgrade 1.36.1 -> 1.37.0 python3-speedtest-cli: Upgrade 2.1.2 -> 2.1.3 python3-python-vlc: Upgrade 3.0.11115 -> 3.0.12117 python3-robotframework: Upgrade 4.0 -> 4.0.1 python3-grpcio: Upgrade 1.36.1 -> 1.37.0 python3-cerberus: Upgrade 1.3.2 -> 1.3.3 python3-humanize: Upgrade 3.3.0 -> 3.4.0 python3-monotonic: Upgrade 1.5 -> 1.6 python3-sqlalchemy: Upgrade 1.4.6 -> 1.4.7 python3-typed-ast: Upgrade 1.4.2 -> 1.4.3 python3-backports-functools-lru-cache: Upgrade 1.6.3 -> 1.6.4 python3-xmlschema: Upgrade 1.6.0 -> 1.6.1 python3-pyroute2: Upgrade 0.5.17 -> 0.5.18 python3-sympy: Upgrade 1.7.1 -> 1.8 python3-pandas: Upgrade 1.2.3 -> 1.2.4 python3-humanize: Upgrade 3.4.0 -> 3.4.1 python3-decorator: Upgrade 5.0.6 -> 5.0.7 python3-colorlog: Upgrade 4.8.0 -> 5.0.1 python3-google-api-python-client: Upgrade 2.1.0 -> 2.2.0 python3-croniter: Upgrade 1.0.11 -> 1.0.12 Martin Jansa (13): packagegroup-meta-oe: include glfw, icewm, geis only with x11 in DISTRO_FEATURES phonet-utils: remove packagegroup-meta-oe: use 4 spaces for identation telepathy-glib: respect GI_DATA_ENABLED when enabling vala-bindings uml-utilities: fix installed-vs-shipped with usrmerge libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge libyui: switch to libyui-old repo which still has this SRCREV libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely android-tools: use PN instead of BPN in RDEPENDS pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67 pidgin: upgrade to 2.14.2 opencv: fetch wechat_qrcode files used by dnn PACKAGECONFIG opencv: link sfm module with Glog Mingli Yu (2): freeradius: Upgrade to 3.0.21 hostapd: fix CVE-2021-0326 and CVE-2021-27803 Naveen Saini (2): tbb: upgrade 2020.3 -> 2021.2.0 ocl-icd: upgrade 2.2.14 -> 2.3.0 Randy MacLeod (2): doxygen: Upgrade 1.8.20 -> 1.9.1 open-vm-tools: upgrade 11.0.1 -> 11.2.5 Ross Burton (1): fwts: upgrade to 21.03.00 Stefan Ghinea (1): hostapd: fix CVE-2021-30004 Vinicius Aquino (1): networkmanager: upgrade 1.28.0 -> 1.30.2 Vinícius Ossanes Aquino (2): modemmanager: upgrade 1.14.10 -> 1.16.2 libqmi: upgrade 1.26.6 -> 1.28.2 Yi Fan Yu (2): rsyslog: fix some of the ptests redis: upgrade 6.0.9 -> 6.2.1 hasan.men (2): librdkafka: Add initial recipe v1.6.1 libcppkafka: Add initial recipe for cppkafka wrapper persianpros (5): PEP8 double aggressive E701, E70 and E502 PEP8 double aggressive E20 and E211 PEP8 double aggressive E22, E224, E241, E242 and E27 PEP8 double aggressive E301 ~ E306 PEP8 double aggressive W291 ~ W293 and W391 wangmy (2): mariadb: upgrade 10.5.8 -> 10.5.9 uftrace: Fix error on aarch64 when binutils update to 2.35.1 zangrc (14): gnome-autoar: upgrade 0.2.4 -> 0.3.1 emacs: upgrade 27.1 -> 27.2 fbgrab: upgrade 1.4 -> 1.5 ostree: upgrade 2020.8 -> 2021.1 zabbix: upgrade 5.2.5 -> 5.2.6 libxaw: upgrade 1.0.13 -> 1.0.14 mosquitto: upgrade 2.0.9 -> 2.0.10 nbdkit: upgrade 1.25.4 -> 1.25.5 stunnel: upgrade 5.58 -> 5.59 usbredir: upgrade 0.8.0 -> 0.9.0 hwdata: upgrade 0.345 -> 0.346 live555: upgrade 20210322 -> 20210406 rabbitmq-c: upgrade 0.10.0 -> 0.11.0 xterm: upgrade 366 -> 367 zhengruoqin (7): fetchmail: upgrade 6.4.17 -> 6.4.18 lldpd: upgrade 1.0.4 -> 1.0.8 networkmanager-openvpn: upgrade 1.8.12 -> 1.8.14 snort: upgrade 2.9.17 -> 2.9.17.1 python3-absl: upgrade 0.10.0 -> 0.12.0 python3-astroid: upgrade 2.5.2 -> 2.5.3 python3-bitarray: upgrade 1.9.1 -> 1.9.2 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I1f0f809aeda70e82140fec5e3310cbf89c760ad4
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch192
1 files changed, 192 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
new file mode 100644
index 000000000..ceb48d21f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
@@ -0,0 +1,192 @@
+From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 5 Apr 2021 11:36:50 -0700
+Subject: [PATCH] Migrate to use g_memdup2
+
+g_memdup has been deprecated for long and latest glib-2.0 2.68+ has
+turned it int an error to use old function.
+
+The fall-back to g_memdup isn't needed because pidgin provides g_memdup2
+in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h
+based on glib-2.0 version:
+ /* Backport the static inline version of g_memdup2 if we don't have g_memdup2.
+ * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html
+ * for more information.
+ */
+ #if !GLIB_CHECK_VERSION(2, 67, 3)
+ static inline gpointer
+ g_memdup2(gconstpointer mem, gsize byte_size) {
+ gpointer new_mem = NULL;
+
+ if(mem && byte_size != 0) {
+ new_mem = g_malloc (byte_size);
+ memcpy (new_mem, mem, byte_size);
+ }
+
+ return new_mem;
+ }
+ #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/api/sipe-common.h | 3 +++
+ src/core/sip-sec-gssapi.c | 4 ++--
+ src/core/sip-sec-ntlm.c | 12 ++++++------
+ src/core/sip-sec-tls-dsk.c | 4 ++--
+ src/core/sipe-media.c | 2 +-
+ src/core/sipe-tls-tester.c | 2 +-
+ src/core/sipe-tls.c | 4 ++--
+ src/telepathy/telepathy-protocol.c | 2 +-
+ 8 files changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h
+index c964f15..cab81e0 100644
+--- a/src/api/sipe-common.h
++++ b/src/api/sipe-common.h
+@@ -51,3 +51,6 @@
+ #ifdef _MSC_VER
+ typedef long ssize_t;
+ #endif
++
++// for g_memdup2
++#include <libpurple/glibcompat.h>
+diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c
+index 873080f..4c63868 100644
+--- a/src/core/sip-sec-gssapi.c
++++ b/src/core/sip-sec-gssapi.c
+@@ -602,7 +602,7 @@ sip_sec_init_sec_context__gssapi(SipSecContext context,
+
+ out_buff->length = output_token.length;
+ if (out_buff->length)
+- out_buff->value = g_memdup(output_token.value, output_token.length);
++ out_buff->value = g_memdup2(output_token.value, output_token.length);
+ else
+ /* Special case: empty token */
+ out_buff->value = (guint8 *) g_strdup("");
+@@ -653,7 +653,7 @@ sip_sec_make_signature__gssapi(SipSecContext context,
+ return FALSE;
+ } else {
+ signature->length = output_token.length;
+- signature->value = g_memdup(output_token.value,
++ signature->value = g_memdup2(output_token.value,
+ output_token.length);
+ gss_release_buffer(&minor, &output_token);
+ return TRUE;
+diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c
+index 2e2354f..1fa4daa 100644
+--- a/src/core/sip-sec-ntlm.c
++++ b/src/core/sip-sec-ntlm.c
+@@ -951,7 +951,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff,
+
+ /* server challenge (nonce) */
+ if (server_challenge) {
+- *server_challenge = g_memdup(cmsg->nonce, 8);
++ *server_challenge = g_memdup2(cmsg->nonce, 8);
+ }
+
+ /* flags */
+@@ -984,7 +984,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff,
+ *target_info_len = len;
+ }
+ if (target_info) {
+- *target_info = g_memdup(content, len);
++ *target_info = g_memdup2(content, len);
+ }
+ }
+ }
+@@ -1117,13 +1117,13 @@ sip_sec_ntlm_gen_authenticate(guchar **client_sign_key,
+ Set ServerSigningKey to SIGNKEY(ExportedSessionKey, "Server")
+ */
+ SIGNKEY(exported_session_key, TRUE, key);
+- *client_sign_key = g_memdup(key, 16);
++ *client_sign_key = g_memdup2(key, 16);
+ SIGNKEY(exported_session_key, FALSE, key);
+- *server_sign_key = g_memdup(key, 16);
++ *server_sign_key = g_memdup2(key, 16);
+ SEALKEY(neg_flags, exported_session_key, TRUE, key);
+- *client_seal_key = g_memdup(key, 16);
++ *client_seal_key = g_memdup2(key, 16);
+ SEALKEY(neg_flags, exported_session_key, FALSE, key);
+- *server_seal_key = g_memdup(key, 16);
++ *server_seal_key = g_memdup2(key, 16);
+ }
+
+ /* @TODO: */
+diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c
+index 70433ea..2d3f2db 100644
+--- a/src/core/sip-sec-tls-dsk.c
++++ b/src/core/sip-sec-tls-dsk.c
+@@ -88,9 +88,9 @@ sip_sec_init_sec_context__tls_dsk(SipSecContext context,
+ /* copy key pair */
+ ctx->algorithm = state->algorithm;
+ ctx->key_length = state->key_length;
+- ctx->client_key = g_memdup(state->client_key,
++ ctx->client_key = g_memdup2(state->client_key,
+ state->key_length);
+- ctx->server_key = g_memdup(state->server_key,
++ ctx->server_key = g_memdup2(state->server_key,
+ state->key_length);
+
+ /* extract certicate expiration time */
+diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c
+index e9c4b8a..936e31c 100644
+--- a/src/core/sipe-media.c
++++ b/src/core/sipe-media.c
+@@ -578,7 +578,7 @@ media_stream_to_sdpmedia(struct sipe_media_call_private *call_private,
+ // Set our key if encryption is enabled.
+ if (stream_private->encryption_key &&
+ encryption_policy != SIPE_ENCRYPTION_POLICY_REJECTED) {
+- sdpmedia->encryption_key = g_memdup(stream_private->encryption_key,
++ sdpmedia->encryption_key = g_memdup2(stream_private->encryption_key,
+ SIPE_SRTP_KEY_LEN);
+ sdpmedia->encryption_key_id = stream_private->encryption_key_id;
+ }
+diff --git a/src/core/sipe-tls-tester.c b/src/core/sipe-tls-tester.c
+index e80d715..5fbb5f8 100644
+--- a/src/core/sipe-tls-tester.c
++++ b/src/core/sipe-tls-tester.c
+@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd,
+ printf("received %d bytes from server\n", result);
+ record = g_new0(struct record, 1);
+ record->length = result;
+- record->msg = g_memdup(buffer, result);
++ record->msg = g_memdup2(buffer, result);
+ length += result;
+ fragments = g_slist_append(fragments, record);
+ }
+diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c
+index b0235d5..020aedb 100644
+--- a/src/core/sipe-tls.c
++++ b/src/core/sipe-tls.c
+@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_PARAMETER struct tls_internal_state *sta
+ gsize half = (secret_length + 1) / 2;
+ gsize newseed_length = label_length + seed_length;
+ /* secret: used as S1; secret2: last half of original secret (S2) */
+- guchar *secret2 = g_memdup(secret + secret_length - half, half);
++ guchar *secret2 = g_memdup2(secret + secret_length - half, half);
+ guchar *newseed = g_malloc(newseed_length);
+ guchar *md5, *dest;
+ guchar *sha1, *src;
+@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_client_key_exchange(struct tls_internal_
+
+ /* found all the required fields */
+ state->server_random.length = server_random->length;
+- state->server_random.buffer = g_memdup(server_random->data,
++ state->server_random.buffer = g_memdup2(server_random->data,
+ server_random->length);
+ tls_calculate_secrets(state);
+
+diff --git a/src/telepathy/telepathy-protocol.c b/src/telepathy/telepathy-protocol.c
+index f6e5337..1dde579 100644
+--- a/src/telepathy/telepathy-protocol.c
++++ b/src/telepathy/telepathy-protocol.c
+@@ -237,7 +237,7 @@ static void get_connection_details(SIPE_UNUSED_PARAMETER TpBaseProtocol *self,
+ SIPE_TYPE_SEARCH_MANAGER,
+ G_TYPE_INVALID
+ };
+- *channel_managers = g_memdup(types, sizeof(types));
++ *channel_managers = g_memdup2(types, sizeof(types));
+ }
+ if (icon_name)
+ *icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN);