Hello community,
here is the log from the commit of package mcabber for openSUSE:Factory checked in at 2016-03-04 19:30:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mcabber (Old)
and /work/SRC/openSUSE:Factory/.mcabber.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mcabber"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mcabber/mcabber.changes 2016-02-17 12:15:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mcabber.new/mcabber.changes 2016-03-04 19:30:38.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 4 07:46:25 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 1.0.2:
+ * Compatible with Loudmouth >=1.5.3 with SHA256 support.
+ * Ignore the untrusted certificate warning when user sets a
+ fingerprint.
+ * Stop HTML-escaping OTR messages – only strip known tags.
+ * Read $HOME/.mcabberrc if there is no mcabber configuration
+ directory.
+ * Minor documentation updates.
+
+-------------------------------------------------------------------
Old:
----
mcabber-1.0.1.tar.bz2
mcabber-1.0.1.tar.bz2.asc
New:
----
mcabber-1.0.2.tar.bz2
mcabber-1.0.2.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mcabber.spec ++++++
--- /var/tmp/diff_new_pack.1oB7RH/_old 2016-03-04 19:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.1oB7RH/_new 2016-03-04 19:30:39.000000000 +0100
@@ -17,7 +17,7 @@
Name: mcabber
-Version: 1.0.1
+Version: 1.0.2
Release: 0
Summary: Modular XMPP client on ncurses
License: GPL-2.0+
++++++ mcabber-1.0.1.tar.bz2 -> mcabber-1.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/COPYING new/mcabber-1.0.2/COPYING
--- old/mcabber-1.0.1/COPYING 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/COPYING 2016-02-27 13:41:08.000000000 +0100
@@ -2,15 +2,15 @@
to be linked to OpenSSL without invoking GPL clause 2(b).
----------------------------------------------------------------------
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -19,7 +19,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -59,8 +59,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -114,7 +114,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -172,7 +172,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -229,7 +229,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -259,7 +259,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -281,9 +281,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -307,17 +307,16 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -340,5 +339,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/ChangeLog new/mcabber-1.0.2/ChangeLog
--- old/mcabber-1.0.1/ChangeLog 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/ChangeLog 2016-02-27 13:41:08.000000000 +0100
@@ -1,3 +1,14 @@
+mcabber (1.0.2)
+
+ * Compatible with Loudmouth >=1.5.3 with SHA256 support (Frank Zschockelt)
+ * Ignore the untrusted certificate warning when user sets a fingerprint
+ (Frank Zschockelt)
+ * Stop HTML-escaping OTR messages - only strip known tags (Frank Zschockelt)
+ * Read $HOME/.mcabberrc if there is no mcabber configuration directory
+ * Minor documentation updates
+
+ -- Mikael, 2016-02-27
+
mcabber (1.0.1)
* [PGP] Improved PGP-encryption support
@@ -5,7 +16,8 @@
* [PGP] Encrypt messages with our own PGP key and decrypt our own
encrypted messages when Carbons are enabled
* [PGP] New PGP options: 'gpg_path' and 'gpg_home' (Holger Weiß)
- * [PGP] Check all signatures and stop immediately if one could be verified (Sven Gaerner)
+ * [PGP] Check all signatures and stop immediately if one could be verified
+ (Sven Gaerner)
* Improved Carbons support (Holger Weiß)
* New option: 'clear_unread_on_carbon' (Holger Weiß)
* Improve SSL fingerprint management;
@@ -53,7 +65,8 @@
- "ssl_ca" to set additional trusted certificates
* Fix compilation for old loudmouth libraries (Frank Zschockelt)
* Add 'color_timestamp' to highlight timestamp added by server (Hermitifier)
- * New python based event script using OS X 10.8 notification center (Sharoon Thomas)
+ * New python based event script using OS X 10.8 notification center (Sharoon
+ Thomas)
* Handle SIGHUP signal (Dominik George)
* Misc. bugfixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/ChangeLog.api new/mcabber-1.0.2/ChangeLog.api
--- old/mcabber-1.0.1/ChangeLog.api 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/ChangeLog.api 2016-02-27 13:41:08.000000000 +0100
@@ -1,5 +1,6 @@
dev (41)
+ * Stable api 1.0.2:1
* Stable api 1.0.1:1
* Change prototype of otr_send()
* Changeset 0c78d31c753d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/Makefile.in new/mcabber-1.0.2/Makefile.in
--- old/mcabber-1.0.1/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -289,6 +289,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/configure new/mcabber-1.0.2/configure
--- old/mcabber-1.0.1/configure 2016-01-27 10:37:56.000000000 +0100
+++ new/mcabber-1.0.2/configure 2016-02-27 13:41:16.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mcabber 1.0.1.
+# Generated by GNU Autoconf 2.69 for mcabber 1.0.2.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mcabber'
PACKAGE_TARNAME='mcabber'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='mcabber 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='mcabber 1.0.2'
PACKAGE_BUGREPORT='mcabber@lilotux.net'
PACKAGE_URL=''
@@ -652,6 +652,8 @@
GPGME_CONFIG
LIBIDN_LIBS
LIBIDN_CFLAGS
+LOUDMOUTH_SHA256_LIBS
+LOUDMOUTH_SHA256_CFLAGS
LOUDMOUTH_LIBS
LOUDMOUTH_CFLAGS
GLIB_COMPILE_RESOURCES
@@ -817,6 +819,8 @@
PKG_CONFIG_LIBDIR
LOUDMOUTH_CFLAGS
LOUDMOUTH_LIBS
+LOUDMOUTH_SHA256_CFLAGS
+LOUDMOUTH_SHA256_LIBS
LIBIDN_CFLAGS
LIBIDN_LIBS
ENCHANT_CFLAGS
@@ -1361,7 +1365,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mcabber 1.0.1 to adapt to many kinds of systems.
+\`configure' configures mcabber 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1431,7 +1435,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mcabber 1.0.1:";;
+ short | recursive ) echo "Configuration of mcabber 1.0.2:";;
esac
cat <<\_ACEOF
@@ -1492,6 +1496,10 @@
C compiler flags for LOUDMOUTH, overriding pkg-config
LOUDMOUTH_LIBS
linker flags for LOUDMOUTH, overriding pkg-config
+ LOUDMOUTH_SHA256_CFLAGS
+ C compiler flags for LOUDMOUTH_SHA256, overriding pkg-config
+ LOUDMOUTH_SHA256_LIBS
+ linker flags for LOUDMOUTH_SHA256, overriding pkg-config
LIBIDN_CFLAGS
C compiler flags for LIBIDN, overriding pkg-config
LIBIDN_LIBS linker flags for LIBIDN, overriding pkg-config
@@ -1566,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mcabber configure 1.0.1
+mcabber configure 1.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2092,7 +2100,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mcabber $as_me 1.0.1, which was
+It was created by mcabber $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2959,7 +2967,7 @@
# Define the identity of the package.
PACKAGE='mcabber'
- VERSION='1.0.1'
+ VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -15507,6 +15515,81 @@
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOUDMOUTH_SHA256" >&5
+$as_echo_n "checking for LOUDMOUTH_SHA256... " >&6; }
+
+if test -n "$LOUDMOUTH_SHA256_CFLAGS"; then
+ pkg_cv_LOUDMOUTH_SHA256_CFLAGS="$LOUDMOUTH_SHA256_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.5.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.5.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LOUDMOUTH_SHA256_CFLAGS=`$PKG_CONFIG --cflags "loudmouth-1.0 >= 1.5.3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LOUDMOUTH_SHA256_LIBS"; then
+ pkg_cv_LOUDMOUTH_SHA256_LIBS="$LOUDMOUTH_SHA256_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"loudmouth-1.0 >= 1.5.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "loudmouth-1.0 >= 1.5.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LOUDMOUTH_SHA256_LIBS=`$PKG_CONFIG --libs "loudmouth-1.0 >= 1.5.3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LOUDMOUTH_SHA256_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "loudmouth-1.0 >= 1.5.3" 2>&1`
+ else
+ LOUDMOUTH_SHA256_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "loudmouth-1.0 >= 1.5.3" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LOUDMOUTH_SHA256_PKG_ERRORS" >&5
+
+
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+else
+ LOUDMOUTH_SHA256_CFLAGS=$pkg_cv_LOUDMOUTH_SHA256_CFLAGS
+ LOUDMOUTH_SHA256_LIBS=$pkg_cv_LOUDMOUTH_SHA256_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define LOUDMOUTH_USES_SHA256 1" >>confdefs.h
+
+fi
+
# Check for lm_ssl_set_cipher_list in loudmouth
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lm_ssl_set_cipher_list in -lloudmouth-1" >&5
$as_echo_n "checking for lm_ssl_set_cipher_list in -lloudmouth-1... " >&6; }
@@ -16496,10 +16579,10 @@
# Prepare some config.h variables
-$as_echo "#define MCABBER_BRANCH \"1.0.1\"" >>confdefs.h
+$as_echo "#define MCABBER_BRANCH \"1.0.2\"" >>confdefs.h
-$as_echo "#define MCABBER_VERSION \"1.0.1\"" >>confdefs.h
+$as_echo "#define MCABBER_VERSION \"1.0.2\"" >>confdefs.h
# We need _GNU_SOURCE for strptime() and strcasestr()
@@ -17053,7 +17136,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mcabber $as_me 1.0.1, which was
+This file was extended by mcabber $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17119,7 +17202,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mcabber config.status 1.0.1
+mcabber config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/configure.ac new/mcabber-1.0.2/configure.ac
--- old/mcabber-1.0.1/configure.ac 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/configure.ac 2016-02-27 13:41:08.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([mcabber],[1.0.1],[mcabber@lilotux.net])
+AC_INIT([mcabber],[1.0.2],[mcabber@lilotux.net])
XC_AUTOMAKE
AC_CONFIG_SRCDIR([mcabber])
AC_CONFIG_HEADERS([mcabber/config.h])
@@ -156,6 +156,12 @@
# Check for loudmouth
PKG_CHECK_MODULES(LOUDMOUTH, loudmouth-1.0 >= 1.4.2)
+PKG_CHECK_MODULES(LOUDMOUTH_SHA256, [loudmouth-1.0 >= 1.5.3],
+ AC_DEFINE([LOUDMOUTH_USES_SHA256], 1,
+ [loudmouth is now using a new digest]
+ ),
+ []
+ )
# Check for lm_ssl_set_cipher_list in loudmouth
AC_CHECK_LIB(loudmouth-1, lm_ssl_set_cipher_list,
@@ -287,7 +293,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
# Prepare some config.h variables
-AC_DEFINE([MCABBER_BRANCH], "1.0.1", [Mcabber branch])
+AC_DEFINE([MCABBER_BRANCH], "1.0.2", [Mcabber branch])
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/Makefile.in new/mcabber-1.0.2/doc/Makefile.in
--- old/mcabber-1.0.1/doc/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/doc/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -266,6 +266,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/guide/Makefile.in new/mcabber-1.0.2/doc/guide/Makefile.in
--- old/mcabber-1.0.1/doc/guide/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/doc/guide/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -175,6 +175,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/help/Makefile.in new/mcabber-1.0.2/doc/help/Makefile.in
--- old/mcabber-1.0.1/doc/help/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/doc/help/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -175,6 +175,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/mcabber.1 new/mcabber-1.0.2/doc/mcabber.1
--- old/mcabber-1.0.1/doc/mcabber.1 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/doc/mcabber.1 2016-02-27 13:41:08.000000000 +0100
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
.\" Date: 03/19/2011
.\" Manual: \ \&
-.\" Source: \ \& 1.0.1
+.\" Source: \ \& 1.0.2
.\" Language: English
.\"
-.TH "MCABBER" "1" "03/19/2011" "\ \& 1\&.0\&.1\" "\ \&"
+.TH "MCABBER" "1" "02/27/2016" "\ \& 1\&.0\&.2\" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -1418,7 +1418,7 @@
\m[blue]\fBMCabber MUC room\fR\m[]\&\s-2\u[4]\d\s+2
.SH "COPYING"
.sp
-Copyright (C) 2005\-2014 Mikael Berthe and others\&.
+Copyright (C) 2005\-2016 Mikael Berthe and others\&.
.sp
Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
.SH "NOTES"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/mcabber.1.html new/mcabber-1.0.2/doc/mcabber.1.html
--- old/mcabber-1.0.1/doc/mcabber.1.html 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/doc/mcabber.1.html 2016-02-27 13:41:08.000000000 +0100
@@ -2608,7 +2608,7 @@
</div>
<h2 id="_copying">COPYING</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2005-2014 Mikael Berthe and others.<br /></p></div>
+<div class="paragraph"><p>Copyright (C) 2005-2016 Mikael Berthe and others.<br /></p></div>
<div class="paragraph"><p>Free use of this software is granted under the terms of the GNU General Public
License (GPL).</p></div>
</div>
@@ -2616,7 +2616,7 @@
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Version 1.0.1<br />
+Version 1.0.2<br />
Last updated 2011-03-19 13:18:41 CEST
</div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/doc/mcabber.1.txt new/mcabber-1.0.2/doc/mcabber.1.txt
--- old/mcabber-1.0.1/doc/mcabber.1.txt 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/doc/mcabber.1.txt 2016-02-27 13:41:08.000000000 +0100
@@ -1,7 +1,7 @@
MCABBER(1)
===========
Mikael BERTHE
-v1.0.1, January 2016
+v1.0.2, February 2016
NAME
----
@@ -543,7 +543,7 @@
COPYING
-------
-Copyright \(C) 2005-2014 Mikael Berthe and others. +
+Copyright \(C) 2005-2016 Mikael Berthe and others. +
Free use of this software is granted under the terms of the GNU General Public
License (GPL).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/Makefile.in new/mcabber-1.0.2/mcabber/Makefile.in
--- old/mcabber-1.0.1/mcabber/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -294,6 +294,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/commands.c new/mcabber-1.0.2/mcabber/commands.c
--- old/mcabber-1.0.1/mcabber/commands.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/commands.c 2016-02-27 13:41:08.000000000 +0100
@@ -2832,7 +2832,7 @@
}
ra.type = type_role;
- ra.val.affil = role_none;
+ ra.val.role = role_none;
nick_utf8 = to_utf8(nick);
reason_utf8 = to_utf8(arg);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/config.h.in new/mcabber-1.0.2/mcabber/config.h.in
--- old/mcabber-1.0.1/mcabber/config.h.in 2016-01-27 10:37:56.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/config.h.in 2016-02-27 13:41:16.000000000 +0100
@@ -258,6 +258,9 @@
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
+/* loudmouth is now using a new digest */
+#undef LOUDMOUTH_USES_SHA256
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/histolog.c new/mcabber-1.0.2/mcabber/histolog.c
--- old/mcabber-1.0.1/mcabber/histolog.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/histolog.c 2016-02-27 13:41:08.000000000 +0100
@@ -372,40 +372,48 @@
UseFileLogging = enable;
FileLoadLogs = loadfiles;
- if (enable || loadfiles) {
- if (root_dir) {
- char *xp_root_dir;
- int l = strlen(root_dir);
- if (l < 1) {
- scr_LogPrint(LPRINT_LOGNORM, "Error: logging dir name too short");
- UseFileLogging = FileLoadLogs = FALSE;
- return;
- }
- xp_root_dir = expand_filename(root_dir);
- // RootDir must be slash-terminated
- if (root_dir[l-1] == '/') {
- RootDir = xp_root_dir;
- } else {
- RootDir = g_strdup_printf("%s/", xp_root_dir);
- g_free(xp_root_dir);
- }
+ g_free(RootDir);
+ RootDir = NULL;
+
+ if (!enable && !loadfiles)
+ return;
+
+ if (root_dir) {
+ char *xp_root_dir;
+ int l = strlen(root_dir);
+ if (l < 1) {
+ scr_LogPrint(LPRINT_LOGNORM, "Error: logging dir name too short");
+ UseFileLogging = FileLoadLogs = FALSE;
+ return;
+ }
+ xp_root_dir = expand_filename(root_dir);
+ // RootDir must be slash-terminated
+ if (root_dir[l-1] == '/') {
+ RootDir = xp_root_dir;
} else {
- const char *cfgdir = settings_get_mcabber_config_dir();
- const char *hdir = "/histo/";
- RootDir = g_strdup_printf("%s%s", cfgdir, hdir);
+ RootDir = g_strdup_printf("%s/", xp_root_dir);
+ g_free(xp_root_dir);
}
- // Check directory permissions (should not be readable by group/others)
- if (checkset_perm(RootDir, TRUE) == -1) {
- // The directory does not actually exists
- g_free(RootDir);
- RootDir = NULL;
- scr_LogPrint(LPRINT_LOGNORM, "ERROR: Cannot access "
- "history log directory, logging DISABLED");
+ } else {
+ const char *cfgdir = settings_get_mcabber_config_dir();
+ const char *hdir = "/histo/";
+ if (!cfgdir) {
+ scr_LogPrint(LPRINT_LOGNORM, "ERROR: Cannot find out "
+ "history log directory; logging DISABLED");
UseFileLogging = FileLoadLogs = FALSE;
+ return;
}
- } else { // Disable history logging
+ RootDir = g_strdup_printf("%s%s", cfgdir, hdir);
+ }
+
+ // Check directory permissions (should not be readable by group/others)
+ if (checkset_perm(RootDir, TRUE) == -1) {
+ // The directory does not actually exists
g_free(RootDir);
RootDir = NULL;
+ scr_LogPrint(LPRINT_LOGNORM, "ERROR: Cannot access "
+ "history log directory; logging DISABLED");
+ UseFileLogging = FileLoadLogs = FALSE;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/nohtml.c new/mcabber-1.0.2/mcabber/nohtml.c
--- old/mcabber-1.0.1/mcabber/nohtml.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/nohtml.c 2016-02-27 13:41:08.000000000 +0100
@@ -38,17 +38,15 @@
*/
char *html_strip(const char *htmlbuf)
{
- int i, j=0;
+ int i, j=0, html_len;
char *nohtml;
if (!htmlbuf) return(NULL);
nohtml = g_strdup(htmlbuf);
- if (!strchr(htmlbuf, '&') && !strchr(htmlbuf, '<'))
- return(nohtml);
-
- for (i = 0; i < (int)strlen(htmlbuf); i++) {
+ html_len = (int)strlen(htmlbuf);
+ for (i = 0; i < html_len; i++) {
if (htmlbuf[i] == '&') {
if (!strncmp(&htmlbuf[i],"&",5)) {
nohtml[j] = '&';
@@ -65,15 +63,26 @@
} else if (!strncmp(&htmlbuf[i],">", 4)) {
nohtml[j] = '>';
i += 3;
+ } else {
+ nohtml[j] = htmlbuf[i];
}
- } else if (!strncmp(&htmlbuf[i],"<br>", 4) ||
- !strncmp(&htmlbuf[i],"<br/>", 5)) {
- nohtml[j] = '\n';
- i += (htmlbuf[i+3] == '/' ? 4 : 3);
} else if (htmlbuf[i] == '<') {
- /* Let's strip all unknown tags */
- j--;
- while (htmlbuf[++i] != '>');
+ if (!strncmp(&htmlbuf[i],"<br>", 4)) {
+ nohtml[j] = '\n';
+ i += 3;
+ } else if (!strncmp(&htmlbuf[i],"<br/>", 5)) {
+ nohtml[j] = '\n';
+ i += 4;
+ } else if (!strncmp(&htmlbuf[i],"<FONT>", 6)) {
+ /* Let's strip <FONT> from Adium */
+ i += 5;
+ j--;
+ } else if (!strncmp(&htmlbuf[i],"</FONT>", 7)) {
+ i += 6;
+ j--;
+ } else {
+ nohtml[j] = htmlbuf[i];
+ }
} else
nohtml[j] = htmlbuf[i];
j++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/otr.c new/mcabber-1.0.2/mcabber/otr.c
--- old/mcabber-1.0.1/mcabber/otr.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/otr.c 2016-02-27 13:41:08.000000000 +0100
@@ -610,7 +610,7 @@
{
gcry_error_t err;
char *newmessage = NULL;
- char *htmlmsg, *rmsg;
+ char *rmsg;
ConnContext *ctx = otr_get_context(buddy);
if (!encryption_status)
@@ -633,18 +633,16 @@
NULL, NULL, NULL);
#endif
else {
- htmlmsg = html_escape(msg);
err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
#ifdef HAVE_LIBOTR3
- ctx->protocol, ctx->username, htmlmsg, NULL,
+ ctx->protocol, ctx->username, msg, NULL,
&newmessage, NULL, NULL);
#else
// INSTAG XXX
ctx->protocol, ctx->username, OTRL_INSTAG_BEST,
- htmlmsg, NULL, &newmessage, OTRL_FRAGMENT_SEND_SKIP,
+ msg, NULL, &newmessage, OTRL_FRAGMENT_SEND_SKIP,
NULL, NULL, NULL);
#endif
- g_free(htmlmsg);
}
if (err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/settings.c new/mcabber-1.0.2/mcabber/settings.c
--- old/mcabber-1.0.1/mcabber/settings.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/settings.c 2016-02-27 13:41:08.000000000 +0100
@@ -95,7 +95,7 @@
const gchar *settings_get_mcabber_config_dir(void)
{
static char *config_dir;
- char *home_dir;
+ const char *home_dir;
GString *sfilename;
FILE *fp;
@@ -150,16 +150,8 @@
}
}
- // Last guess: home directory itself...
- if (!config_dir) {
- g_string_printf(sfilename, "%s/.mcabberrc", home_dir);
- if ((fp = fopen(sfilename->str, "r")) != NULL) {
- fclose(fp);
- config_dir = g_strdup(home_dir);
- } else {
- scr_log_print(LPRINT_NORMAL, "Cannot find/open any configuration file!\n");
- }
- }
+ if (!config_dir)
+ scr_log_print(LPRINT_NORMAL, "Cannot find configuration directory!\n");
g_string_free(sfilename, TRUE);
return config_dir;
@@ -191,10 +183,19 @@
}
mcabber_conf_dir = settings_get_mcabber_config_dir();
- if (!mcabber_conf_dir)
- return -1;
+ if (!mcabber_conf_dir) {
+ // Try home directory
+ const char *home_dir = getenv("HOME");
+ if (!home_dir) {
+ scr_log_print(LPRINT_NORMAL, "Cannot find any configuration file!\n");
+ err = -1;
+ goto cfg_read_file_return;
+ }
+ def_filename = g_strdup_printf("%s/.mcabberrc", home_dir);
+ } else {
+ def_filename = g_strdup_printf("%s/mcabberrc", mcabber_conf_dir);
+ }
- def_filename = g_strdup_printf("%s/mcabberrc", mcabber_conf_dir);
if ((fp = fopen(def_filename, "r")) == NULL) {
fprintf(stderr, "Cannot open config file!\n");
g_free(def_filename);
@@ -205,8 +206,12 @@
// As it could contain sensitive data, we make it user-readable only.
checkset_perm(def_filename, TRUE);
scr_log_print(LPRINT_LOGNORM, "Reading %s", def_filename);
- // Check mcabber dir. Here we just warn, we don't change the modes.
- checkset_perm(mcabber_conf_dir, FALSE);
+
+ // Check mcabber directory permissions.
+ // Here we just warn, we don't change the mode.
+ if (mcabber_conf_dir)
+ checkset_perm(mcabber_conf_dir, FALSE);
+
g_free(def_filename);
} else {
// filename was specified
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/utils.c new/mcabber-1.0.2/mcabber/utils.c
--- old/mcabber-1.0.1/mcabber/utils.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/utils.c 2016-02-27 13:41:08.000000000 +0100
@@ -155,6 +155,7 @@
return g_strdup(fname);
}
+#ifndef LOUDMOUTH_USES_SHA256
// fingerprint_to_hex(fprstr, hex, fpr_len)
// Convert the binary fingerprint fprstr (which is fpr_len bytes long)
// to a NULL-terminated hexadecimal string hex.
@@ -199,6 +200,7 @@
}
return TRUE;
}
+#endif
static gboolean tracelog_create(void)
{
@@ -313,6 +315,8 @@
int fd;
struct stat buf;
+ if (!name) return -1;
+
#ifdef __CYGWIN__
// Permission checking isn't efficient on Cygwin
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/utils.h new/mcabber-1.0.2/mcabber/utils.h
--- old/mcabber-1.0.1/mcabber/utils.h 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/utils.h 2016-02-27 13:41:08.000000000 +0100
@@ -21,8 +21,10 @@
const char *resource);
gboolean jid_equal(const char *jid1, const char *jid2);
+#ifndef LOUDMOUTH_USES_SHA256
void fingerprint_to_hex(const char *fpr, char *hex, size_t fpr_len);
gboolean hex_to_fingerprint(const char *hex, char *fpr, size_t fpr_len);
+#endif
void ut_init_debug(void);
void ut_write_log(unsigned int flag, const char *data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabber/xmpp.c new/mcabber-1.0.2/mcabber/xmpp.c
--- old/mcabber-1.0.1/mcabber/xmpp.c 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabber/xmpp.c 2016-02-27 13:41:08.000000000 +0100
@@ -44,7 +44,9 @@
#define RECONNECTION_TIMEOUT 60L
-#define FINGERPRINT_LENGTH 16 // Currently Loudmouth only supports MD5
+#ifndef LOUDMOUTH_USES_SHA256
+#define FINGERPRINT_LENGTH 16 // old loudmouth still uses MD5 :(
+#endif
LmConnection* lconnection = NULL;
static guint AutoConnection;
@@ -711,6 +713,9 @@
break;
case LM_SSL_STATUS_UNTRUSTED_CERT:
scr_LogPrint(LPRINT_LOGNORM, "Certificate is not trusted!");
+ // The user specified a fingerprint, let's wait for lm to check that
+ if (settings_opt_get("ssl_fingerprint"))
+ return LM_SSL_RESPONSE_CONTINUE;
break;
case LM_SSL_STATUS_CERT_EXPIRED:
scr_LogPrint(LPRINT_LOGNORM, "Certificate has expired!");
@@ -723,13 +728,19 @@
"Certificate hostname does not match expected hostname!");
break;
case LM_SSL_STATUS_CERT_FINGERPRINT_MISMATCH: {
+#ifndef LOUDMOUTH_USES_SHA256
char fpr[3*FINGERPRINT_LENGTH] = {0};
fingerprint_to_hex(lm_ssl_get_fingerprint(ssl), fpr, FINGERPRINT_LENGTH);
+#endif
scr_LogPrint(LPRINT_LOGNORM,
"Certificate fingerprint does not match expected fingerprint!");
+#ifndef LOUDMOUTH_USES_SHA256
scr_LogPrint(LPRINT_LOGNORM, "Remote fingerprint: %s", fpr);
+#else
+ scr_LogPrint(LPRINT_LOGNORM, "Remote fingerprint: %s", lm_ssl_get_fingerprint(ssl));
+#endif
- scr_LogPrint(LPRINT_LOGNORM, "Expected fingerprint: %s",
+ scr_LogPrint(LPRINT_LOGNORM, "Expect fingerprint: %s",
settings_opt_get("ssl_fingerprint"));
return LM_SSL_RESPONSE_STOP;
@@ -752,10 +763,15 @@
{
LmSSL *lssl;
if ((lssl = lm_connection_get_ssl(connection)) != NULL) {
+#ifndef LOUDMOUTH_USES_SHA256
char fpr[3*FINGERPRINT_LENGTH] = {0};
fingerprint_to_hex(lm_ssl_get_fingerprint(lssl), fpr, FINGERPRINT_LENGTH);
scr_LogPrint(LPRINT_LOGNORM, "Connection established.\n"
"Remote fingerprint: %s", fpr);
+#else
+ scr_LogPrint(LPRINT_LOGNORM, "Connection established.\n"
+ "Remote fingerprint: %s", lm_ssl_get_fingerprint(lssl));
+#endif
}
if (success) {
@@ -1757,7 +1773,9 @@
{
const char *userjid, *password, *resource, *servername, *ssl_fpr;
char *dynresource = NULL;
+#ifndef LOUDMOUTH_USES_SHA256
char fpr[FINGERPRINT_LENGTH] = {0};
+#endif
const char *proxy_host;
const char *resource_prefix = PACKAGE_NAME;
char *fjid;
@@ -1902,6 +1920,7 @@
port = (ssl ? LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT);
lm_connection_set_port(lconnection, port);
+#ifndef LOUDMOUTH_USES_SHA256
if (ssl_fpr && (!hex_to_fingerprint(ssl_fpr, fpr, FINGERPRINT_LENGTH))) {
scr_LogPrint(LPRINT_LOGNORM, "** Please set the fingerprint in the format "
"97:5C:00:3F:1D:77:45:25:E2:C5:70:EC:83:C8:87:EE");
@@ -1909,6 +1928,9 @@
}
lssl = lm_ssl_new((ssl_fpr ? fpr : NULL), ssl_cb, NULL, NULL);
+#else
+ lssl = lm_ssl_new(ssl_fpr, ssl_cb, NULL, NULL);
+#endif
if (lssl) {
#ifdef HAVE_LM_SSL_CIPHER_LIST
const char *ssl_ciphers = settings_opt_get("ssl_ciphers");
@@ -1916,7 +1938,10 @@
#endif
#ifdef HAVE_LM_SSL_CA
const char *ssl_ca = settings_opt_get("ssl_ca");
+ char *ssl_ca_xp;
+ ssl_ca_xp = expand_filename(ssl_ca);
lm_ssl_set_ca(lssl, ssl_ca);
+ g_free(ssl_ca_xp);
#endif
lm_ssl_use_starttls(lssl, !ssl, tls);
lm_connection_set_ssl(lconnection, lssl);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/mcabberrc.example new/mcabber-1.0.2/mcabberrc.example
--- old/mcabber-1.0.1/mcabberrc.example 2016-01-27 10:36:25.000000000 +0100
+++ new/mcabber-1.0.2/mcabberrc.example 2016-02-27 13:41:08.000000000 +0100
@@ -48,13 +48,22 @@
# ssl to 1. It's not possible to use old-style SSL and TLS together.
#set ssl = 0
set tls = 1
+# It is possible to set the allowed ciphers which openssl/gnutls can use for
+# the encrypted connection.
+# openssl (get the name of the available ciphers via 'openssl ciphers'):
+#set ssl_ciphers = ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384
+# gnutls (check the priorities option of 'man gnutls_priority_init'):
+#set ssl_ciphers = PFS
+# If you'd like to explicitly specify trusted certificates, set the ssl_ca
+# option to a certificate file or path.
+#set ssl_ca = ~/.mcabber/trusted_cert.pem
# Moreover, it's possible to check whether the fingerprint of the
# ssl certificate matches ssl_fingerprint.
# You can get the fingerprint of your server either with gnutls or openssl:
# 1. gnutls-cli -p 5223 $your_server
-# 2. openssl s_client -connect $your_server:5223 | \
-# openssl x509 -fingerprint -md5 -noout
-#set ssl_fingerprint = 97:5C:00:3F:1D:77:45:25:E2:C5:70:EC:83:C8:87:EE
+# 2. openssl s_client -starttls xmpp -connect $yourserver:5222 | \
+# openssl x509 -fingerprint -sha256 -noout
+#set ssl_fingerprint = SHA256:647d2eef7f972001d4fe8b6bedb3007d095dcd982ebb6773c6fb74adb8cc27c0
# Set ssl_ignore_checks to 1 to disable all certificate checks except the
# fingerprint check.
#set ssl_ignore_checks = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/modules/Makefile.in new/mcabber-1.0.2/modules/Makefile.in
--- old/mcabber-1.0.1/modules/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/modules/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -235,6 +235,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/modules/beep/Makefile.in new/mcabber-1.0.2/modules/beep/Makefile.in
--- old/mcabber-1.0.1/modules/beep/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/modules/beep/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -258,6 +258,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/modules/fifo/Makefile.in new/mcabber-1.0.2/modules/fifo/Makefile.in
--- old/mcabber-1.0.1/modules/fifo/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/modules/fifo/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -261,6 +261,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/modules/urlregex/Makefile.in new/mcabber-1.0.2/modules/urlregex/Makefile.in
--- old/mcabber-1.0.1/modules/urlregex/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/modules/urlregex/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -259,6 +259,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mcabber-1.0.1/modules/xttitle/Makefile.in new/mcabber-1.0.2/modules/xttitle/Makefile.in
--- old/mcabber-1.0.1/modules/xttitle/Makefile.in 2016-01-27 10:37:57.000000000 +0100
+++ new/mcabber-1.0.2/modules/xttitle/Makefile.in 2016-02-27 13:41:17.000000000 +0100
@@ -258,6 +258,8 @@
LN_S = @LN_S@
LOUDMOUTH_CFLAGS = @LOUDMOUTH_CFLAGS@
LOUDMOUTH_LIBS = @LOUDMOUTH_LIBS@
+LOUDMOUTH_SHA256_CFLAGS = @LOUDMOUTH_SHA256_CFLAGS@
+LOUDMOUTH_SHA256_LIBS = @LOUDMOUTH_SHA256_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
