Pullup ticket #6659 - requested by khorben

chat/libpurple: security update
chat/finch: security update
chat/pidgin: security update
chat/pidgin-sametime: security update
chat/pidgin-silc: security update


Revisions pulled up:
- chat/finch/Makefile                                           1.87
- chat/libpurple/Makefile                                       1.117
- chat/libpurple/Makefile.common                                1.56
- chat/libpurple/distinfo                                       1.56
- chat/pidgin-sametime/Makefile                                 1.67
- chat/pidgin-silc/Makefile                                     1.70
- chat/pidgin/Makefile                                          1.97
- chat/pidgin/PLIST                                             1.27

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   khorben
   Date:           Wed Jul 20 02:14:13 UTC 2022

   Modified Files:
           pkgsrc/chat/finch: Makefile
           pkgsrc/chat/libpurple: Makefile Makefile.common distinfo
           pkgsrc/chat/pidgin: Makefile PLIST
           pkgsrc/chat/pidgin-sametime: Makefile
           pkgsrc/chat/pidgin-silc: Makefile

   Log Message:
   libpurple, finch, pidgin: update to 2.14.10

   This notably fixes security issues (CVE-2012-1257, CVE-2022-26491).

   Tested on NetBSD/amd64.

   XXX pull-up to the pkgsrc-2022Q2 branch

   The complete changelog for the new versions is reproduced here:

   version 2.14.10 (06/02/2022):
    General:
    * Audit and correct the COPYRIGHT file. (RR 1425) (Richard Laager)
    * Fix a spelling error in a debug message for proxies. (RR 1426) (Richard
      Laager)
    * Install some emojis already in the theme but not being installed.
      (RR 1428) (Richard Laager)
    * Drop the QQ smileys as we don't ship QQ anymore. (PIDGIN-14385) (RR 1429)
      (Richard Laager)
    * Modernize the desktop file. (RR 1433) (Richard Laager)
    * Modernize the appdata file. (RR 1431) (Richard Laager)
    * Make privacy settings persist. (PIDGIN-17137) (RR 1463) (Belgin Știrbu)

    Pidgin:
    * Fix a use after free that was introduced in 2.14.9. (RR 1488) (ivanhoe)

    IRC:
    * Fix a crash if the server sends a short form JOIN message. (PIDGIN-17375)
      (RR 1484) (Belgin Știrbu)

    XMPP:
    * Fix a regression from 2.14.9 where XMPP accounts state would get lost
      after failing to connect. (PIDGIN-17621) (RR 1455) (Belgin Știrbu)
    * Fix a crash when requesting your own info in an XMPP conference. (RR 1465)
      (Belgin Știrbu)
    * Fix hang when completing a file transfer over XMPP. (RR 1466) (Belgin
      Știrbu)
    * Fix updating custom smileys. (PIDGIN-17153) (RR 1477) (Belgin Știrbu)
    * Fix unblocking users. (PIDGIN-16414) (RR 1479) (Belgin Știrbu)
    * Fix a crash when cancelling a file transfer. (PIDGIN-17189) (RR 1485)
      (Belgin Știrbu)

   version 2.14.9 (04/28/2022):
    Security:
    * Remove _xmppconnect support. (RR 1357) (CVE-2022-26491) (Gary Kramlich)

    libpurple:
    * Fix a GLib CRITICAL message with typing time outs. (RR 1123) (Mohammed
      Sadiq)
    * Fix an issue where the unit tests for purple_str_to_time would fail.
      (GENTOO-819774) (RR 1238) (Gary Kramlich)

    Pidgin:
    * Fix a memory leak in pidgin_conversations_set_tab_colors. (RR 1244)
      (ivanhoe)
    * Fixed the majority of the infinite resizing issues in the input box.
      (PIDGIN-16753, PIDGIN-16999, PIDGIN-17287, PIDGIN-17413, PIDGIN-17430,
      PIDGIN-17568, PIDGIN-17602) (RR 1342) (Belgin Știrbu)
    * Add transient-buddy back which is used to show some context menus and
      other things. (PIDGIN-17523) (RR 1381) (Belgin Știrbu)

    Windows:
    * Fix the download of dictionaries in the Windows installer. (PIDGIN-14618,
      PIDGIN-15648, PIDGIN-15540, PIDGIN-14612, PIDGIN-14893) (RR 1303) (Gary
      Kramlich)

    Translations:
    * Fix a typo in the German translations. (PIDGIN-17575) (RR 1242) (ivanhoe)
    * Synced all of the translations with Transifex.

    IRC:
    * Fix IRC file transfers on Windows. (PIDGIN-17175) (RR 1382) (Belgin
      Știrbu)
    * Fix file transfers failing at 99% on IRC. (PIDGIN-15893) (RR 1385) (Belgin
      Știrbu)
    * Default realname and ident name in IRC to the username (nickname) of the
      account. (PIDGIN-17610) (RR 1386) (Belgin Știrbu)
    * Add an advanced account option to IRC accounts for explicitly setting the
      SASL login name. (PIDGIN-15451) (RR 1388) (Belgin Știrbu)
    * Added a rate limiter that should make it impossible to excess flood.
      (RR 1391) (Gary Kramlich)

    SIMPLE:
    * Fix an issue with the CSeq numbers in SIMPLE. (PIDGIN-9675) (RR 1379)
      (dohmniq)

    XMPP:
    * Fix XMPP attention messages being sent to incorrect JIDs. (PIDGIN-14714)
      (RR 1387) (itsnotabigtruck, Belgin Știrbu)


   To generate a diff of this commit:
   cvs rdiff -u -r1.86 -r1.87 pkgsrc/chat/finch/Makefile
   cvs rdiff -u -r1.116 -r1.117 pkgsrc/chat/libpurple/Makefile
   cvs rdiff -u -r1.55 -r1.56 pkgsrc/chat/libpurple/Makefile.common \
       pkgsrc/chat/libpurple/distinfo
   cvs rdiff -u -r1.96 -r1.97 pkgsrc/chat/pidgin/Makefile
   cvs rdiff -u -r1.26 -r1.27 pkgsrc/chat/pidgin/PLIST
   cvs rdiff -u -r1.66 -r1.67 pkgsrc/chat/pidgin-sametime/Makefile
   cvs rdiff -u -r1.69 -r1.70 pkgsrc/chat/pidgin-silc/Makefile

