From b5921d2c2501723f839d77947799b8087ce6a31b486f63e951e821cbb272b83b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 13 Nov 2021 13:22:39 +0000 Subject: [PATCH] Accepting request 931250 from home:AndreasStieger:branches:network:pidgin pidgin 2.14.8 OBS-URL: https://build.opensuse.org/request/show/931250 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=55 --- pidgin-2.14.7.tar.bz2 | 3 -- pidgin-2.14.7.tar.bz2.asc | 16 ---------- pidgin-2.14.8.tar.bz2 | 3 ++ pidgin-2.14.8.tar.bz2.asc | 16 ++++++++++ pidgin-fix-double-free-crash.patch | 48 ------------------------------ pidgin.changes | 7 +++++ pidgin.spec | 12 +------- 7 files changed, 27 insertions(+), 78 deletions(-) delete mode 100644 pidgin-2.14.7.tar.bz2 delete mode 100644 pidgin-2.14.7.tar.bz2.asc create mode 100644 pidgin-2.14.8.tar.bz2 create mode 100644 pidgin-2.14.8.tar.bz2.asc delete mode 100644 pidgin-fix-double-free-crash.patch diff --git a/pidgin-2.14.7.tar.bz2 b/pidgin-2.14.7.tar.bz2 deleted file mode 100644 index 4785d2d..0000000 --- a/pidgin-2.14.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fea6ab4f0572fe24646049c2b3fecbdca27abca6d06e95bd655e44db99bd69fe -size 8713379 diff --git a/pidgin-2.14.7.tar.bz2.asc b/pidgin-2.14.7.tar.bz2.asc deleted file mode 100644 index f1692f0..0000000 --- a/pidgin-2.14.7.tar.bz2.asc +++ /dev/null @@ -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----- diff --git a/pidgin-2.14.8.tar.bz2 b/pidgin-2.14.8.tar.bz2 new file mode 100644 index 0000000..dc56eb0 --- /dev/null +++ b/pidgin-2.14.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca +size 8683281 diff --git a/pidgin-2.14.8.tar.bz2.asc b/pidgin-2.14.8.tar.bz2.asc new file mode 100644 index 0000000..f9b3383 --- /dev/null +++ b/pidgin-2.14.8.tar.bz2.asc @@ -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----- diff --git a/pidgin-fix-double-free-crash.patch b/pidgin-fix-double-free-crash.patch deleted file mode 100644 index 4c44423..0000000 --- a/pidgin-fix-double-free-crash.patch +++ /dev/null @@ -1,48 +0,0 @@ -# HG changeset patch -# User Gary Kramlich -# 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; */ - } diff --git a/pidgin.changes b/pidgin.changes index a000e64..7c5ea99 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 13 12:30:21 UTC 2021 - Andreas Stieger + +- 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 diff --git a/pidgin.spec b/pidgin.spec index 029fa17..e9f2a76 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -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