Hello community,
here is the log from the commit of package purple-lurch for openSUSE:Factory checked in at 2019-09-17 13:39:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/purple-lurch (Old)
and /work/SRC/openSUSE:Factory/.purple-lurch.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "purple-lurch"
Tue Sep 17 13:39:21 2019 rev:4 rq:731340 version:0.6.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/purple-lurch/purple-lurch.changes 2019-01-03 18:06:55.828124236 +0100
+++ /work/SRC/openSUSE:Factory/.purple-lurch.new.7948/purple-lurch.changes 2019-09-17 13:39:23.673823865 +0200
@@ -1,0 +2,6 @@
+Mon Sep 16 14:14:36 UTC 2019 - Alexei Sorokin
+
+- Add purple-lurch-libomemo-fix-dino-compat.patch: Fix
+ compatibility issues with Dino (commit e3b2125e).
+
+-------------------------------------------------------------------
New:
----
purple-lurch-libomemo-fix-dino-compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ purple-lurch.spec ++++++
--- /var/tmp/diff_new_pack.J3WSot/_old 2019-09-17 13:39:24.121823794 +0200
+++ /var/tmp/diff_new_pack.J3WSot/_new 2019-09-17 13:39:24.125823793 +0200
@@ -1,7 +1,7 @@
#
# spec file for package purple-lurch
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
Group: Productivity/Networking/Instant Messenger
URL: https://github.com/gkdr/lurch
Source: https://github.com/gkdr/lurch/releases/download/v%{version}/%{_name}-%{version}-src.tar.gz
+# PATCH-FIX-UPSTREAM purple-lurch-libomemo-fix-dino-compat.patch -- Fix compatibility issues with Dino (commit e3b2125e).
+Patch0: purple-lurch-libomemo-fix-dino-compat.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libgcrypt-devel
@@ -51,7 +53,7 @@
Pidgin by implementing OMEMO.
%prep
-%setup -q -n %{_name}-%{version}
+%autosetup -p1 -n %{_name}-%{version}
%build
export CFLAGS='%{optflags}'
++++++ purple-lurch-libomemo-fix-dino-compat.patch ++++++
--- a/lib/libomemo/src/libomemo.c
+++ b/lib/libomemo/src/libomemo.c
@@ -1356,9 +1356,9 @@ int omemo_message_get_encrypted_key(omem
const char * key_b64 = (void *) 0;
size_t key_len = 0;
-
- ret_val = expect_next_node(msg_p->header_node_p, mxmlGetFirstChild, KEY_NODE_NAME, &key_node_p);
- if (ret_val) {
+ key_node_p = mxmlFindElement(msg_p->header_node_p, msg_p->header_node_p, KEY_NODE_NAME, NULL, NULL, MXML_DESCEND);
+ if (!key_node_p) {
+ // if there is not at least one key, skip the rest of the function
ret_val = 0;
*key_pp = (void *) 0;
goto cleanup;
@@ -1430,8 +1430,9 @@ int omemo_message_export_decrypted(omemo
}
payload_p = g_base64_decode(payload_b64, &payload_len);
- ret_val = expect_next_node(msg_p->header_node_p, mxmlGetLastChild, IV_NODE_NAME, &iv_node_p);
- if (ret_val) {
+ iv_node_p = mxmlFindElement(msg_p->header_node_p, msg_p->header_node_p, IV_NODE_NAME, NULL, NULL, MXML_DESCEND);
+ if (!iv_node_p) {
+ ret_val = OMEMO_ERR_MALFORMED_XML;
goto cleanup;
}