/pidgin/main: 95df6e2a7a3d: Merge branch 'default' into xhaakon/...
Jakub Adam <[email protected]> Sun, 21 Aug 2016 12:18:56 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 95df6e2a7a3da1b9bbc458b99c245820fc473bab Author: Jakub Adam <[email protected]> Date: 2016-08-20 21:28 +0200 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/95df6e2a7a3d Description: Merge branch 'default' into xhaakon/default diffstat: .hgignore | 4 + .hgtags | 1 + COPYRIGHT | 1 + ChangeLog | 88 +- ChangeLog.API | 18 + config.h.mingw | 125 +- finch/plugins/gntgf.c | 1 + libpurple/cmds.c | 72 + libpurple/cmds.h | 61 +- libpurple/internal.h | 3 - libpurple/media.h | 2 + libpurple/media/backend-fs2.c | 4 + libpurple/media/backend-iface.h | 2 + libpurple/plugins/Makefile.am | 4 - libpurple/plugins/ciphertest.c | 615 - libpurple/prefs.c | 396 +- libpurple/prefs.h | 106 + libpurple/protocols/bonjour/Makefile.am | 8 +- libpurple/protocols/bonjour/Makefile.mingw | 2 +- libpurple/protocols/bonjour/mdns_dns_sd.c | 4 + libpurple/protocols/irc/msgs.c | 11 +- libpurple/protocols/mxit/Makefile.am | 4 +- libpurple/protocols/mxit/Makefile.mingw | 3 +- libpurple/protocols/mxit/chunk.c | 272 +- libpurple/protocols/mxit/chunk.h | 82 +- libpurple/protocols/mxit/client.c | 386 +- libpurple/protocols/mxit/client.h | 8 +- libpurple/protocols/mxit/filexfer.c | 6 +- libpurple/protocols/mxit/filexfer.h | 4 +- libpurple/protocols/mxit/formcmds.c | 32 +- libpurple/protocols/mxit/markup.c | 19 +- libpurple/protocols/mxit/multimx.c | 2 +- libpurple/protocols/mxit/mxit.c | 12 - libpurple/protocols/mxit/mxit.h | 3 - libpurple/protocols/mxit/roster.c | 4 - libpurple/protocols/mxit/splashscreen.c | 6 +- libpurple/protocols/mxit/splashscreen.h | 2 +- libpurple/protocols/mxit/voicevideo.c | 243 - libpurple/protocols/mxit/voicevideo.h | 36 - libpurple/protocols/oscar/Makefile.mingw | 1 + libpurple/protocols/oscar/oscar.h | 2 +- libpurple/purple-remote | 2 +- libpurple/purple-url-handler | 2 +- libpurple/win32/global.mak | 14 +- pidgin/gtkblist.c | 6 +- pidgin/gtkconv.c | 13 + pidgin/gtkdialogs.c | 1 + pidgin/pixmaps/Makefile.am | 1 + pidgin/pixmaps/emblems/16/mobile.png | Bin pidgin/plugins/win32/transparency/Makefile.mingw | 1 - pidgin/plugins/win32/winprefs/Makefile.mingw | 1 - pidgin/win32/gtkwin32dep.c | 39 +- pidgin/win32/nsis/pidgin-installer.nsi | 2 + po/POTFILES.in | 1 - po/POTFILES.skip | 66 + po/af.po | 3092 +- po/am.po | 7307 +- po/ar.po | 5221 +- po/as.po | 5835 +- po/ast.po | 884 +- po/az.po | 6817 +- po/[email protected] | 768 +- po/bg.po | 8391 +-- po/bn.po | 3533 +- po/bn_IN.po | 2674 +- po/br.po | 16781 ++---- po/brx.po | 7834 +-- po/bs.po | 10393 +-- po/ca.po | 4665 +- po/[email protected] | 1218 +- po/cs.po | 3677 +- po/da.po | 5930 +- po/de.po | 5393 +- po/dz.po | 8958 +-- po/el.po | 950 +- po/en_AU.po | 13248 +--- po/en_CA.po | 718 +- po/en_GB.po | 895 +- po/eo.po | 2962 +- po/es.po | 2930 +- po/es_AR.po | 11536 +--- po/et.po | 887 +- po/eu.po | 4583 +- po/fa.po | 854 +- po/fi.po | 5790 +- po/fr.po | 1834 +- po/ga.po | 903 +- po/gl.po | 5133 +- po/gu.po | 2100 +- po/he.po | 850 +- po/hi.po | 2838 +- po/hr.po | 765 +- po/hu.po | 1253 +- po/hy.po | 7897 +-- po/id.po | 6758 +- po/import-from-transifex | 85 + po/it.po | 2038 +- po/ja.po | 4902 +- po/ka.po | 6667 +- po/kk.po | 8973 +-- po/km.po | 837 +- po/kn.po | 3218 +- po/ko.po | 6905 +- po/ks.po | 7834 +-- po/ku.po | 8512 +-- po/ku_IQ.po | 109 +- po/lt.po | 949 +- po/lv.po | 25865 ++++----- po/mai.po | 1542 +- po/mhr.po | 743 +- po/mk.po | 5525 +- po/ml.po | 2665 +- po/mn.po | 3891 +- po/mr.po | 2360 +- po/ms_MY.po | 8177 +-- po/my_MM.po | 867 +- po/nb.po | 7361 +- po/ne.po | 11041 +-- po/nl.po | 928 +- po/nn.po | 954 +- po/oc.po | 1251 +- po/or.po | 2188 +- po/pa.po | 859 +- po/pl.po | 23046 +++----- po/ps.po | 4343 +- po/pt.po | 931 +- po/pt_BR.po | 3150 +- po/ro.po | 1142 +- po/ru.po | 2956 +- po/sd.po | 7834 +-- po/si.po | 2439 +- po/sk.po | 3219 +- po/sl.po | 949 +- po/sq.po | 2033 +- po/sr.po | 5152 +- po/[email protected] | 5152 +- po/sv.po | 5048 +- po/sw.po | 4413 +- po/ta.po | 3807 +- po/te.po | 2253 +- po/th.po | 5589 +- po/tr.po | 7335 +- po/tt.po | 8494 +-- po/uk.po | 1146 +- po/ur.po | 6633 +- po/uz.po | 9907 +-- po/vi.po | 1974 +- po/xh.po | 10708 +-- po/zh_CN.po | 2908 +- po/zh_HK.po | 2747 +- po/zh_TW.po | 2745 +- share/ca-certs/AOL_Member_CA.pem | 25 - share/ca-certs/AddTrust_External_Root.pem | 25 - share/ca-certs/America_Online_Root_Certification_Authority_1.pem | 23 - share/ca-certs/Baltimore_CyberTrust_Root.pem | 21 - share/ca-certs/Certum_Root_CA.pem | 19 - share/ca-certs/Certum_Trusted_Network_CA.pem | 22 - share/ca-certs/Deutsche_Telekom_Root_CA_2.pem | 23 - share/ca-certs/DigiCertHighAssuranceCA-3.pem | 36 - share/ca-certs/DigiCertHighAssuranceEVRootCA.pem | 23 - share/ca-certs/Entrust.net_2048.pem | 27 - share/ca-certs/Entrust.net_Secure_Server_CA.pem | 28 - share/ca-certs/Equifax_Secure_CA.pem | 20 - share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem | 16 - share/ca-certs/GTE_CyberTrust_Global_Root.pem | 16 - share/ca-certs/Go_Daddy_Class_2_CA.pem | 25 - share/ca-certs/Makefile.am | 33 +- share/ca-certs/Microsoft_Internet_Authority_2010.pem | 30 - share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem | 35 - share/ca-certs/StartCom_Certification_Authority.pem | 44 - share/ca-certs/Thawte_Premium_Server_CA.pem | 19 - share/ca-certs/Thawte_Primary_Root_CA.pem | 25 - share/ca-certs/ValiCert_Class_2_VA.pem | 19 - share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem | 34 - share/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem | 19 - share/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem | 29 - share/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem | 30 - share/ca-certs/VeriSign_International_Server_Class_3_CA.pem | 21 - share/ca-certs/Verisign_Class3_Primary_CA.pem | 14 - share/ca-certs/mk-ca-bundle.pl | 499 + share/ca-certs/mozilla.pem | 3865 + 181 files changed, 140329 insertions(+), 317894 deletions(-) diffs (truncated from 782608 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -7,6 +7,7 @@ pidgin-* syntax: regexp (.*/)?TAGS$ (.*/)?\.svn +.*.swp .*/?.*\.pc$ .*/?Makefile(\.in)?$ .*/?Makefile\.am\.mingw$ @@ -41,6 +42,7 @@ VERSION$ aclocal.m4 autogen.args autom4te.*\.cache +^build\/ compile config.cache config.guess @@ -149,6 +151,8 @@ po/stamp-it stamp-h1 test-driver win32-install-dir(\.release)? +share/ca-certs/cacert.pem +share/ca-certs/certdata.txt subinclude:libpurple/protocols/jabber/tests/.hgignore subinclude:libpurple/protocols/oscar/tests/.hgignore diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -91,3 +91,4 @@ 5010e6877abce3bfc2a4912e6b38fed7d6d3df19 9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9 b7fedd2a570b760f252cf8a65a584137ab0af2cb v2.10.10 e38a9aa5b1f8d25c58a0a7da05b386f265cba6e3 v2.10.11 +2ac1dcb9eb2ef9907ae0894ffad0c0e1b2e10f7d v2.10.12 diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -152,6 +152,7 @@ Taso N. Devetzis Balwinder Singh Dheeman Chandrakant Dhutadmal Andrew Dieffenbach +IngmÄrs DÄ«riÅÅ¡ Finlay Dobbie Mark Doliner Nuno Donato diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -103,12 +103,96 @@ version 3.0.0 (??/??/????): * A single jabber plugin provides XMPP, GTalk and Facebook protocols. * A single yahoo plugin provides both Yahoo and Yahoo JAPAN protocols. -version 2.10.12 (MM/DD/YY): + +version 2.11.0 (06/21/16): + General: + * 2.10.12 was accidentally released with new additions to the API and + should have been released as 2.11.0. Unfortunately, we did not catch + the mistake until after 2.10.12 was released, but we're fixing it now. + See ChangeLog.API for more information. + * Include the Mozilla certificate bundle. This fixes connecting to servers + with certificates from Let's Encrypt. + * Remove all 1024-bit CAs + + libpurple: + * media: fix an issue with ximagesink displaying only a corner cut-out of + a larger webcam video (Jakub Adam) + * mediamanager: update output window destruction so that it reflects recent + changes in the media pipeline structure (Jakub Adam) + * Ported Instantbird's CommandUiOps to libpurple (Dequis) + + Pidgin: + * Fixed #14962 + * Fixed alignment of incoming right-to-left messages in protocols that + don't support rich text + * Fix a potential crash while exiting pidgin + + AIM: + * Add support for the newer kerberos-based authentication of AIM 8.x + + Windows-Specific Changes: + * Use getaddrinfo for DNS to enable IPv6 (#1075) + * Updates to dependencies: + * NSS 3.24 and NSPR 4.12. + + Bonjour + * Fixed building on Mac OSX (Patrick Cloke) (#16883) + + ICQ: + * Stop truncating passwords to 8 characters like old ICQ clients did. + (#16692). If you actually needed this, truncate your password + manually by pressing backspace a few times. + + IRC: + * Base64-decode SASL messages before passing to libsasl (#16268) + + MXit + * Fixed a buffer overflow. Discovered by Yves Younan of Cisco Talos. + (TALOS-CAN-0120) + * Fixed a remote out-of-bounds read. Discovered by Yves Younan of Cisco + Talos. (TALOS-CAN-0140) + * Fixed a remote out-of-band read. Discovered by Yves Younan of Cisco + Talos. (TALOS-CAN-0138, TALOS-CAN-0135) + * Fixed an invalid read. Discovered by Yves Younan of Cisco Talos + (TALOS-CAN-0118) + * Fixed a remote buffer overflow vulnerability. Discovered by Yves + Younan of Cisco Talos. (TALOS-CAN-0119) + * Fixed an out-of-bounds read discovered by Yves Younan of Cisco Talos. + (TALOS-CAN-0123) + * Fixed a directory traversal issue. Discovered by Yves Younan of Cisco + Talos (TALOS-CAN-0128) + * Fixed a remote denial of service vulnerability that could result in + a null pointer dereference. Discovered by Yves Younan of Cisco Talos. + (TALOS-CAN-0133) + * Fixed a remote denial of service that could result in an out-of-bounds + read. Discovered by Yves Younan of Cisco Talos (TALOS-CAN-0134) + * Fixed multiple remote buffer overflows. Discovered by Yves Younan of + Cisco Talos. (TALOS-CAN-0136) + * Fixed a remote NULL pointer dereference. Discovered by Yves Younan of + Cisco Talos (TALOS-CAN-0137) + * Fixed a remote code execution issue discovered by Yves Younan of Cisco + Talos. (TALOS-CAN-0142) + * Fixed a remote denial of service vulnerability in contact mood + handling. Discovered by Yves Younan of Cisco Talos (TALOS-CAN-0141) + * Fixed a remote out-of-bounds write vulnerability. Discovered by Yves + Younan of Cisco Talos. (TALOS-CAN-0139) + * Fix a remote out-of-bounds read. Discovered by Yves Younan of Cisco + Talos. (TALOS-CAN-0143) + +version 2.10.12 (12/31/15): + General: + * purple-url-handler now works with Python 3.x (Daniël van Eeden) + * Fixed an issue where transient startup statuses could be deleted + (Jakub Adam) (#16762) + + Pidgin: + * The shout smile now matches the default theme (Steve Vaught) + Windows-Specific Changes: * Updates to dependencies: * Cyrus SASL 2.1.26 * libxml2 2.9.2 - * NSS 3.17.3 and NSPR 4.10.7 + * NSS 3.20.1 and NSPR 4.10.10 * Perl 5.20.1 * SILC 1.1.12 * Remove support for Tcl plugins diff --git a/ChangeLog.API b/ChangeLog.API --- a/ChangeLog.API +++ b/ChangeLog.API @@ -632,6 +632,24 @@ version 3.0.0 (??/??/????): * _GntTreeColumnFlag * _GntWidgetFlags +version 2.11.0: + libpurple: + Added: + * account-status-changing signal (account signals) + * buddy-removed-from-group signal (blist signals) + * PurpleCommandsUiOps, to allow the UI to override the + built-in handling of commands. + * PurplePrefsUiOps, to allow the UI to override the way global + preferences are stored. + * PurpleAccountPrefsUiOps, to allow the UI to handle storage + of account preferences. + * purple_media_set_encryption_parameters + * purple_media_set_decryption_parameters + * purple_xfer_write_file + * purple_xfer_read_file + * purple_media_set_send_rtcp_mux + * purple_media_backend_set_send_rtcp_mux + version 2.10.12: * No changes diff --git a/config.h.mingw b/config.h.mingw --- a/config.h.mingw +++ b/config.h.mingw @@ -1,18 +1,42 @@ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + /* configure arguments */ /* #undef CONFIG_ARGS */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + /* Define if debugging is enabled. */ /* #undef DEBUG */ +/* display version info */ +/* #undef DISPLAY_VERSION */ + /* Define if mono enabled. */ /* #undef ENABLE_MONO */ /* always defined to indicate that i18n is enabled */ #define ENABLE_NLS 1 +/* use the given file as GnuTLS default trust store */ +/* #undef GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +/* #undef HAVE_ALLOCA */ + +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + /* Define if you have the external 'altzone' variable. */ /* #undef HAVE_ALTZONE */ @@ -54,15 +78,24 @@ /* Define to 1 if you have the <EXTERN.h> header file. */ /* #undef HAVE_EXTERN_H */ +/* Use Farsight instead of Farstream */ +/* #undef HAVE_FARSIGHT */ + /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if your stdio has int fileno(FILE *). */ +#define HAVE_FILENO 1 + /* Define to 1 if you have the getaddrinfo function (since WinXP). */ #define HAVE_GETADDRINFO 1 /* Define to 1 if you have the `gethostid' function. */ /* #define HAVE_GETHOSTID 1 */ +/* Define to 1 if you have the `getifaddrs' function. */ +/* #undef HAVE_GETIFADDRS */ + /* Define to 1 if you have the `getopt_long' function. */ /* #define HAVE_GETOPT_LONG 1 */ @@ -75,12 +108,21 @@ /* Define to 1 if you have the <gnutls/gnutls.h> header file. */ #define HAVE_GNUTLS_GNUTLS_H 1 -/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */ +/* Define if your gnutls has gnutls_priority_set_direct and friends */ +/* #undef HAVE_GNUTLS_PRIORITY_FUNCS */ + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 /* Define if we have IOKit */ /* #undef HAVE_IOKIT */ +/* Define if the IPV6_V6ONLY setsockopt option exists */ +/* #undef HAVE_IPV6_V6ONLY */ + /* Define to 1 if you have the `krb_get_err_text' function. */ /* #undef HAVE_KRB_GET_ERR_TEXT */ @@ -99,12 +141,9 @@ /* Define if your <locale.h> file defines LC_MESSAGES. */ /* #define HAVE_LC_MESSAGES 1 */ -/* Define to 1 if you have libgadu. */ +/* Linked with external libgadu */ #define HAVE_LIBGADU 1 -/* Define if you have NetworkManager */ -/* #undef HAVE_LIBNM */ - /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #define HAVE_LIBNSL 1 */ @@ -123,6 +162,9 @@ /* Define to 1 if you have the <malloc.h> header file. */ #define HAVE_MALLOC_H 1 +/* Define if we have support for application media type. */ +/* #undef HAVE_MEDIA_APPLICATION */ + /* Define to 1 if you have the `memcpy' function. */ #define HAVE_MEMCPY 1 @@ -141,6 +183,9 @@ /* Define to 1 if you have the <mono/metadata/object.h> header file. */ /* #undef HAVE_MONO_METADATA_OBJECT_H */ _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits