diff --git a/pidgin-2.11.0.tar.bz2 b/pidgin-2.11.0.tar.bz2 deleted file mode 100644 index 5413b13..0000000 --- a/pidgin-2.11.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333 -size 10037480 diff --git a/pidgin-2.11.0.tar.bz2.asc b/pidgin-2.11.0.tar.bz2.asc deleted file mode 100644 index e350800..0000000 --- a/pidgin-2.11.0.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAldmMNYACgkQdf4lmqisgDKuxwCgj8Oxj98hSo28GL4oHU3NnEnv -S8wAnA+rJ4ivRMGTrUh0UfTlqfYdWsUV -=Xj1E ------END PGP SIGNATURE----- diff --git a/pidgin-2.12.0.tar.bz2 b/pidgin-2.12.0.tar.bz2 new file mode 100644 index 0000000..79860a8 --- /dev/null +++ b/pidgin-2.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8 +size 9270704 diff --git a/pidgin-2.12.0.tar.bz2.asc b/pidgin-2.12.0.tar.bz2.asc new file mode 100644 index 0000000..c584ab8 --- /dev/null +++ b/pidgin-2.12.0.tar.bz2.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQ2Ti6zjqao1h+5Y611/iWaqKyAMgUCWMIGggAKCRB1/iWaqKyA +MlX8AJ9cW8x1ICc75KDNN17Ph6wgV2MBVQCfXSLgNYq5qq7HwHYth9M6zZC99tg= +=zYnu +-----END PGP SIGNATURE----- diff --git a/pidgin-nonblock-common.patch b/pidgin-nonblock-common.patch index 8b04454..be1d406 100644 --- a/pidgin-nonblock-common.patch +++ b/pidgin-nonblock-common.patch @@ -1,8 +1,6 @@ -Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c -=================================================================== ---- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-gnutls.c -+++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c -@@ -453,8 +453,6 @@ ssl_gnutls_close(PurpleSslConnection *gs +--- a/libpurple/plugins/ssl/ssl-gnutls.c ++++ b/libpurple/plugins/ssl/ssl-gnutls.c +@@ -435,8 +435,6 @@ ssl_gnutls_close(PurpleSslConnection *gs if (gnutls_data->handshake_timer) purple_timeout_remove(gnutls_data->handshake_timer); @@ -11,7 +9,7 @@ Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c gnutls_deinit(gnutls_data->session); g_free(gnutls_data); -@@ -489,6 +487,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc +@@ -524,6 +522,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc } static size_t @@ -34,8 +32,8 @@ Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); -@@ -1148,6 +1162,23 @@ static PurpleCertificateScheme x509_gnut - +@@ -1296,6 +1310,23 @@ static PurpleCertificateScheme x509_gnut + x509_compare_pubkeys, /* Compare public keys */ }; +static size_t @@ -58,7 +56,7 @@ Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c static PurpleSslOps ssl_ops = { ssl_gnutls_init, -@@ -1155,7 +1186,9 @@ static PurpleSslOps ssl_ops = +@@ -1303,7 +1334,9 @@ static PurpleSslOps ssl_ops = ssl_gnutls_connect, ssl_gnutls_close, ssl_gnutls_read, @@ -68,11 +66,9 @@ Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c ssl_gnutls_get_peer_certificates, /* padding */ -Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c -=================================================================== ---- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-nss.c -+++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c -@@ -958,6 +958,8 @@ static PurpleSslOps ssl_ops = +--- a/libpurple/plugins/ssl/ssl-nss.c ++++ b/libpurple/plugins/ssl/ssl-nss.c +@@ -1235,6 +1235,8 @@ static PurpleSslOps ssl_ops = ssl_nss_connect, ssl_nss_close, ssl_nss_read, @@ -81,10 +77,8 @@ Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c ssl_nss_write, ssl_nss_peer_certs, -Index: pidgin-2.7.3/libpurple/purple-fifo.c -=================================================================== --- /dev/null -+++ pidgin-2.7.3/libpurple/purple-fifo.c ++++ b/libpurple/purple-fifo.c @@ -0,0 +1,232 @@ +/* + * @file purple-fifo.c A FIFO byte queue. @@ -318,10 +312,8 @@ Index: pidgin-2.7.3/libpurple/purple-fifo.c + + return TRUE; +} -Index: pidgin-2.7.3/libpurple/purple-fifo.h -=================================================================== --- /dev/null -+++ pidgin-2.7.3/libpurple/purple-fifo.h ++++ b/libpurple/purple-fifo.h @@ -0,0 +1,54 @@ +/** + * @file purple-fifo.h A FIFO byte queue. @@ -377,10 +369,8 @@ Index: pidgin-2.7.3/libpurple/purple-fifo.h +G_END_DECLS + +#endif /* _purple_fifo_H_ */ -Index: pidgin-2.7.3/libpurple/purple-io.c -=================================================================== --- /dev/null -+++ pidgin-2.7.3/libpurple/purple-io.c ++++ b/libpurple/purple-io.c @@ -0,0 +1,391 @@ +/* + * @file purple-io.c Buffering I/O layer. @@ -630,7 +620,7 @@ Index: pidgin-2.7.3/libpurple/purple-io.c + io->read_fifo = purple_fifo_new (); + io->write_fifo = purple_fifo_new (); + -+ return io; ++ return io; +} + +void @@ -773,10 +763,8 @@ Index: pidgin-2.7.3/libpurple/purple-io.c +{ + return purple_fifo_get_used (io->write_fifo); +} -Index: pidgin-2.7.3/libpurple/purple-io.h -=================================================================== --- /dev/null -+++ pidgin-2.7.3/libpurple/purple-io.h ++++ b/libpurple/purple-io.h @@ -0,0 +1,87 @@ +/** + * @file purple-io.h Buffering I/O layer. @@ -865,11 +853,9 @@ Index: pidgin-2.7.3/libpurple/purple-io.h +G_END_DECLS + +#endif /* _PURPLE_IO_H_ */ -Index: pidgin-2.7.3/libpurple/sslconn.c -=================================================================== ---- pidgin-2.7.3.orig/libpurple/sslconn.c -+++ pidgin-2.7.3/libpurple/sslconn.c -@@ -272,6 +272,27 @@ purple_ssl_read(PurpleSslConnection *gsc +--- a/libpurple/sslconn.c ++++ b/libpurple/sslconn.c +@@ -273,6 +273,27 @@ purple_ssl_read(PurpleSslConnection *gsc } size_t @@ -897,7 +883,7 @@ Index: pidgin-2.7.3/libpurple/sslconn.c purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslOps *ops; -@@ -295,6 +316,27 @@ purple_ssl_get_peer_certificates(PurpleS +@@ -296,6 +317,27 @@ purple_ssl_get_peer_certificates(PurpleS return (ops->get_peer_certificates)(gsc); } @@ -925,10 +911,8 @@ Index: pidgin-2.7.3/libpurple/sslconn.c void purple_ssl_set_ops(PurpleSslOps *ops) { -Index: pidgin-2.7.3/libpurple/sslconn.h -=================================================================== ---- pidgin-2.7.3.orig/libpurple/sslconn.h -+++ pidgin-2.7.3/libpurple/sslconn.h +--- a/libpurple/sslconn.h ++++ b/libpurple/sslconn.h @@ -34,6 +34,12 @@ typedef enum PURPLE_SSL_CERTIFICATE_INVALID = 3 } PurpleSslErrorType; diff --git a/pidgin.changes b/pidgin.changes index f1c3f62..f352427 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Fri Mar 10 21:14:24 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 2.12.0: + + libpurple: + - Fix an out of bounds memory read in + purple_markup_unescape_entity (CVE-2017-2640). + - Fix the use of uninitialised memory if running + non-debug-enabled versions of glib. + - Update AIM dev and dist ID's to new ones that were assigned + by AOL. + - TLS certificate verification now uses SHA-256 checksums. + - Fix the SASL external auth for Freenode. + - Remove the MSN protocol plugin. It has been unusable and + dormant for some time. + - Remove the Mxit protocol plugin. The service was closed at + the end ofSeptember 2016. + - Remove the MySpaceIM protocol plugin. The service has been + defunct for a long time (pidgin.im#15356). + - Remove the Yahoo! protocol plugin. Yahoo has completely + reimplemented their protocol, so this version is no longer + operable as of August 5th, 2016. + - Remove the Facebook (XMPP) account option. According to + https://developers.facebook.com/docs/chat the XMPP Chat API + service ended April 30th, 2015. + - Fix gnutls certificate validation errors that mainly + affected Google. + + General: + - Replace instances of d.pidgin.im with developer.pidgin.im and + update the urls to use https (pidgin.im#17036). + + IRC: + - Fix an issue of messages being silently cut off at 500 + characters. Large messages are now split into parts and sent + one by one (pidgin.im#4753). +- Rebase pidgin-nonblock-common.patch. + ------------------------------------------------------------------- Thu Dec 8 12:14:13 UTC 2016 - sor.alexei@meowr.ru diff --git a/pidgin.spec b/pidgin.spec index 460ab0e..7408e9d 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,7 +1,7 @@ # # spec file for package pidgin # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _name Pidgin Name: pidgin -Version: 2.11.0 +Version: 2.12.0 Release: 0 Summary: Multiprotocol Instant Messaging Client License: GPL-2.0+