aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-24 22:52:50 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-24 23:00:18 +0800
commiteaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1 (patch)
tree44e69a6ca52178357b32b407fc9425b77cf09b7f
parent7e6126e5936a049436b2c56a796279ed164c3595 (diff)
downloadgsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar.gz
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar.bz2
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar.lz
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar.xz
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.tar.zst
gsoc2013-empathy-eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1.zip
prepare 3.2.1.1EMPATHY_3_2_1_1
-rw-r--r--NEWS20
-rw-r--r--configure.ac4
2 files changed, 22 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c805e6f4f..27e1eb513 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+NEW in 3.2.1.1 (24/10/2011)
+==============
+
+This releases fixes a bug allowing a remote contact to inject HTML in a
+chat window which is using an Adium theme (CVE-2011-3635). We stronly recommend distributions
+to update to this version or at least patch for this bug:
+http://bugzilla-attachments.gnome.org/attachment.cgi?id=199797
+
+Bugs fixed:
+ - Fixed #662035, HTML injection in nicknames (Guillaume Desmottes)
+ - Fixed #662211, contact_list_store_contact_active_cb may be called after the destruction of the store (Guillaume Desmottes)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated pt_BR Translation (Djavan Fagundes)
+
+Documentation translations:
+ - Updated hu Documentation translation (Gabor Kelemen)
+
NEW in 3.2.1 (17/10/2011)
============
diff --git a/configure.ac b/configure.ac
index 7a18d8fed..f6cc44751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [2])
m4_define([empathy_micro_version], [1])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],