# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1479757614 -3600
# Node ID e20ac5fe419c3cd6b0dd369f0605cb055847888a
# Parent  6e1ead98930d7dd0a520ad17c720ae4908429033
Release 1.0.4

diff -r 6e1ead98930d -r e20ac5fe419c mcabber/ChangeLog
--- a/mcabber/ChangeLog	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/ChangeLog	Mon Nov 21 20:46:54 2016 +0100
@@ -1,3 +1,11 @@
+mcabber (1.0.4)
+
+ * Bugfix: Check the origin of roster pushes
+   Cf. Gajim's CVE-2015-8688 and
+   https://gultsch.de/gajim_roster_push_and_message_interception.html
+
+ -- Mikael, 2016-11-21
+
 mcabber (1.0.3)
 
  * Link with the tinfo library
diff -r 6e1ead98930d -r e20ac5fe419c mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/ChangeLog.api	Mon Nov 21 20:46:54 2016 +0100
@@ -1,5 +1,6 @@
 dev (41)
 
+ * Stable api 1.0.4:1
  * Stable api 1.0.3:1
  * Stable api 1.0.2:1
  * Stable api 1.0.1:1
diff -r 6e1ead98930d -r e20ac5fe419c mcabber/configure.ac
--- a/mcabber/configure.ac	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/configure.ac	Mon Nov 21 20:46:54 2016 +0100
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[1.0.3],[mcabber@lilotux.net])
+AC_INIT([mcabber],[1.0.4],[mcabber@lilotux.net])
 XC_AUTOMAKE
 AC_CONFIG_SRCDIR([mcabber])
 AC_CONFIG_HEADERS([mcabber/config.h])
@@ -297,7 +297,7 @@
 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
 
 # Prepare some config.h variables
-AC_DEFINE([MCABBER_BRANCH], "1.0.3", [Mcabber branch])
+AC_DEFINE([MCABBER_BRANCH], "1.0.4", [Mcabber branch])
 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
 # We need _GNU_SOURCE for strptime() and strcasestr()
diff -r 6e1ead98930d -r e20ac5fe419c mcabber/doc/mcabber.1
--- a/mcabber/doc/mcabber.1	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/doc/mcabber.1	Mon Nov 21 20:46:54 2016 +0100
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 09/18/2016
 .\"    Manual: \ \&
-.\"    Source: \ \& 1.0.3
+.\"    Source: \ \& 1.0.4
 .\"  Language: English
 .\"
-.TH "MCABBER" "1" "09/18/2016" "\ \& 1\&.0\&.3\" "\ \&"
+.TH "MCABBER" "1" "11/21/2016" "\ \& 1\&.0\&.4\" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -r 6e1ead98930d -r e20ac5fe419c mcabber/doc/mcabber.1.html
--- a/mcabber/doc/mcabber.1.html	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/doc/mcabber.1.html	Mon Nov 21 20:46:54 2016 +0100
@@ -2616,8 +2616,8 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 1.0.3<br />
-Last updated 2016-09-17 10:08:00 CEST
+Version 1.0.4<br />
+Last updated 2016-11-21 10:08:00 CEST
 </div>
 </div>
 </body>
diff -r 6e1ead98930d -r e20ac5fe419c mcabber/doc/mcabber.1.txt
--- a/mcabber/doc/mcabber.1.txt	Mon Nov 21 20:35:28 2016 +0100
+++ b/mcabber/doc/mcabber.1.txt	Mon Nov 21 20:46:54 2016 +0100
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v1.0.3, September 2016
+v1.0.4, November 2016
 
 NAME
 ----