25707742 Update pidgin to version 2.12.0
authorRich Burridge <rich.burridge@oracle.com>
Mon, 20 Mar 2017 16:30:34 -0700
changeset 7779 76d3a92dbebb
parent 7778 986a7c547944
child 7780 15924840297f
25707742 Update pidgin to version 2.12.0
components/desktop/pidgin/Makefile
components/desktop/pidgin/patches/pidgin-07-menu-entry.patch
components/desktop/pidgin/patches/pidgin-15-fix-msn-file-transfer.patch
components/desktop/pidgin/patches/pidgin-17-fix-python-shebang.patch
components/desktop/pidgin/pidgin.p5m
--- a/components/desktop/pidgin/Makefile	Mon Mar 20 04:53:52 2017 -0700
+++ b/components/desktop/pidgin/Makefile	Mon Mar 20 16:30:34 2017 -0700
@@ -26,15 +26,15 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pidgin
-COMPONENT_VERSION=	2.11.0
+COMPONENT_VERSION=	2.12.0
 COMPONENT_PROJECT_URL=	http://www.pidgin.im
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH= \
-    sha256:f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333
+    sha256:8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	3636
 
-TPNO=			30500
+TPNO=			34232
 
 # Cyrus SASL is S12-only (at least for evaluation builds).
 ifeq ($(BUILD_TYPE), evaluation)
