Hello community,
here is the log from the commit of package pidgin for openSUSE:Factory checked in at 2014-11-26 20:57:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pidgin (Old)
and /work/SRC/openSUSE:Factory/.pidgin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pidgin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pidgin/pidgin.changes 2014-11-01 08:13:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pidgin.new/pidgin.changes 2014-11-26 23:04:27.000000000 +0100
@@ -1,0 +2,33 @@
+Mon Nov 24 10:55:10 UTC 2014 - dimstar(a)opensuse.org
+
+- Update to version 2.10.11:
+ + General:
+ - Fix handling of Self-Signed SSL/TLS Certificates when using
+ the NSS plugin (pidgin.im#16412).
+ - Improve default cipher suites used with the NSS plugin
+ (pidgin.im#16262).
+ - Add NSS Preferences plugin which allows the SSL/TLS Versions
+ and cipher suites to be configured (pidgin.im#8061).
+ + Gadu-Gadu:
+ - Fix a bug that prevented plugin to load when compiled without
+ GnuTLS (pidgin.im#16431).
+ - Fix build for platforms without AF_LOCAL definition
+ (pidgin.im#16404).
+ + MSN:
+ - Fix broken login due to server change (pidgin.im#16451,
+ pidgin.im#16455).
+ - Fail early when buddy list is unavailable instead of wasting
+ bandwidth endlessly re-trying.
+
+-------------------------------------------------------------------
+Thu Oct 25 11:12:27 UTC 2014 - sor.alexei(a)meowr.ru
+
+- Remove pidgin-mono-buildfix.patch: Mono bindings are deprecated
+ upstream and no plugin exists making use of them.
+- Rebase pidgin-gnome-keyring.patch.
+- Make openSUSE 11.1 (SLE 11) minimal requirement.
+- Remove obsoletions of gaim: incredibly old.
+- Move Tango and NLD emoticons to separate packages.
+- Spec cleanup.
+
+-------------------------------------------------------------------
Old:
----
pidgin-2.10.10.tar.bz2
pidgin-NLD-smiley-theme.tar.bz2
pidgin-Tango-smiley-theme.tar.bz2
pidgin-mono-buildfix.patch
New:
----
pidgin-2.10.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pidgin.spec ++++++
++++ 855 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/pidgin/pidgin.spec
++++ and /work/SRC/openSUSE:Factory/.pidgin.new/pidgin.spec
++++++ pidgin-gnome-keyring.patch ++++++
--- /var/tmp/diff_new_pack.ESgvd3/_old 2014-11-26 23:04:28.000000000 +0100
+++ /var/tmp/diff_new_pack.ESgvd3/_new 2014-11-26 23:04:28.000000000 +0100
@@ -1,31 +1,31 @@
-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.10.5/configure.ac 2012-07-06 13:20:39.253322728 +0200
-@@ -1858,6 +1858,20 @@
- [AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])],
- [with_nss_libs="$withval"])
+diff -Naur pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
+--- pidgin-2.10.10.orig/configure.ac
++++ pidgin-2.10.10/configure.ac
+@@ -2124,6 +2124,20 @@
+ fi
-+dnl #######################################################################
+ dnl #######################################################################
+dnl # Check for gnome-keyring
+dnl #--enable-gnome-keyring=(yes|no)
+dnl #######################################################################
+AC_ARG_ENABLE(gnome-keyring,
-+ AC_HELP_STRING([--enable-gnome-keyring],
-+ [use gnome keyring for storing password [default=no]]),,
-+ enable_gnome_keyring=no)
++ AC_HELP_STRING([--enable-gnome-keyring],
++ [use gnome keyring for storing password [default=no]]),,
++ enable_gnome_keyring=no)
+if test "x$enable_gnome_keyring" = "xyes"; then
-+ PKG_CHECK_MODULES(PURPLE_KEYRING,
-+ gnome-keyring-1,
-+ AC_DEFINE(PURPLE_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
++ PKG_CHECK_MODULES(PURPLE_KEYRING,
++ gnome-keyring-1,
++ AC_DEFINE(PURPLE_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
+fi
+
-
- if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
- test -n "$with_nss_includes" || test -n "$with_nss_libs" ||
-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.10.5/libpurple/account.c 2012-07-06 13:20:39.273323295 +0200
-@@ -49,6 +49,13 @@
++dnl #######################################################################
+ dnl # Check for Tcl
+ dnl #######################################################################
+ AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl],
+diff -Naur pidgin-2.10.10.orig/libpurple/account.c pidgin-2.10.10/libpurple/account.c
+--- pidgin-2.10.10.orig/libpurple/account.c
++++ pidgin-2.10.10/libpurple/account.c
+@@ -54,6 +54,13 @@
#define PURPLE_ACCOUNT_GET_PRIVATE(account) \
((PurpleAccountPrivate *) (account->priv))
@@ -39,7 +39,7 @@
/* TODO: Should use PurpleValue instead of this? What about "ui"? */
typedef struct
{
-@@ -379,8 +386,13 @@
+@@ -393,8 +400,13 @@
if (purple_account_get_remember_password(account) &&
((tmp = purple_account_get_password(account)) != NULL))
{
@@ -50,110 +50,155 @@
child = xmlnode_new_child(node, "password");
xmlnode_insert_data(child, tmp, -1);
+#endif
- }
-
- if ((tmp = purple_account_get_alias(account)) != NULL)
-@@ -875,17 +887,30 @@
+ } else if (_purple_account_is_password_encrypted(account)) {
+ const char *keyring = NULL;
+ const char *mode = NULL;
+@@ -909,37 +921,51 @@
}
ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
- g_free(name);
- g_free(protocol_id);
--
-- /* Read the password */
+
+ /* Read the password */
- child = xmlnode_get_child(node, "password");
-- if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
+- if (child != NULL) {
+- const char *keyring_id = xmlnode_get_attrib(child, "keyring_id");
+- const char *mode = xmlnode_get_attrib(child, "mode");
+- gboolean is_plaintext;
+-
+- data = xmlnode_get_data(child);
+-
+- if (keyring_id == NULL || keyring_id[0] == '\0')
+- is_plaintext = TRUE;
+- else if (g_strcmp0(keyring_id, "keyring-internal") != 0)
+- is_plaintext = FALSE;
+- else if (mode == NULL || mode[0] == '\0' || g_strcmp0(mode, "cleartext") == 0)
+- is_plaintext = TRUE;
+- else
+- is_plaintext = FALSE;
+-
+- if (is_plaintext) {
+- purple_account_set_remember_password(ret, TRUE);
+- purple_account_set_password(ret, data);
+- } else {
+- purple_debug_warning("account", "found encrypted password, "
+- "but it's not supported in 2.x.y\n");
+- _purple_account_set_encrypted_password(ret, keyring_id, mode, data);
+- }
+ gboolean got_pwd = FALSE;
+#ifdef PURPLE_ENABLE_KEYRING
+ data = purple_account_get_password_from_keyring(protocol_id, name);
+ if (data)
- {
++ {
+ got_pwd = TRUE;
- purple_account_set_remember_password(ret, TRUE);
- purple_account_set_password(ret, data);
++ purple_account_set_remember_password(ret, TRUE);
++ purple_account_set_password(ret, data);
g_free(data);
}
+#endif
+ if (!got_pwd)
+ {
-+ /* Read the password */
-+ child = xmlnode_get_child(node, "password");
-+ if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
-+ {
-+ purple_account_set_remember_password(ret, TRUE);
-+ purple_account_set_password(ret, data);
-+ g_free(data);
-+ }
-+ }
++ child = xmlnode_get_child(node, "password");
++ if (child != NULL) {
++ const char *keyring_id = xmlnode_get_attrib(child, "keyring_id");
++ const char *mode = xmlnode_get_attrib(child, "mode");
++ gboolean is_plaintext;
++
++ data = xmlnode_get_data(child);
++
++ if (keyring_id == NULL || keyring_id[0] == '\0')
++ is_plaintext = TRUE;
++ else if (g_strcmp0(keyring_id, "keyring-internal") != 0)
++ is_plaintext = FALSE;
++ else if (mode == NULL || mode[0] == '\0' || g_strcmp0(mode, "cleartext") == 0)
++ is_plaintext = TRUE;
++ else
++ is_plaintext = FALSE;
++
++ if (is_plaintext) {
++ purple_account_set_remember_password(ret, TRUE);
++ purple_account_set_password(ret, data);
++ } else {
++ purple_debug_warning("account", "found encrypted password, "
++ "but it's not supported in 2.x.y\n");
++ _purple_account_set_encrypted_password(ret, keyring_id, mode, data);
++ }
++ g_free(data);
++ }
++ }
+ g_free(name);
+ g_free(protocol_id);
/* Read the alias */
child = xmlnode_get_child(node, "alias");
-@@ -3245,3 +3270,60 @@
- purple_signals_disconnect_by_handle(handle);
+@@ -3305,6 +3331,63 @@
purple_signals_unregister_by_instance(handle);
}
-+
+
+#ifdef PURPLE_ENABLE_KEYRING
+static char *
+purple_account_get_password_from_keyring(const char *_prpl, const char *_user)
+{
-+ GnomeKeyringNetworkPasswordData *found_item;
-+ GnomeKeyringResult result;
-+ GList *matches;
-+ char *password;
++ GnomeKeyringNetworkPasswordData *found_item;
++ GnomeKeyringResult result;
++ GList *matches;
++ char *password;
+
-+ matches = NULL;
++ matches = NULL;
+
-+ result = gnome_keyring_find_network_password_sync (
-+ _user, /* user */
-+ NULL, /* domain */
-+ "gaim.local", /* server */
-+ NULL, /* object */
-+ _prpl, /* protocol */
-+ NULL, /* authtype */
-+ 1863, /* port */
-+ &matches);
++ result = gnome_keyring_find_network_password_sync (
++ _user, /* user */
++ NULL, /* domain */
++ "gaim.local", /* server */
++ NULL, /* object */
++ _prpl, /* protocol */
++ NULL, /* authtype */
++ 1863, /* port */
++ &matches);
+
-+ if (result != GNOME_KEYRING_RESULT_OK)
-+ return NULL;
++ if (result != GNOME_KEYRING_RESULT_OK)
++ return NULL;
+
-+ g_assert (matches != NULL && matches->data != NULL);
++ g_assert (matches != NULL && matches->data != NULL);
+
-+ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
++ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
+
-+ password = g_strdup (found_item->password);
++ password = g_strdup (found_item->password);
+
-+ gnome_keyring_network_password_list_free (matches);
++ gnome_keyring_network_password_list_free (matches);
+
-+ return password;
++ return password;
+}
+
+static gboolean
+purple_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
+{
-+ GnomeKeyringResult result;
-+ guint32 item_id;
++ GnomeKeyringResult result;
++ guint32 item_id;
+
-+ result = gnome_keyring_set_network_password_sync (
-+ NULL, /* default keyring */
-+ _user, /* user */
-+ NULL, /* domain */
-+ "gaim.local", /* server */
-+ NULL, /* object */
-+ _prpl, /* protocol */
-+ NULL, /* authtype */
-+ 1863, /* port */
-+ _password, /* password */
-+ &item_id);
++ result = gnome_keyring_set_network_password_sync (
++ NULL, /* default keyring */
++ _user, /* user */
++ NULL, /* domain */
++ "gaim.local", /* server */
++ NULL, /* object */
++ _prpl, /* protocol */
++ NULL, /* authtype */
++ 1863, /* port */
++ _password, /* password */
++ &item_id);
+
-+ return result == GNOME_KEYRING_RESULT_OK;
++ 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
++
+ /* libpurple 3.0.0 compatibility */
+
+ static void
+diff -Naur pidgin-2.10.10.orig/libpurple/Makefile.am pidgin-2.10.10/libpurple/Makefile.am
+--- pidgin-2.10.10.orig/libpurple/Makefile.am
++++ pidgin-2.10.10/libpurple/Makefile.am
@@ -305,6 +305,7 @@
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
@@ -162,11 +207,13 @@
$(INTLLIBS) \
$(FARSTREAM_LIBS) \
$(GSTREAMER_LIBS) \
-@@ -321,6 +322,7 @@
- $(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(DBUS_CFLAGS) \
-+ $(PURPLE_KEYRING_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(FARSTREAM_CFLAGS) \
+@@ -326,7 +327,8 @@
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
+ $(IDN_CFLAGS) \
+- $(NETWORKMANAGER_CFLAGS)
++ $(NETWORKMANAGER_CFLAGS) \
++ $(PURPLE_KEYRING_CFLAGS)
+
+ # INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
+ # We want to use SSL_CERTIFICATES_DIR when it's not empty.
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
