rpm/pidgin
SHA256
1
0
Fork 0
forked from pool/pidgin
Code Pull Requests Activity

Accepting request 931253 from network:pidgin

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/931253
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=142
This commit is contained in:
Dominique Leuenberger 2021-11-15 14:26:17 +00:00 committed by Git OBS Bridge
commit 816dcbeb45
7 changed files with 27 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pidgin-2.14.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fea6ab4f0572fe24646049c2b3fecbdca27abca6d06e95bd655e44db99bd69fe
size 8713379

16
pidgin-2.14.7.tar.bz2.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQN4dxyiP4/UKuTjFSPZq/9m9tykFAmFEAc4ACgkQSPZq/9m9
tylmxg//WOI17ul2ARMlZHycOVyJ5vOgjeGiFIZaIKKlXu/xlXUWLNkZL4v7Ktbx
KEC+juuKhEvVoSCax139COlMJMNu/D55UGsaZ1pZYRQimzNK/ysBnuwW3spxmCOx
N1ANKRJePkLrPrvB3SwikBruj1ChbhIlqb3eqhKVw0GsNefChpAnxM6298MaXTCC
GIkTAG3tfV7WABLtwcDFD8w/NIW+l8U4/OMW0QXrcCHPLPsWtujY+0/HF+UxZ3wz
J9SxRGe6IaEG+aHPv6fa4u4B+nDL4GaGpxI9kd+mSWxc1AmRmRZebbIXc7qnUuq+
6Z5e+WlhXLJ9W7GS2cVGeBnBXhOjUDJlxgrYgFM3SQkqbH1eEJXmDngk2SriSItK
Q9xH1mgYEC8W+5xSABkzCfl3U2aqGeea8G2ERMlyvYf40tS2eehU9Kod27UjPSxT
pbiFoJl42TFJtvgPM2T7uNqOlWIJog+MtaG/JA1+r33m30/T7wTqB9o30sadc6rg
u1CaYwVVPM+o9D6jEjqJZRx763r6W4gQiJEpUJ4gClEjlVWhnp7XOTtUszo25QGB
JWJATI/qNx+8WftZm34tJKNdmLi8ZSdVAdYgzcnHKYF8fMlWPi5VvlXQDoqHPRMx
Ir3JJtnZqJr85nCQTmELzdB0IsMle5+zHMkxd+3h6zNDl3rZ1Wk=
=J6kx
-----END PGP SIGNATURE-----

3
pidgin-2.14.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca
size 8683281

16
pidgin-2.14.8.tar.bz2.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQN4dxyiP4/UKuTjFSPZq/9m9tykFAmFo5sAACgkQSPZq/9m9
tym3IA//TsnPQH1rNXDmuuLe6EwCTxwdKbIdvPqoCUdWZiNhs80GySho6ibgFPc0
IEL8HXJgFn3k92tF4/WlAKx6pP1DPAoYd6aLCX+4CeO+0/rBlxShR7b+aJkgXFjQ
plFEP7L12FrCxKvHlJyxsTOzIEq3TQDPCO+6toJGfYncerSuHM+6X7dznK3apBRn
Xg4E0r4bkVAZOASemJz2mbXq7hcG7e/o5R4yVleyYXBhxl25ohejbJzR1Kd+d9gv
15JGIlqZgx7iHc5Z8CFBC0VMusD2vgoR/aov+BD3+q1capwL/WKENWoBS/VTHPnk
muhmHnmczVn5iBs1P5MyetPvkrExzck8B3h408kNUn0F6VuJrc4jLPvgCUZqMIrW
LnGVWeQooyAMebneD764TrKWNk2J+ndyWJBotyYBXEqPYGB3IuvtdB/PxJ/MF59W
AjAR+PcKVuRpo+KADGK83fxttAQU5vC+Gg1/BqXggwDvp0n3QYbZVLnJLx07UON7
gsPD8vpY2HwKbmEf3aKzKLnhkUAyiSU6BACtNYrReo9+Q9uREnjfZlZd28w6FNwn
tvIrQ6TD5CfxZfrHrMsCHDhJC0ErBYuV9D6tNo3fEWuGrDzRxtfArESf+8tQy2mQ
xkar+JYh74CMIhw2wHueUks8ia9yJeANu41qulm+5jT71aYfKHg=
=YhQY
-----END PGP SIGNATURE-----

