Accepting request 127325 from GNOME:Apps

Update to 2.10.5 - should be safe for 12.2 (forwarded request 127324 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/127325
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=90

pidgin-2.10.4.tar.bz2

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

pidgin-2.10.5.tar.bz2

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

pidgin-gnome-keyring.patch

@@ -1,8 +1,7 @@
-Index: pidgin-2.6.3/configure.ac
+diff -Naur pidgin-2.10.5.orig/configure.ac pidgin-2.10.5/configure.ac
-===================================================================
+--- pidgin-2.10.5.orig/configure.ac	2012-07-06 13:14:25.678713118 +0200
---- pidgin-2.6.3.orig/configure.ac
++++ pidgin-2.10.5/configure.ac	2012-07-06 13:20:39.253322728 +0200
-+++ pidgin-2.6.3/configure.ac
+@@ -1858,6 +1858,20 @@
-@@ -1799,6 +1799,20 @@ if test "x$enable_nss" != "xno"; then
  		[AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])],
  		[with_nss_libs="$withval"])
  
@@ -23,31 +22,10 @@ Index: pidgin-2.6.3/configure.ac
  
  	if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
  	   test -n "$with_nss_includes"  || test -n "$with_nss_libs"  ||
-Index: pidgin-2.6.3/libpurple/Makefile.am
+diff -Naur pidgin-2.10.5.orig/libpurple/account.c pidgin-2.10.5/libpurple/account.c
-===================================================================
+--- pidgin-2.10.5.orig/libpurple/account.c	2012-07-06 13:14:25.678713118 +0200
---- pidgin-2.6.3.orig/libpurple/Makefile.am
++++ pidgin-2.10.5/libpurple/account.c	2012-07-06 13:20:39.273323295 +0200
-+++ pidgin-2.6.3/libpurple/Makefile.am
+@@ -49,6 +49,13 @@
-@@ -291,6 +291,7 @@ libpurple_la_LIBADD = \
- 	$(GLIB_LIBS) \
- 	$(LIBXML_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
-+	$(PURPLE_KEYRING_LIBS) \
- 	$(INTLLIBS) \
- 	$(FARSIGHT_LIBS) \
- 	$(GSTREAMER_LIBS) \
-@@ -306,6 +307,7 @@ AM_CPPFLAGS = \
- 	$(GLIB_CFLAGS) \
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
-+	$(PURPLE_KEYRING_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
- 	$(FARSIGHT_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
-Index: pidgin-2.6.3/libpurple/account.c
-===================================================================
---- pidgin-2.6.3.orig/libpurple/account.c
-+++ pidgin-2.6.3/libpurple/account.c
-@@ -49,6 +49,13 @@ typedef struct
  #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
  	((PurpleAccountPrivate *) (account->priv))
  
@@ -61,7 +39,7 @@ Index: pidgin-2.6.3/libpurple/account.c
  /* TODO: Should use PurpleValue instead of this?  What about "ui"? */
  typedef struct
  {
-@@ -378,8 +385,13 @@ account_to_xmlnode(PurpleAccount *accoun
+@@ -379,8 +386,13 @@
  	if (purple_account_get_remember_password(account) &&
  		((tmp = purple_account_get_password(account)) != NULL))
  	{
@@ -75,7 +53,7 @@ Index: pidgin-2.6.3/libpurple/account.c
  	}
  
  	if ((tmp = purple_account_get_alias(account)) != NULL)
-@@ -828,17 +840,30 @@ parse_account(xmlnode *node)
+@@ -875,17 +887,30 @@
  	}
  
  	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@@ -112,7 +90,7 @@ Index: pidgin-2.6.3/libpurple/account.c
  
  	/* Read the alias */
  	child = xmlnode_get_child(node, "alias");
-@@ -2873,3 +2898,60 @@ purple_accounts_uninit(void)
+@@ -3245,3 +3270,60 @@
  	purple_signals_disconnect_by_handle(handle);
  	purple_signals_unregister_by_instance(handle);
  }
@@ -173,3 +151,22 @@ Index: pidgin-2.6.3/libpurple/account.c
 +  return result == GNOME_KEYRING_RESULT_OK;
 +}
 +#endif
+diff -Naur pidgin-2.10.5.orig/libpurple/Makefile.am pidgin-2.10.5/libpurple/Makefile.am
+--- pidgin-2.10.5.orig/libpurple/Makefile.am	2012-07-06 13:14:25.678713118 +0200
++++ pidgin-2.10.5/libpurple/Makefile.am	2012-07-06 13:20:39.257322842 +0200
+@@ -305,6 +305,7 @@
+ 	$(GLIB_LIBS) \
+ 	$(LIBXML_LIBS) \
+ 	$(NETWORKMANAGER_LIBS) \
++	$(PURPLE_KEYRING_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(FARSTREAM_LIBS) \
+ 	$(GSTREAMER_LIBS) \
+@@ -321,6 +322,7 @@
+ 	$(GLIB_CFLAGS) \
+ 	$(DEBUG_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
++	$(PURPLE_KEYRING_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(FARSTREAM_CFLAGS) \
+ 	$(GSTREAMER_CFLAGS) \

pidgin.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Jul  6 08:26:22 UTC 2012 - christoph.miebach@web.de
+
+- Update to version 2.10.5:
+  + libpurple:
+    - Add support for GNOME3 proxy settings.
+  + Pidgin:
+    - Fix a crash that may occur when trying to ignore a user who
+      is not in the current chat room.
+  + MSN:
+    - Fix building with MSVC on Windows (broken in 2.10.4).
+  + MXit:
+    - Fix a buffer overflow vulnerability when parsing incoming
+      messages containing inline images. (CVE-2012-3374)
+- Rebase pidgin-gnome-keyring.patch.
+
 -------------------------------------------------------------------
 Mon May  7 08:52:26 UTC 2012 - christoph.miebach@web.de
 

pidgin.spec

@@ -26,10 +26,10 @@ Name:           pidgin
 Summary:        Multiprotocol Instant Messaging Client
 License:        GPL-2.0+
 Group:          Productivity/Networking/Instant Messenger
-Version:        2.10.4
+Version:        2.10.5
 Release:        0
 Url:            http://www.pidgin.im/
-Source:         http://downloads.sourceforge.net/project/pidgin/Pidgin/2.10.4/%{name}-%{version}.tar.bz2
+Source:         http://downloads.sourceforge.net/project/pidgin/Pidgin/%{version}/%{name}-%{version}.tar.bz2
 Source1:        pidgin-NLD-smiley-theme.tar.bz2
 Source2:        pidgin-Tango-smiley-theme.tar.bz2
 Source3:        pidgin-prefs.xml