8 files changed, 14 insertions, 17 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index c861bedae9b..b3dc26cbdf7 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2022/04/18 19:10:28 adam Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2022/07/27 19:05:37 spz Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Multi-protocol console instant messaging client
 
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index f26a08709e1..41252d5f34e 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2022/04/18 19:09:41 adam Exp $
+# $NetBSD: Makefile,v 1.115.2.1 2022/07/27 19:05:37 spz Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Plugin-based multi-protocol instant messaging library
 
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 3dd4ae458ed..5b924b9b17d 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2022/03/06 07:31:44 nia Exp $
+# $NetBSD: Makefile.common,v 1.55.4.1 2022/07/27 19:05:37 spz Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.14.8
+PIDGIN_VERSION=	2.14.10
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 3eeb0f8080a..741f653b90a 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.55 2022/03/06 07:31:44 nia Exp $
+$NetBSD: distinfo,v 1.55.4.1 2022/07/27 19:05:37 spz Exp $
 
-BLAKE2s (pidgin-2.14.8.tar.bz2) = d08e480d8f7d87c971a4aa395f534879acf06c92ac8c84f22d779a0956e4ea5f
-SHA512 (pidgin-2.14.8.tar.bz2) = 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
-Size (pidgin-2.14.8.tar.bz2) = 8683281 bytes
+BLAKE2s (pidgin-2.14.10.tar.bz2) = 32b2a307ed8ee05216688b0168a225921f4c1aec5369d5cebec8d91b25fdcb25
+SHA512 (pidgin-2.14.10.tar.bz2) = 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
+Size (pidgin-2.14.10.tar.bz2) = 8229328 bytes
 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 72bf80c9984..d355548fe6e 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2022/04/18 19:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.65.2.1 2022/07/27 19:05:37 spz Exp $
 
 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger
 
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 71ead973103..f2ef367b8ba 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/04/18 19:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.68.2.1 2022/07/27 19:05:37 spz Exp $
 
 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	SILC plugin for the Pidgin instant messenger
 
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index d48b223011a..82e4fd3f9b1 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2022/04/18 19:09:41 adam Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2022/07/27 19:05:37 spz Exp $
 
 COMMENT=		Multi-protocol GTK instant messaging client
-PKGREVISION=		1
 
 .include		"../../chat/libpurple/Makefile.common"
 
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index c4e68958589..1732549bd34 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2021/05/02 10:19:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.26.10.1 2022/07/27 19:05:37 spz Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
@@ -408,6 +408,7 @@ share/pixmaps/pidgin/emotes/small/excited.png
 share/pixmaps/pidgin/emotes/small/excruciating.png
 share/pixmaps/pidgin/emotes/small/eyeroll.png
 share/pixmaps/pidgin/emotes/small/girl.png
+share/pixmaps/pidgin/emotes/small/glasses-cool.png
 share/pixmaps/pidgin/emotes/small/grumpy.png
 share/pixmaps/pidgin/emotes/small/happy.png
 share/pixmaps/pidgin/emotes/small/hot.png
@@ -436,6 +437,7 @@ share/pixmaps/pidgin/emotes/small/question.png
 share/pixmaps/pidgin/emotes/small/restroom.png
 share/pixmaps/pidgin/emotes/small/rose.png
 share/pixmaps/pidgin/emotes/small/sad.png
+share/pixmaps/pidgin/emotes/small/sarcastic.png
 share/pixmaps/pidgin/emotes/small/search.png
 share/pixmaps/pidgin/emotes/small/shame.png
 share/pixmaps/pidgin/emotes/small/shocked.png