48
pidgin-fix-double-free-crash.patch
View File

@ -1,48 +0,0 @@
# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1632457638 18000
# Thu Sep 23 23:27:18 2021 -0500
# Branch release-2.x.y
# Node ID 740dafa46e5ea6a00f031ec39c76d38ad1b11172
# Parent e91465803c0e9e21de809dfcf8f8ab0f547cc269
Fix a double free in jabber/message.c and silence a warning
JabberBuddyResource is handled internally, but it's free function, which is static, does in fact free the thread_id as well.
Testing Done:
Compiled
Bugs closed: PIDGIN-17547
Reviewed at https://reviews.imfreedom.org/r/932/
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -798,7 +798,7 @@
case JABBER_MESSAGE_OTHER:
purple_debug_info("jabber",
"Received message of unknown type: %s\n", type);
- /* Fall-through is intentional */
+ /* FALL-THROUGH */
case JABBER_MESSAGE_NORMAL:
case JABBER_MESSAGE_CHAT:
handle_chat(jm);
@@ -1179,12 +1179,13 @@
jm->id = jabber_get_next_id(jm->js);
if(jbr) {
- if(jbr->thread_id)
- jm->thread_id = jbr->thread_id;
+ if(jbr->thread_id) {
+ jm->thread_id = g_strdup(jbr->thread_id);
+ }
- if (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED)
+ if (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED) {
jm->chat_state = JM_STATE_NONE;
- else {
+ } else {
/* if(JABBER_CHAT_STATES_UNKNOWN == jbr->chat_states)
jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED; */
}

7
pidgin.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 13 12:30:21 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- pidgin 2.14.8:
* Fix a regression in purple_str_to_time
- drop pidgin-fix-double-free-crash.patch, now included
-------------------------------------------------------------------
Mon Oct 25 12:00:44 MSK 2021 - Andrey Karepin <egdfree@opensuse.org>

12
pidgin.spec
View File

@ -19,7 +19,7 @@
%define _name Pidgin
%define sover 0
Name: pidgin
Version: 2.14.7
Version: 2.14.8
Release: 0
Summary: Multiprotocol Instant Messaging Client
License: GPL-2.0-only
@ -38,8 +38,6 @@ Patch2: pidgin-fix-perl-build.patch
Patch3: pidgin-use-default-alsa.patch
# PATCH-FIX-OPENSUSE pidgin-always-enable-intltool.patch mgorse@suse.com -- always enable intltool, needed for autoconf 2.71.
Patch4: pidgin-always-enable-intltool.patch
# Fix a crash due to a freed double. Patch was taken from upstream and will be included in version 2.14.8.
Patch5: pidgin-fix-double-free-crash.patch
BuildRequires: ca-certificates-mozilla
BuildRequires: doxygen
BuildRequires: fdupes
@ -235,7 +233,6 @@ scripts and plugins.
%patch3 -p1
%endif
%patch4 -p1
%patch5 -p1
cp -f %{SOURCE3} %{name}-prefs.xml
@ -286,19 +283,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %{?no_lang_C}
%post -n libpurple -p /sbin/ldconfig
%postun -n libpurple -p /sbin/ldconfig
%post -n libpurple%{sover} -p /sbin/ldconfig
%postun -n libpurple%{sover} -p /sbin/ldconfig
%post -n libpurple-client%{sover} -p /sbin/ldconfig
%postun -n libpurple-client%{sover} -p /sbin/ldconfig
%post -n finch -p /sbin/ldconfig
%postun -n finch -p /sbin/ldconfig
%files