--- a/components/desktop/pidgin/patches/pidgin-07-menu-entry.patch	Mon Mar 20 04:53:52 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# date:2008-08-21 owner:jedy type:branding
-#
-# These changes should not be submitted upstream.
-
---- pidgin-2.6.4/pidgin/data/pidgin.desktop.in.old	2009-12-01 10:36:46.657943000 +0800
-+++ pidgin-2.6.4/pidgin/data/pidgin.desktop.in	2009-12-01 10:37:28.584338000 +0800
[email protected]@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Pidgin Internet Messenger
- _GenericName=Internet Messenger
--_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
-+_Comment=Send instant messages to contacts on Jabber, MSN, Yahoo and other     networks
- Exec=pidgin
- Icon=pidgin
- StartupNotify=true
--- a/components/desktop/pidgin/patches/pidgin-15-fix-msn-file-transfer.patch	Mon Mar 20 04:53:52 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# date:2014-02-28 owner:abhijit type:bug bugdb:18157348
-# Bug 18157348 18 pidgin security advisories on 2014-01-28
-#
-# These changes should be submitted upstream.
-
---- pidgin-2.10.9/libpurple/protocols/msn/slplink.c.orig	2014-02-24 15:29:54.414804070 +0530
-+++ pidgin-2.10.9/libpurple/protocols/msn/slplink.c	2014-02-24 15:31:15.715299921 +0530
[email protected]@ -317,7 +317,10 @@ msn_slplink_send_msgpart(MsnSlpLink *slp
- 			if (len > MSN_SBCONN_MAX_SIZE)
- 				len = MSN_SBCONN_MAX_SIZE;
- 
--			msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + offset, len);
-+ 			if ((slpmsg->buffer != NULL) && (slpmsg->buffer + offset != NULL) ) 
-+			{ 
-+				msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + offset, len);
-+			} 
- 		}
- 
- 		msn_p2p_info_set_length(slpmsg->p2p_info, len);
---- pidgin-2.10.9/libpurple/ft.c.orig	2014-02-26 11:13:12.556709745 +0530
-+++ pidgin-2.10.9/libpurple/ft.c	2014-02-26 11:14:00.241111366 +0530
[email protected]@ -1659,6 +1659,8 @@ purple_xfer_get_thumbnail(const PurpleXf
- {
- 	PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
- 
-+	if (priv == NULL)
-+		return NULL;
- 	if (len)
- 		*len = priv->thumbnail_size;
- 
---- pidgin-2.10.9/libpurple/protocols/msn/xfer.c.orig	2014-02-28 11:53:14.973470848 +0530
-+++ pidgin-2.10.9/libpurple/protocols/msn/xfer.c	2014-02-28 11:55:54.460787530 +0530
[email protected]@ -147,7 +147,7 @@ msn_xfer_end_cb(MsnSlpCall *slpcall, Msn
- 		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
- 		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
- 	{
--		purple_xfer_cancel_remote(slpcall->xfer);
-+		return;
- 	}
- }
- 
--- a/components/desktop/pidgin/patches/pidgin-17-fix-python-shebang.patch	Mon Mar 20 04:53:52 2017 -0700
+++ b/components/desktop/pidgin/patches/pidgin-17-fix-python-shebang.patch	Mon Mar 20 16:30:34 2017 -0700
@@ -4,28 +4,19 @@
 #
 # This patch will not be sent upstream.
 
---- pidgin-2.11.0/libpurple/purple-remote.orig	2016-08-01 08:32:52.237671346 -0700
-+++ pidgin-2.11.0/libpurple/purple-remote	2016-08-01 08:33:07.993989713 -0700
+--- pidgin-2.12.0/libpurple/purple-remote.orig	2017-03-12 09:00:32.355626039 +0000
++++ pidgin-2.12.0/libpurple/purple-remote	2017-03-12 09:00:43.077940312 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.7
  
  import codecs
  import dbus
---- pidgin-2.11.0/libpurple/purple-url-handler.orig	2016-08-01 08:34:00.751957460 -0700
-+++ pidgin-2.11.0/libpurple/purple-url-handler	2016-08-01 10:04:59.981783481 -0700
+--- pidgin-2.12.0/libpurple/purple-url-handler.orig	2017-03-12 08:59:33.344547798 +0000
++++ pidgin-2.12.0/libpurple/purple-url-handler	2017-03-12 08:59:40.209980832 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.7
  from __future__ import print_function
  import dbus
  import re
[email protected]@ -249,7 +249,7 @@
- 
- def myim(uri):
-         protocol = "prpl-myspace"
--        print "TODO: send uri: ", uri
-+        print("TODO: send uri: %s" % uri)
-         assert False, "Not implemented"
- 
- def sip(uri):
--- a/components/desktop/pidgin/pidgin.p5m	Mon Mar 20 04:53:52 2017 -0700
+++ b/components/desktop/pidgin/pidgin.p5m	Mon Mar 20 16:30:34 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -229,13 +229,13 @@
 link path=usr/lib/$(MACH64)/libgnt.so.0 target=libgnt.so.0.8.10
 file path=usr/lib/$(MACH64)/libgnt.so.0.8.10
 link path=usr/lib/$(MACH64)/libpurple-client.so \
-    target=libpurple-client.so.0.11.0
+    target=libpurple-client.so.0.12.0
 link path=usr/lib/$(MACH64)/libpurple-client.so.0 \
-    target=libpurple-client.so.0.11.0
-file path=usr/lib/$(MACH64)/libpurple-client.so.0.11.0
-link path=usr/lib/$(MACH64)/libpurple.so target=libpurple.so.0.11.0
-link path=usr/lib/$(MACH64)/libpurple.so.0 target=libpurple.so.0.11.0
-file path=usr/lib/$(MACH64)/libpurple.so.0.11.0
+    target=libpurple-client.so.0.12.0
+file path=usr/lib/$(MACH64)/libpurple-client.so.0.12.0
+link path=usr/lib/$(MACH64)/libpurple.so target=libpurple.so.0.12.0
+link path=usr/lib/$(MACH64)/libpurple.so.0 target=libpurple.so.0.12.0
+file path=usr/lib/$(MACH64)/libpurple.so.0.12.0
 file path=usr/lib/$(MACH64)/pidgin/cap.so
 file path=usr/lib/$(MACH64)/pidgin/convcolors.so
 file path=usr/lib/$(MACH64)/pidgin/extplacement.so
@@ -276,26 +276,16 @@
 link path=usr/lib/$(MACH64)/purple-2/libjabber.so target=libjabber.so.0.0.0
 link path=usr/lib/$(MACH64)/purple-2/libjabber.so.0 target=libjabber.so.0.0.0
 file path=usr/lib/$(MACH64)/purple-2/libjabber.so.0.0.0
-file path=usr/lib/$(MACH64)/purple-2/libmsn.so
-file path=usr/lib/$(MACH64)/purple-2/libmxit.so
-file path=usr/lib/$(MACH64)/purple-2/libmyspace.so
 file path=usr/lib/$(MACH64)/purple-2/libnovell.so
 link path=usr/lib/$(MACH64)/purple-2/liboscar.so target=liboscar.so.0.0.0
 link path=usr/lib/$(MACH64)/purple-2/liboscar.so.0 target=liboscar.so.0.0.0
 file path=usr/lib/$(MACH64)/purple-2/liboscar.so.0.0.0
 file path=usr/lib/$(MACH64)/purple-2/libsimple.so
 file path=usr/lib/$(MACH64)/purple-2/libxmpp.so
-file path=usr/lib/$(MACH64)/purple-2/libyahoo.so
-file path=usr/lib/$(MACH64)/purple-2/libyahoojp.so
-link path=usr/lib/$(MACH64)/purple-2/libymsg.so target=libymsg.so.0.0.0
-link path=usr/lib/$(MACH64)/purple-2/libymsg.so.0 target=libymsg.so.0.0.0
-file path=usr/lib/$(MACH64)/purple-2/libymsg.so.0.0.0
 file path=usr/lib/$(MACH64)/purple-2/libzephyr.so
 file path=usr/lib/$(MACH64)/purple-2/log_reader.so
 file path=usr/lib/$(MACH64)/purple-2/newline.so
-file path=usr/lib/$(MACH64)/purple-2/nss-prefs.so \
-    pkg.depend.bypass-generate=libnspr4.so \
-    pkg.depend.bypass-generate=libssl3.so
+file path=usr/lib/$(MACH64)/purple-2/nss-prefs.so
 file path=usr/lib/$(MACH64)/purple-2/offlinemsg.so
 file path=usr/lib/$(MACH64)/purple-2/perl.so
 file path=usr/lib/$(MACH64)/purple-2/perl/Purple.pm
@@ -303,11 +293,7 @@
 file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/Purple.so
 file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/autosplit.ix
 file path=usr/lib/$(MACH64)/purple-2/psychic.so
-file path=usr/lib/$(MACH64)/purple-2/ssl-nss.so \
-    pkg.depend.bypass-generate=libnspr4.so \
-    pkg.depend.bypass-generate=libnss3.so \
-    pkg.depend.bypass-generate=libsmime3.so \
-    pkg.depend.bypass-generate=libssl3.so
+file path=usr/lib/$(MACH64)/purple-2/ssl-nss.so
 file path=usr/lib/$(MACH64)/purple-2/ssl.so
 file path=usr/lib/$(MACH64)/purple-2/statenotify.so
 file path=usr/lib/$(MACH64)/purple-2/tcl.so
@@ -648,10 +634,6 @@
 file path=usr/share/pixmaps/pidgin/emotes/default/monkey.png
 file path=usr/share/pixmaps/pidgin/emotes/default/moon.png
 file path=usr/share/pixmaps/pidgin/emotes/default/mrgreen.png
-file path=usr/share/pixmaps/pidgin/emotes/default/msn-away.png
-file path=usr/share/pixmaps/pidgin/emotes/default/msn-busy.png
-file path=usr/share/pixmaps/pidgin/emotes/default/msn.png
-file path=usr/share/pixmaps/pidgin/emotes/default/msn_online.png
 file path=usr/share/pixmaps/pidgin/emotes/default/music.png
 file path=usr/share/pixmaps/pidgin/emotes/default/musical-note.png
 file path=usr/share/pixmaps/pidgin/emotes/default/nervous.png
@@ -817,13 +799,9 @@
 file path=usr/share/pixmaps/pidgin/protocols/16/irc.png
 file path=usr/share/pixmaps/pidgin/protocols/16/jabber.png
 file path=usr/share/pixmaps/pidgin/protocols/16/meanwhile.png
-file path=usr/share/pixmaps/pidgin/protocols/16/msn.png
-file path=usr/share/pixmaps/pidgin/protocols/16/mxit.png
-file path=usr/share/pixmaps/pidgin/protocols/16/myspace.png
 file path=usr/share/pixmaps/pidgin/protocols/16/novell.png
 file path=usr/share/pixmaps/pidgin/protocols/16/silc.png
 file path=usr/share/pixmaps/pidgin/protocols/16/simple.png
-file path=usr/share/pixmaps/pidgin/protocols/16/yahoo.png
 file path=usr/share/pixmaps/pidgin/protocols/16/zephyr.png
 file path=usr/share/pixmaps/pidgin/protocols/22/aim.png
 file path=usr/share/pixmaps/pidgin/protocols/22/bonjour.png
@@ -834,13 +812,9 @@
 file path=usr/share/pixmaps/pidgin/protocols/22/irc.png
 file path=usr/share/pixmaps/pidgin/protocols/22/jabber.png
 file path=usr/share/pixmaps/pidgin/protocols/22/meanwhile.png
-file path=usr/share/pixmaps/pidgin/protocols/22/msn.png
-file path=usr/share/pixmaps/pidgin/protocols/22/mxit.png
-file path=usr/share/pixmaps/pidgin/protocols/22/myspace.png
 file path=usr/share/pixmaps/pidgin/protocols/22/novell.png
 file path=usr/share/pixmaps/pidgin/protocols/22/silc.png
 file path=usr/share/pixmaps/pidgin/protocols/22/simple.png
-file path=usr/share/pixmaps/pidgin/protocols/22/yahoo.png
 file path=usr/share/pixmaps/pidgin/protocols/22/zephyr.png
 file path=usr/share/pixmaps/pidgin/protocols/48/aim.png
 file path=usr/share/pixmaps/pidgin/protocols/48/bonjour.png
@@ -850,13 +824,9 @@
 file path=usr/share/pixmaps/pidgin/protocols/48/irc.png
 file path=usr/share/pixmaps/pidgin/protocols/48/jabber.png
 file path=usr/share/pixmaps/pidgin/protocols/48/meanwhile.png
-file path=usr/share/pixmaps/pidgin/protocols/48/msn.png
-file path=usr/share/pixmaps/pidgin/protocols/48/mxit.png
-file path=usr/share/pixmaps/pidgin/protocols/48/myspace.png
 file path=usr/share/pixmaps/pidgin/protocols/48/novell.png
 file path=usr/share/pixmaps/pidgin/protocols/48/silc.png
 file path=usr/share/pixmaps/pidgin/protocols/48/simple.png
-file path=usr/share/pixmaps/pidgin/protocols/48/yahoo.png
 file path=usr/share/pixmaps/pidgin/protocols/48/zephyr.png
 file path=usr/share/pixmaps/pidgin/protocols/scalable/aim.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/bonjour.svg
@@ -866,12 +836,9 @@
 file path=usr/share/pixmaps/pidgin/protocols/scalable/irc.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/jabber.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
-file path=usr/share/pixmaps/pidgin/protocols/scalable/msn.svg
-file path=usr/share/pixmaps/pidgin/protocols/scalable/mxit.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/novell.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/silc.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/simple.svg
-file path=usr/share/pixmaps/pidgin/protocols/scalable/yahoo.svg
 file path=usr/share/pixmaps/pidgin/protocols/scalable/zephyr.svg
 file path=usr/share/pixmaps/pidgin/status/11/available.png
 file path=usr/share/pixmaps/pidgin/status/11/away.png