/soc/2013/ankitkv/gobjectification: 96b5ab42da00: Merged default...

Ankit Vani a at nevitus.org
Wed Nov 26 05:58:26 EST 2014


Changeset: 96b5ab42da00af7551639cff4856196586f3bb51
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-11-26 16:01 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/96b5ab42da00

Description:

Merged default branch

diffstat:

 .hgignore                                     |      7 +-
 .hgtags                                       |      2 +
 COPYRIGHT                                     |      2 +
 ChangeLog                                     |     52 +-
 ChangeLog.API                                 |      9 +
 Makefile.am                                   |     20 +-
 configure.ac                                  |     14 +-
 doc/reference/finch/Makefile.am               |      3 +-
 libpurple/Makefile.am                         |     12 +-
 libpurple/certificate.c                       |     34 +-
 libpurple/certificate.h                       |     41 +
 libpurple/circularbuffer.c                    |      4 +-
 libpurple/gconf/Makefile.am                   |      2 +
 libpurple/gconf/purple.schemas.in             |      0 
 libpurple/purple-3-uninstalled.pc.in          |      0 
 libpurple/purple-3.pc.in                      |      0 
 libpurple/media/enum-types.c                  |      2 +-
 libpurple/mediamanager.c                      |     11 +-
 libpurple/pluginpref.c                        |     11 +-
 libpurple/plugins/signals-test.c              |      4 +-
 libpurple/plugins/ssl/Makefile.am             |      8 +-
 libpurple/plugins/ssl/Makefile.mingw          |     13 +-
 libpurple/plugins/ssl/nss-prefs.c             |    533 +
 libpurple/plugins/ssl/ssl-gnutls.c            |     62 +-
 libpurple/plugins/ssl/ssl-nss.c               |    232 +-
 libpurple/protocols/gg/edisc.c                |      6 +-
 libpurple/protocols/gg/lib/config.h           |      2 +-
 libpurple/protocols/gg/lib/network.h          |      4 +
 libpurple/protocols/gg/lib/protobuf-c.c       |      4 +
 libpurple/protocols/gg/libgaduw.c             |      8 +
 libpurple/protocols/irc/irc.c                 |      6 +-
 libpurple/protocols/jabber/jutil.c            |      6 +-
 libpurple/protocols/msn/contact.c             |     19 +-
 libpurple/protocols/msn/contact.h             |      3 +-
 libpurple/protocols/msn/msn.c                 |      3 +-
 libpurple/protocols/msn/notification.c        |      9 +
 libpurple/protocols/msn/session.c             |      6 +-
 libpurple/protocols/msn/soap.c                |      1 +
 libpurple/protocols/mxit/markup.c             |     45 +-
 libpurple/protocols/novell/nmevent.c          |     29 +-
 libpurple/upnp.c                              |      2 +-
 libpurple/util.c                              |      3 +-
 libpurple/xfer.c                              |      2 +-
 pidgin/Makefile.am                            |     34 +-
 pidgin/pidgin-3-uninstalled.pc.in             |      0 
 pidgin/pidgin-3.pc.in                         |      0 
 pidgin/data/pidgin.appdata.xml.in             |     29 +
 pidgin.desktop.in.in                          |      0 
 pidgin/gtk3compat.h                           |     84 +-
 pidgin/gtkconv.c                              |     24 +-
 pidgin/gtkdebug.c                             |     17 +-
 pidgin/gtkdialogs.c                           |     11 +-
 pidgin/gtkplugin.c                            |      8 +-
 pidgin/gtkpounce.c                            |    128 +-
 pidgin/gtkprefs.c                             |     40 +-
 pidgin/gtkprivacy.c                           |      2 +-
 pidgin/gtkrequest.c                           |     79 +-
 pidgin/gtkxfer.c                              |     45 +-
 pidgin/plugins/spellchk.c                     |      2 +-
 pidgin/win32/nsis/create_nsis_translations.pl |     24 +-
 pidgin/win32/nsis/pidgin-installer.nsi        |      1 +
 pidgin/win32/untar.c                          |     58 +-
 po/POTFILES.in                                |      6 +-
 po/POTFILES.skip                              |      2 +-
 po/ku_IQ.po                                   |  14265 ++++++++++++++++++++++++
 65 files changed, 15748 insertions(+), 347 deletions(-)

