/soc/2012/sanket/statscollector-2.x.y: 9cee9972be24: Merged rele...
Sanket Agarwal
sanket at soc.pidgin.im
Sun Mar 31 00:37:39 EDT 2013
Changeset: 9cee9972be24e62aa07623364e32e61614c6b866
Author: Sanket Agarwal <sanket at soc.pidgin.im>
Date: 2013-03-27 20:02 +0530
Branch: soc.2012.statscollector
URL: https://hg.pidgin.im/soc/2012/sanket/statscollector-2.x.y/rev/9cee9972be24
Description:
Merged release-2.x.y!
diffstat:
.hgignore | 1 +
.hgtags | 1 +
COPYRIGHT | 9 +-
ChangeLog | 104 +-
ChangeLog.API | 3 +
Makefile.am | 6 +-
Makefile.mingw | 47 +-
README | 4 +-
README.MTN | 6 +-
README.mingw | 2 +-
configure.ac | 16 +-
doc/pidgin.1.in | 4 +-
finch/gntlog.c | 2 +-
finch/gntpounce.c | 6 +-
finch/libgnt/Makefile.am | 2 +-
finch/libgnt/gntwm.c | 6 +-
libpurple/Makefile.mingw | 17 +
libpurple/account.c | 6 +-
libpurple/buddyicon.c | 4 +-
libpurple/certificate.c | 4 +-
libpurple/example/nullclient.c | 10 +-
libpurple/imgstore.c | 38 +-
libpurple/imgstore.h | 84 +-
libpurple/log.c | 14 +-
libpurple/media/enum-types.h | 12 +-
libpurple/plugin.c | 9 +-
libpurple/plugins/log_reader.c | 3 +-
libpurple/plugins/perl/common/Makefile.mingw | 2 +-
libpurple/plugins/ssl/Makefile.mingw | 1 -
libpurple/plugins/ssl/ssl-nss.c | 12 +-
libpurple/plugins/tcl/signal-test.tcl | 2 +-
libpurple/plugins/tcl/tcl.c | 38 +-
libpurple/pounce.c | 2 +-
libpurple/protocols/bonjour/bonjour_ft.c | 166 +-
libpurple/protocols/bonjour/bonjour_ft.h | 2 +
libpurple/protocols/bonjour/jabber.c | 27 +-
libpurple/protocols/gg/gg.c | 12 +
libpurple/protocols/gg/lib/common.c | 3 +-
libpurple/protocols/gg/lib/dcc.c | 1 +
libpurple/protocols/gg/lib/dcc7.c | 5 +-
libpurple/protocols/gg/lib/libgadu.c | 2 +-
libpurple/protocols/gg/search.c | 6 +-
libpurple/protocols/irc/Makefile.am | 2 +-
libpurple/protocols/irc/Makefile.mingw | 7 +
libpurple/protocols/irc/irc.c | 32 +-
libpurple/protocols/irc/irc.h | 19 +
libpurple/protocols/irc/msgs.c | 415 +-
libpurple/protocols/irc/parse.c | 27 +-
libpurple/protocols/jabber/Makefile.mingw | 17 -
libpurple/protocols/jabber/auth_cyrus.c | 41 +-
libpurple/protocols/jabber/auth_digest_md5.c | 4 +-
libpurple/protocols/jabber/bosh.c | 6 +-
libpurple/protocols/jabber/google/google_session.c | 13 +-
libpurple/protocols/jabber/ibb.c | 4 -
libpurple/protocols/jabber/jabber.c | 59 +-
libpurple/protocols/jabber/jingle/rtp.c | 3 +-
libpurple/protocols/jabber/oob.c | 9 +-
libpurple/protocols/jabber/useravatar.c | 8 +-
libpurple/protocols/jabber/usermood.c | 4 +-
libpurple/protocols/msn/directconn.c | 14 +-
libpurple/protocols/msn/msn.c | 2 +-
libpurple/protocols/msn/soap.c | 3 +-
libpurple/protocols/msn/userlist.c | 1 +
libpurple/protocols/mxit/actions.c | 32 +-
libpurple/protocols/mxit/cipher.c | 209 +-
libpurple/protocols/mxit/cipher.h | 4 +-
libpurple/protocols/mxit/formcmds.c | 50 +-
libpurple/protocols/mxit/http.c | 12 +-
libpurple/protocols/mxit/login.c | 12 +-
libpurple/protocols/mxit/markup.c | 126 +-
libpurple/protocols/mxit/markup.h | 2 +-
libpurple/protocols/mxit/multimx.c | 21 +-
libpurple/protocols/mxit/mxit.c | 106 +-
libpurple/protocols/mxit/mxit.h | 2 +-
libpurple/protocols/mxit/profile.c | 40 +-
libpurple/protocols/mxit/profile.h | 15 +-
libpurple/protocols/mxit/protocol.c | 166 +-
libpurple/protocols/mxit/protocol.h | 27 +-
libpurple/protocols/mxit/roster.c | 8 +-
libpurple/protocols/mxit/roster.h | 9 +-
libpurple/protocols/mxit/splashscreen.c | 4 +-
libpurple/protocols/myspace/message.c | 14 +-
libpurple/protocols/novell/nmrtf.c | 1 -
libpurple/protocols/novell/novell.c | 8 -
libpurple/protocols/oscar/family_icbm.c | 2 +-
libpurple/protocols/oscar/family_locate.c | 2 +-
libpurple/protocols/oscar/oscar.c | 27 +-
libpurple/protocols/oscar/peer.c | 4 -
libpurple/protocols/oscar/userinfo.c | 11 +-
libpurple/protocols/sametime/sametime.c | 5 +-
libpurple/protocols/silc/Makefile.mingw | 2 +-
libpurple/protocols/silc/buddy.c | 9 +-
libpurple/protocols/silc/chat.c | 4 +-
libpurple/protocols/silc/ft.c | 2 -
libpurple/protocols/silc/ops.c | 14 +-
libpurple/protocols/silc/silc.c | 7 +-
libpurple/protocols/silc/silcpurple.h | 2 +-
libpurple/protocols/silc/util.c | 2 +-
libpurple/protocols/silc/wb.c | 2 +-
libpurple/protocols/silc10/wb.c | 2 +-
libpurple/protocols/simple/simple.c | 6 +-
libpurple/protocols/yahoo/libymsg.c | 9 +-
libpurple/protocols/yahoo/libymsg.h | 3 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 8 +-
libpurple/protocols/yahoo/yahoo_doodle.c | 6 +-
libpurple/protocols/yahoo/yahoo_picture.c | 3 -
libpurple/protocols/yahoo/yahoo_profile.c | 6 +-
libpurple/protocols/zephyr/zephyr.c | 14 +-
libpurple/smiley.c | 32 +-
libpurple/stringref.c | 4 +-
libpurple/theme-loader.c | 1 +
libpurple/upnp.c | 21 +-
libpurple/util.c | 5 +-
libpurple/win32/global.mak | 23 +-
pidgin.spec.in | 2 +-
pidgin/Makefile.mingw | 4 +-
pidgin/gtkconv.c | 34 +-
pidgin/gtkdialogs.c | 19 +-
pidgin/gtkdocklet.c | 2 -
pidgin/gtkimhtml.c | 15 +-
pidgin/gtkimhtml.h | 2 +-
pidgin/gtklog.c | 2 +-
pidgin/gtkmain.c | 9 +-
pidgin/gtknotify.c | 2 +-
pidgin/gtkpounce.c | 15 +-
pidgin/gtksourceundomanager.c | 17 +-
pidgin/gtkstatusbox.c | 2 +-
pidgin/gtkutils.c | 22 +-
pidgin/pidginstock.c | 24 +-
pidgin/plugins/cap/cap.c | 6 +-
pidgin/plugins/gevolution/add_buddy_dialog.c | 4 +-
pidgin/plugins/gevolution/gevolution.c | 2 +-
pidgin/plugins/notify.c | 12 +-
pidgin/plugins/perl/common/Makefile.mingw | 2 +-
pidgin/plugins/relnot.c | 2 +-
pidgin/plugins/timestamp_format.c | 2 +-
pidgin/plugins/vvconfig.c | 2 +
pidgin/win32/gtkwin32dep.c | 24 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 89 +-
pidgin/win32/nsis/pidgin-installer.nsi | 108 +-
pidgin/win32/winpidgin.c | 48 +-
po/ChangeLog | 26 +-
po/POTFILES.skip | 63 +
po/de.po | 597 +-
po/el.po | 5079 +++------
po/et.po | 5059 +++------
po/ga.po | 9517 +++++++++---------
po/he.po | 886 +-
po/hr.po | 10 +-
po/lt.po | 4389 ++-----
po/my_MM.po | 88 +-
po/nl.po | 557 +-
po/nn.po | 87 +-
po/pa.po | 795 +-
po/pl.po | 552 +-
po/pt.po | 9945 ++++++-------------
po/pt_BR.po | 1807 +--
share/ca-certs/Baltimore_CyberTrust_Root.pem | 21 +
share/ca-certs/Makefile.am | 1 +
159 files changed, 18019 insertions(+), 24429 deletions(-)
diffs (truncated from 78634 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: regexp
.*/perl/common/pm_to_blib$
.*~$
.*\.a$
+.*\.asc$
.*\.bak$
.*\.bs$
.*\.def$
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,2 +1,3 @@
a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
+ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,8 +15,9 @@ If concerns are raised as to the copyrig
piece of code, then that code should be traced through our version
control system to see from where it came and who has modified it.
-Copyright (C) 1998-2011 by the following:
+Copyright (C) 1998-2013 by the following:
+Mark
Saleem Abdulrasool
Jakub Adam
Dave Ahlswede
@@ -39,6 +40,7 @@ R. Tyler Ballance
Chris Banal
Luca Barbato
Levi Bard
+Mark Barfield
Ryan Barrett
Kevin Barry
Lukas Barth
@@ -71,6 +73,7 @@ Craig Boston
Éric Boumaour
Chris Boyle
Stanislav Brabec
+Bartosz Brachaczek
Quentin Brandon
Derrick J Brashear
Mauro Sérgio Ferreira Brasil
@@ -172,6 +175,7 @@ Jesse Farmer
Gavan Fantom (gavan)
Leonardo Fernandes
David Fiander
+Michael Fiedler
Ryan Flegel
Rob Flynn <gaim at robflynn.com>
Rob Foehl (rwf)
@@ -339,6 +343,7 @@ Greg McNew
Robert McQueen
Mihály Mészáros
Robert Mibus
+David Michael
Lars T. Mikkelsen
Benjamin Miller
Kevin Miller
@@ -452,6 +457,7 @@ Sam S.
Thanumalayan S.
Jonathan Sailor
Elliott Sales de Andrade
+Catalin Salgau
Tomasz Sałaciński <tsalacinski at gmail.com>
Pradyumna Sampath
Arvind Samptur
@@ -504,6 +510,7 @@ Peter Speybrouck
Lex Spoon
Chris Stafford
Kevin Stange
+Ferdinand Stehle
Joshua Stein
Jakub Steiner
Richard Stellingwerff
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,111 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-version 2.10.7:
+version 2.10.8:
+ Stock market:
+ * Didn't really increase, but didn't plummet, either.
+
+ Windows-Specific Changes:
+ * Updates to dependencies:
+ * NSS 3.14.3 and NSPR 4.9.5
+
+version 2.10.7 (02/13/2013):
Alien hatchery:
* No changes
+ General:
+ * The configure script will now exit with status 1 when specifying
+ invalid protocol plugins using the --with-static-prpls and
+ --with-dynamic-prpls arguments. (Michael Fiedler) (#15316)
+
+ libpurple:
+ * Fix a crash when receiving UPnP responses with abnormally long values.
+ (CVE-2013-0274)
+ * Don't link directly to libgcrypt when building with GnuTLS support.
+ (Bartosz Brachaczek) (#15329)
+ * Fix UPnP mappings on routers that return empty <URLBase/> elements
+ in their response. (Ferdinand Stehle) (#15373)
+ * Tcl plugin uses saner, race-free plugin loading.
+ * Fix the Tcl signals-test plugin for savedstatus-changed.
+ (Andrew Shadura) (#15443)
+
+ Pidgin:
+ * Make Pidgin more friendly to non-X11 GTK+, such as MacPorts' +no_x11
+ variant.
+
+ Gadu-Gadu:
+ * Fix a crash at startup with large contact list. Avatar support for
+ buddies will be disabled until 3.0.0. (#15226, #14305)
+
+ IRC:
+ * Support for SASL authentication. (Thijs Alkemade, Andy Spencer)
+ (#13270)
+ * Print topic setter information at channel join. (#13317)
+
+ MSN:
+ * Fix SSL certificate issue when signing into MSN for some users.
+ * Fix a crash when removing a user before its icon is loaded. (Mark
+ Barfield) (#15217)
+
+ MXit:
+ * Fix two bugs where a remote MXit user could possibly specify a local
+ file path to be written to. (CVE-2013-0271)
+ * Fix a bug where the MXit server or a man-in-the-middle could
+ potentially send specially crafted data that could overflow a buffer
+ and lead to a crash or remote code execution. (CVE-2013-0272)
+ * Display farewell messages in a different colour to distinguish
+ them from normal messages.
+ * Add support for typing notification.
+ * Add support for the Relationship Status profile attribute.
+ * Remove all reference to Hidden Number.
+ * Ignore new invites to join a GroupChat if you're already joined, or
+ still have a pending invite.
+ * The buddy's name was not centered vertically in the buddy-list if they
+ did not have a status-message or mood set.
+ * Fix decoding of font-size changes in the markup of received messages.
+ * Increase the maximum file size that can be transferred to 1 MB.
+ * When setting an avatar image, no longer downscale it to 96x96.
+
+ Sametime:
+ * Fix a crash in Sametime when a malicious server sends us an abnormally
+ long user ID. (CVE-2013-0273)
+
+ Yahoo!:
+ * Fix a double-free in profile/picture loading code. (Mihai Serban)
+ (#15053)
+ * Fix retrieving server-side buddy aliases. (Catalin Salgu) (#15381)
+
+ Plugins:
+ * The Voice/Video Settings plugin supports using the sndio GStreamer
+ backends. (Brad Smith) (#14414)
+ * Fix a crash in the Contact Availability Detection plugin. (Mark)
+ (#15327)
+ * Make the Message Notification plugin more friendly to non-X11 GTK+,
+ such as MacPorts' +no_x11 variant.
+
+ Windows-Specific Changes:
+ * Compile with secure flags (Jurre van Bergen) (#15290)
+ * Installer downloads GTK+ Runtime and Debug Symbols more securely.
+ Thanks goes to Jacob Appelbaum of the Tor Project for identifying
+ this issue and suggesting solutions. (#15277)
+ * Updates to a number of dependencies, some of which have security
+ related fixes. Thanks again to Jacob Appelbaum and Jurre van Bergen
+ for identifying the vulnerable libraries and to Dieter Verfaillie
+ for helping getting the libraries updated. (#14571, #15285, #15286)
+ * ATK 1.32.0-2
+ * Cyrus SASL 2.1.25
+ * expat 2.1.0-1
+ * freetype 2.4.10-1
+ * gettext 0.18.1.1-2
+ * Glib 2.28.8-1
+ * libpng 1.4.12-1
+ * libxml2 2.9.0-1
+ * NSS 3.13.6 and NSPR 4.9.2
+ * Pango 1.29.4-1
+ * SILC 1.1.10
+ * zlib 1.2.5-2
+ * Patch libmeanwhile (sametime library) to fix crash. (Jonathan Rice)
+ (#12637)
+
version 2.10.6 (07/06/2012):
Pidgin:
* Fix a bug that requires a triple-click to open a conversation
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,5 +1,8 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+version 2.10.8:
+ * No changes
+
version 2.10.7:
* No changes
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = \
HACKING \
Makefile.mingw \
PLUGIN_HOWTO \
- README.MTN \
+ README.hg \
README.mingw \
config.h.mingw \
doxy2devhelp.xsl \
@@ -56,13 +56,13 @@ version-check:
# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
test "x`hg st -mard`" = x
-packages:
+sign-packages: dist
gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz
gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2
gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
-release: commit-check version-check distcheck packages
+release: commit-check version-check distcheck sign-packages
if INSTALL_I18N
PO_DIR=po
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,11 +31,21 @@ awk 'BEGIN {FS="."} { \
exit; \
}' VERSION)
-GTK_INSTALL_VERSION = 2.16.6.0
+GTK_INSTALL_VERSION = 2.16.6.1
+
+authenticode_sign = $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "$(2)" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ $(1) && rm -f $(1).bak
+
+gpg_sign = $(GPG_SIGN) -ab $(1) && $(GPG_SIGN) --verify $(1).asc
STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
DEBUG_SYMBOLS_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-dbgsym
+PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pidgin-inst-deps-20130214"
# Any *.dll or *.exe files included in win32-install-dir that we don't compile
# should be included in this list so they don't get stripped
@@ -55,9 +65,9 @@ EXTERNAL_DLLS = \
libplc4.dll \
libplds4.dll \
libsasl.dll \
+ libssp-0.dll \
libxml2-2.dll \
nss3.dll \
- nssckbi.dll \
nssutil3.dll \
saslANONYMOUS.dll \
saslCRAMMD5.dll \
@@ -66,7 +76,7 @@ EXTERNAL_DLLS = \
saslLOGIN.dll \
saslPLAIN.dll \
libsilc-1-1-2.dll \
- libsilcclient-1-1-2.dll \
+ libsilcclient-1-1-3.dll \
smime3.dll \
softokn3.dll \
sqlite3.dll \
@@ -77,7 +87,7 @@ EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o
include $(PIDGIN_COMMON_RULES)
-.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT)
+.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) gtk_runtime_zip
all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
@@ -98,12 +108,13 @@ endif
cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
- cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
+ cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
+ cp $(GCC_SSP_TOP)/libssp-0.dll $(PIDGIN_INSTALL_DIR)
-pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
More information about the Commits
mailing list