diffs (truncated from 17573 to 300 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -75,7 +75,7 @@ libpurple/dbus-signals.c
 libpurple/dbus-types.[ch]
 libpurple/enums.[ch]
 libpurple/example/nullclient
-libpurple/gconf/purple.schemas$
+libpurple/data/gconf/purple.schemas$
 libpurple/marshallers.[ch]
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL$
@@ -113,10 +113,11 @@ pidgin-.*.tar.bz2
 pidgin-.*.tar.gz
 pidgin-[0-9a-z.-]+/
 pidgin.apspec$
-pidgin.desktop$
-pidgin.desktop.in$
 pidgin/.*\.html\.h$
 pidgin/pidgin$
+pidgin/data/pidgin.appdata.xml$
+pidgin/data/pidgin.desktop$
+pidgin/data/pidgin.desktop.in$
 pidgin/pixmaps/emotes/default/24/theme
 pidgin/pixmaps/emotes/none/theme
 pidgin/pixmaps/emotes/small/16/theme
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -89,3 +89,5 @@ 4992bd90d8ad78ebdd324dd90d3e9d443f7dd002
 ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
 5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
 9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
+b7fedd2a570b760f252cf8a65a584137ab0af2cb v2.10.10
+e38a9aa5b1f8d25c58a0a7da05b386f265cba6e3 v2.10.11
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,6 +21,7 @@ Mark
 Saleem Abdulrasool
 Jakub Adam
 Dave Ahlswede
+Haval A. Ahmed
 Thijs Alkemade
 Manuel Amador
 Matt Amato
@@ -164,6 +165,7 @@ William Ehlhardt
 Markus Elfring
 Nelson Elhage
 Ignacio J. Elia
+Kai Engert
 Brian Enigma
 Mattias Eriksson
 Pat Erley
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,16 +92,45 @@ 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.10 (?/?/?):
+version 2.10.11 (11/23/14):
 	General:
-	* Allow and prefer TLS 1.2 and 1.1 when using libnss. (Elrond and
-	  Ashish Gupta) (#15909)
+	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
+	  plugin (#16412)
+	* Improve default cipher suites used with the NSS plugin (#16262)
+	* Add NSS Preferences plugin which allows the SSL/TLS Versions and
+	  cipher suites to be configured (#8061)
+
+	Gadu-Gadu:
+	* Fix a bug that prevented plugin to load when compiled without GnuTLS.
+	  (mancha) (#16431)
+	* Fix build for platforms without AF_LOCAL definition. (#16404)
+
+	MSN:
+	* Fix broken login due to server change (dx, TReKiE). (#16451, #16455)
+	* Fail early when buddy list is unavailable instead of wasting bandwidth
+	  endlessly re-trying.
+
+version 2.10.10 (10/22/14):
+	General:
+	* Check the basic constraints extension when validating SSL/TLS
+	  certificates. This fixes a security hole that allowed a malicious
+	  man-in-the-middle to impersonate an IM server or any other https
+	  endpoint. This affected both the NSS and GnuTLS plugins. (Discovered
+	  by an anonymous person and Jacob Appelbaum of the Tor Project, with
+	  thanks to Moxie Marlinspike for first publishing about this type of
+	  vulnerability. Thanks to Kai Engert for guidance and for some of the
+	  NSS changes) (CVE-2014-3694)
+	* Allow and prefer TLS 1.2 and 1.1 when using the NSS plugin for SSL.
+	  (Elrond and Ashish Gupta) (#15909)
 
 	libpurple3 compatibility:
 	* Encrypted account passwords are preserved until the new one is set.
 	* Fix loading Google Talk and Facebook XMPP accounts.
 
 	Windows-Specific Changes:
+	* Don't allow overwriting arbitrary files on the file system when the
+	  user installs a smiley theme via drag-and-drop. (Discovered by Yves
+	  Younan of Cisco Talos) (CVE-2014-3697)
 	* Updates to dependencies:
 		* NSS 3.17.1 and NSPR 4.10.7
 
@@ -111,11 +140,26 @@ version 2.10.10 (?/?/?):
 	Gadu-Gadu:
 	* Updated internal libgadu to version 1.12.0.
 
+	Groupwise:
+	* Fix potential remote crash parsing server message that indicates that
+	  a large amount of memory should be allocated. (Discovered by Yves Younan
+	  and Richard Johnson of Cisco Talos) (CVE-2014-3696)
+
 	IRC:
 	* Fix a possible leak of unencrypted data when using /me command
 	  with OTR. (Thijs Alkemade) (#15750)
 
+	MXit:
+	* Fix potential remote crash parsing a malformed emoticon response.
+	  (Discovered by Yves Younan and Richard Johnson of Cisco Talos)
+	  (CVE-2014-3695)
+
 	XMPP:
+	* Fix potential information leak where a malicious XMPP server and
+	  possibly even a malicious remote user could create a carefully crafted
+	  XMPP message that causes libpurple to send an XMPP message containing
+	  arbitrary memory. (Discovered and fixed by Thijs Alkemade and Paul
+	  Aurich) (CVE-2014-3698)
 	* Fix Facebook XMPP roster quirks. (#15041, #15957)
 
 	Yahoo:
@@ -1541,7 +1585,7 @@ version 2.6.4 (11/29/2009):
 	Finch:
 	* The TinyURL plugin now creates shorter URLs for long non-conversation
 	  URLs, e.g. URLs to open Inbox in Yahoo/MSN protocols, or the Yahoo
-	  CAPTCHA when joining chat rooms.
+	  Captcha when joining chat rooms.
 	* Fix displaying umlauts etc. in non-utf8 locale (fix in libgnt).
 
 	Pidgin:
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -626,6 +626,15 @@ version 3.0.0 (??/??/????):
 		* _GntTreeColumnFlag
 		* _GntWidgetFlags
 
+version 2.10.12:
+	* No changes
+
+version 2.10.11:
+	* No changes
+
+version 2.10.10:
+	* No changes
+
 version 2.10.9:
 	* No changes
 
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST = \
 		m4macros/introspection.m4 \
 		package_revision.h \
 		pidgin.apspec.in \
-		pidgin.desktop.in \
 		po/Makefile.mingw \
 		valgrind-suppressions
 
@@ -84,20 +83,7 @@ release: commit-check version-check dist
 
 if INSTALL_I18N
 PO_DIR=po
-DESKTOP_FILE=pidgin.desktop
-
-if ENABLE_GTK
-appsdir = $(datadir)/applications
-apps_in_files = pidgin.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-
-# silenced INTLTOOL_DESKTOP_RULE
-%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
-	$(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
-
-endif #ENABLE_GTK
-
-endif #INSTALL_I18N
+endif
 
 if ENABLE_GTK
 GTK_DIR=pidgin
@@ -158,5 +144,5 @@ SUBDIRS = . m4macros libpurple $(GNT_DIR
 distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
 
-DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
-			intltool-merge intltool-update package_revision_raw.txt
+DISTCLEANFILES= intltool-extract intltool-merge intltool-update \
+			package_revision_raw.txt
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -449,7 +449,7 @@ if test x$enable_i18n = xyes; then
 	GETTEXT_PACKAGE=pidgin
 	AC_SUBST(GETTEXT_PACKAGE)
 
-	ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku lt lv mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr tt uk ur vi xh zh_CN zh_HK zh_TW"
+	ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku ku_IQ lt lv mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr tt uk ur vi xh zh_CN zh_HK zh_TW"
 	AM_GLIB_GNU_GETTEXT
 
 	dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -2713,8 +2713,9 @@ AC_CONFIG_FILES([Makefile
 		   m4macros/Makefile
 		   pidgin.apspec
 		   pidgin/Makefile
-		   pidgin/pidgin-3.pc
-		   pidgin/pidgin-3-uninstalled.pc
+		   pidgin/data/pidgin.desktop.in
+		   pidgin/data/pidgin-3.pc
+		   pidgin/data/pidgin-3-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/small/16/Makefile
@@ -2730,10 +2731,10 @@ AC_CONFIG_FILES([Makefile
 		   pidgin/themes/Makefile
 		   pidgin/win32/pidgin_dll_rc.rc
 		   pidgin/win32/pidgin_exe_rc.rc
+		   libpurple/data/gconf/Makefile
+		   libpurple/data/purple-3.pc
+		   libpurple/data/purple-3-uninstalled.pc
 		   libpurple/example/Makefile
-		   libpurple/gconf/Makefile
-		   libpurple/purple-3.pc
-		   libpurple/purple-3-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/keyrings/Makefile
 		   libpurple/plugins/ssl/Makefile
@@ -2769,7 +2770,6 @@ AC_CONFIG_FILES([Makefile
 		   finch/libgnt/wms/Makefile
 		   finch/plugins/Makefile
 		   po/Makefile.in
-		   pidgin.desktop.in
 		  ])
 AC_OUTPUT
 
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -110,7 +110,8 @@ GTKDOC_LIBS = \
 	$(LIBXML_LIBS) \
 	$(GNT_LIBS) \
 	$(GSTREAMER_LIBS) \
-	$(INTROSPECTION_LIBS)
+	$(INTROSPECTION_LIBS) \
+	$(top_builddir)/finch/libgnt/libgnt.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -12,11 +12,11 @@ EXTRA_DIST = \
 		purple-send-async \
 		purple-url-handler \
 		purple.h.in \
-		purple-3.pc.in \
-		purple-3-uninstalled.pc.in \
 		tag.sh \
 		version.h.in \
 		Makefile.mingw \
+		data/purple-3.pc.in \
+		data/purple-3-uninstalled.pc.in \
 		win32/global.mak \
 		win32/libc_interface.c \
 		win32/libc_interface.h \
@@ -30,12 +30,9 @@ EXTRA_DIST = \
 		win32/win32dep.h
 
 if USE_GCONFTOOL
-GCONF_DIR=gconf
+GCONF_DIR=data/gconf
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = purple-3.pc
-
 SUBDIRS = $(GCONF_DIR) . plugins protocols tests example
 
 purple_coresources = \
@@ -408,6 +405,9 @@ mediaincludedir=$(includedir)/libpurple/
 mediainclude_HEADERS = \
 	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/purple-3.pc
+
 libpurple_la_DEPENDENCIES = \



More information about the Commits mailing list