Hello community,
here is the log from the commit of package pidgin-sipe for openSUSE:Factory checked in at 2015-04-10 09:52:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pidgin-sipe (Old)
and /work/SRC/openSUSE:Factory/.pidgin-sipe.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pidgin-sipe"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pidgin-sipe/pidgin-sipe.changes 2015-02-16 07:36:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pidgin-sipe.new/pidgin-sipe.changes 2015-04-10 09:52:05.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 7 16:35:34 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 1.19.1:
+ + Fixed sf#278: 488 error after libnice upgrade.
+ + Fix SIP re-authentication timeout to be max. 8 hours.
+
+-------------------------------------------------------------------
Old:
----
pidgin-sipe-1.19.0.tar.xz
New:
----
pidgin-sipe-1.19.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pidgin-sipe.spec ++++++
--- /var/tmp/diff_new_pack.LvmniQ/_old 2015-04-10 09:52:05.000000000 +0200
+++ /var/tmp/diff_new_pack.LvmniQ/_new 2015-04-10 09:52:05.000000000 +0200
@@ -19,13 +19,13 @@
%define build_telepathy 1
Name: pidgin-sipe
-Version: 1.19.0
+Version: 1.19.1
Release: 0
Summary: Pidgin protocol plugin to connect to MS Office Communicator
License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger
Url: http://sipe.sourceforge.net/
-Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.19.0/%{name}-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.19.1/%{name}-%{version}.tar.xz
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 2.12.0
BuildRequires: gmime-devel
++++++ pidgin-sipe-1.19.0.tar.xz -> pidgin-sipe-1.19.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/ChangeLog new/pidgin-sipe-1.19.1/ChangeLog
--- old/pidgin-sipe-1.19.0/ChangeLog 2015-02-07 12:43:31.000000000 +0100
+++ new/pidgin-sipe-1.19.1/ChangeLog 2015-04-04 16:01:35.000000000 +0200
@@ -1,3 +1,7 @@
+version 1.19.1 "Bug Fixes I" (2015-04-04)
+ - Fixed #278: 488 error after libnice upgrade (Jakub Adam)
+ - fix SIP re-authentication timeout to be max. 8 hours (Stefan Becker)
+
version 1.19.0 "Auto Authentication, MFA & Search Improvements" (2015-02-07)
- Feature #80: Move parsing of login name (Stefan Becker)
- Feature #79: support for Adium group chat bookmarks (David Matz, Stefan Becker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/NEWS new/pidgin-sipe-1.19.1/NEWS
--- old/pidgin-sipe-1.19.0/NEWS 2015-02-07 13:38:51.000000000 +0100
+++ new/pidgin-sipe-1.19.1/NEWS 2015-04-04 16:04:11.000000000 +0200
@@ -1,17 +1,3 @@
-version 1.19.0 "Auto Authentication, MFA & Search Improvements" (2015-02-07)
- - Feature #80: Move parsing of login name (Stefan Becker)
- - Feature #79: support for Adium group chat bookmarks (David Matz, Stefan Becker)
- - Feature #78: Support searching for SIP ID (Stefan Becker)
- - Feature #76: ADFS can't always be used (Stefan Becker)
- * for accounts that have Multi-Factor Authentication (MFA) enabled
- - Feature #73: Support buddy photos from contactCard (Stefan Becker)
- - Feature #65: Fall back from Kerberos to NTLM (Stefan Becker)
- - Fixed #277: Raised contact names (Stefan Becker)
- - Fixed #240: Corrupted HTTP response crashes SIPE (Stefan Becker)
- - fix calendar state machine when EWS URL is set (Stefan Becker)
- - fall back to [MS-DLX] BasicSearch to improve search experience (Stefan Becker, various)
- - implement search functionality for UCS (Stefan Becker)
- - adium: add chat room list UI (David Matz)
- - adium: fix duplicate debug log messages (Stefan Becker)
- - support for libnice TCP mode (Youness Alaoul, Jakub Adam)
- - refactor CCCP request code (Jakub Adam)
+version 1.19.1 "Bug Fixes I" (2015-04-04)
+ - Fixed #278: 488 error after libnice upgrade (Jakub Adam)
+ - fix SIP re-authentication timeout to be max. 8 hours (Stefan Becker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/VERSION new/pidgin-sipe-1.19.1/VERSION
--- old/pidgin-sipe-1.19.0/VERSION 2015-01-16 21:10:17.000000000 +0100
+++ new/pidgin-sipe-1.19.1/VERSION 2015-04-04 16:04:19.000000000 +0200
@@ -1 +1 @@
-1.19.0
+1.19.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/configure new/pidgin-sipe-1.19.1/configure
--- old/pidgin-sipe-1.19.0/configure 2015-02-07 13:44:40.000000000 +0100
+++ new/pidgin-sipe-1.19.1/configure 2015-04-04 16:38:49.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pidgin-sipe 1.19.0.
+# Generated by GNU Autoconf 2.69 for pidgin-sipe 1.19.1.
#
# Report bugs to https://sourceforge.net/p/sipe/bugs/.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='pidgin-sipe'
PACKAGE_TARNAME='pidgin-sipe'
-PACKAGE_VERSION='1.19.0'
-PACKAGE_STRING='pidgin-sipe 1.19.0'
+PACKAGE_VERSION='1.19.1'
+PACKAGE_STRING='pidgin-sipe 1.19.1'
PACKAGE_BUGREPORT='https://sourceforge.net/p/sipe/bugs/'
PACKAGE_URL='http://sipe.sourceforge.net/'
@@ -1456,7 +1456,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 pidgin-sipe 1.19.0 to adapt to many kinds of systems.
+\`configure' configures pidgin-sipe 1.19.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1526,7 +1526,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pidgin-sipe 1.19.0:";;
+ short | recursive ) echo "Configuration of pidgin-sipe 1.19.1:";;
esac
cat <<\_ACEOF
@@ -1704,7 +1704,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pidgin-sipe configure 1.19.0
+pidgin-sipe configure 1.19.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2073,7 +2073,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pidgin-sipe $as_me 1.19.0, which was
+It was created by pidgin-sipe $as_me 1.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2951,7 +2951,7 @@
# Define the identity of the package.
PACKAGE='pidgin-sipe'
- VERSION='1.19.0'
+ VERSION='1.19.1'
# Some tools Automake needs.
@@ -14113,12 +14113,139 @@
with_purple_vv=no
if test "x$enable_purple" != xno; then :
- if test "x$enable_purple" == "xyes" -o "x$enable_purple" == "x2"; then :
- purple_pkgconfig=purple; gstreamer_pkgconfig=gstreamer-0.10
-elif test "x$enable_purple" == "x3"; then :
- purple_pkgconfig=purple-3; gstreamer_pkgconfig=gstreamer-1.0
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PURPLE" >&5
+$as_echo_n "checking for PURPLE... " >&6; }
+
+if test -n "$PURPLE_CFLAGS"; then
+ pkg_cv_PURPLE_CFLAGS="$PURPLE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple-3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple-3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PURPLE_CFLAGS=`$PKG_CONFIG --cflags "purple-3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PURPLE_LIBS"; then
+ pkg_cv_PURPLE_LIBS="$PURPLE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple-3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple-3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PURPLE_LIBS=`$PKG_CONFIG --libs "purple-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
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "purple-3" 2>&1`
+ else
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "purple-3" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PURPLE_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PURPLE" >&5
+$as_echo_n "checking for PURPLE... " >&6; }
+
+if test -n "$PURPLE_CFLAGS"; then
+ pkg_cv_PURPLE_CFLAGS="$PURPLE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple >= 2.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple >= 2.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PURPLE_CFLAGS=`$PKG_CONFIG --cflags "purple >= 2.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PURPLE_LIBS"; then
+ pkg_cv_PURPLE_LIBS="$PURPLE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple >= 2.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple >= 2.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PURPLE_LIBS=`$PKG_CONFIG --libs "purple >= 2.4.0" 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
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "purple >= 2.4.0" 2>&1`
+ else
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "purple >= 2.4.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PURPLE_PKG_ERRORS" >&5
+ enable_purple=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_purple=no
+else
+ PURPLE_CFLAGS=$pkg_cv_PURPLE_CFLAGS
+ PURPLE_LIBS=$pkg_cv_PURPLE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ purple_pkgconfig=purple
+fi
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PURPLE" >&5
@@ -14128,12 +14255,12 @@
pkg_cv_PURPLE_CFLAGS="$PURPLE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$purple_pkgconfig >= 2.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$purple_pkgconfig >= 2.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple >= 2.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple >= 2.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PURPLE_CFLAGS=`$PKG_CONFIG --cflags "$purple_pkgconfig >= 2.4.0" 2>/dev/null`
+ pkg_cv_PURPLE_CFLAGS=`$PKG_CONFIG --cflags "purple >= 2.4.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14145,12 +14272,12 @@
pkg_cv_PURPLE_LIBS="$PURPLE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$purple_pkgconfig >= 2.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$purple_pkgconfig >= 2.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"purple >= 2.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "purple >= 2.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PURPLE_LIBS=`$PKG_CONFIG --libs "$purple_pkgconfig >= 2.4.0" 2>/dev/null`
+ pkg_cv_PURPLE_LIBS=`$PKG_CONFIG --libs "purple >= 2.4.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14171,9 +14298,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PURPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$purple_pkgconfig >= 2.4.0" 2>&1`
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "purple >= 2.4.0" 2>&1`
else
- PURPLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$purple_pkgconfig >= 2.4.0" 2>&1`
+ PURPLE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "purple >= 2.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PURPLE_PKG_ERRORS" >&5
@@ -14188,7 +14315,21 @@
PURPLE_LIBS=$pkg_cv_PURPLE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- PURPLE_MAJOR_VERSION=`$PKG_CONFIG --modversion $purple_pkgconfig | cut -d. -f 1`
+ purple_pkgconfig=purple
+fi
+else
+ PURPLE_CFLAGS=$pkg_cv_PURPLE_CFLAGS
+ PURPLE_LIBS=$pkg_cv_PURPLE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ purple_pkgconfig=purple-3
+fi
+
+ if test "x$enable_purple" != xno; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using package \"$purple_pkgconfig\"." >&5
+$as_echo "$as_me: using package \"$purple_pkgconfig\"." >&6;}
+
+ PURPLE_MAJOR_VERSION=`$PKG_CONFIG --modversion $purple_pkgconfig | cut -d. -f 1`
ac_save_CFLAGS=$CFLAGS
@@ -14364,6 +14505,19 @@
_SIPE_MEDIA_RECHECK_PLEASE_IGNORE_LIBS=$pkg_cv__SIPE_MEDIA_RECHECK_PLEASE_IGNORE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ gstreamer_pkgconfig=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig`
+ if test "x$gstreamer_pkgconfig" != x; then :
+ gstreamer_pkgconfig=gstreamer-$gstreamer_pkgconfig
+else
+ if test "x$purple_pkgconfig" == xpurple-3; then :
+ gstreamer_pkgconfig=gstreamer-1.0
+else
+ gstreamer_pkgconfig=gstreamer-0.10
+fi
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using package \"$gstreamer_pkgconfig\"." >&5
+$as_echo "$as_me: using package \"$gstreamer_pkgconfig\"." >&6;}
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
@@ -14456,11 +14610,14 @@
$as_echo_n "checking for TCP media transport... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
#include
+
int
main ()
{
return PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE
+
;
return 0;
}
@@ -14477,7 +14634,6 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -16217,7 +16373,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pidgin-sipe $as_me 1.19.0, which was
+This file was extended by pidgin-sipe $as_me 1.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16284,7 +16440,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pidgin-sipe config.status 1.19.0
+pidgin-sipe config.status 1.19.1
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/pidgin-sipe-1.19.0/configure.ac new/pidgin-sipe-1.19.1/configure.ac
--- old/pidgin-sipe-1.19.0/configure.ac 2014-12-30 01:13:27.000000000 +0100
+++ new/pidgin-sipe-1.19.1/configure.ac 2015-04-04 15:56:13.000000000 +0200
@@ -121,7 +121,7 @@
[AC_MSG_RESULT(yes)
QUALITY_CFLAGS="$QUALITY_CFLAGS $newflag"],
[AC_MSG_RESULT(no)]
- )
+ )
CFLAGS=$ac_save_CFLAGS
done
])
@@ -328,13 +328,16 @@
[enable_purple=yes])
with_purple_vv=no
AS_IF([test "x$enable_purple" != xno],
- AS_IF([test "x$enable_purple" == "xyes" -o "x$enable_purple" == "x2"],
- [purple_pkgconfig=purple; gstreamer_pkgconfig=gstreamer-0.10],
- [test "x$enable_purple" == "x3"],
- [purple_pkgconfig=purple-3; gstreamer_pkgconfig=gstreamer-1.0])
+ [PKG_CHECK_MODULES(PURPLE, [purple-3],
+ [purple_pkgconfig=purple-3],
+ [PKG_CHECK_MODULES(PURPLE, [purple >= 2.4.0],
+ [purple_pkgconfig=purple],
+ [enable_purple=no])])
- [PKG_CHECK_MODULES(PURPLE, [$purple_pkgconfig >= 2.4.0],
- [dnl unfortunately PURPLE_MAJOR_VERSION is not exported by purple.m4
+ AS_IF([test "x$enable_purple" != xno],
+ [AC_MSG_NOTICE([using package "$purple_pkgconfig".])
+
+ dnl unfortunately PURPLE_MAJOR_VERSION is not exported by purple.m4
PURPLE_MAJOR_VERSION=`$PKG_CONFIG --modversion $purple_pkgconfig | cut -d. -f 1`
AC_SUBST(PURPLE_MAJOR_VERSION)
@@ -352,12 +355,21 @@
#include
]],
[[return (purple_media_get_type() == G_TYPE_NONE ? 1 : 0);]]
- )],
+ )],
[AC_MSG_RESULT(ok)
PKG_CHECK_MODULES(NICE, [nice >= 0.1.0],
dnl sipe-media.c uses g_slist_free_full()
[PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [$purple_pkgconfig >= 2.8.0],
- [PKG_CHECK_MODULES(GSTREAMER, [$gstreamer_pkgconfig],
+ dnl check purple pkgconfig for gstreamer version
+ [gstreamer_pkgconfig=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig`
+ AS_IF([test "x$gstreamer_pkgconfig" != x],
+ [gstreamer_pkgconfig=gstreamer-$gstreamer_pkgconfig],
+ [AS_IF([test "x$purple_pkgconfig" == xpurple-3],
+ [gstreamer_pkgconfig=gstreamer-1.0],
+ [gstreamer_pkgconfig=gstreamer-0.10])])
+
+ AC_MSG_NOTICE([using package "$gstreamer_pkgconfig".])
+ PKG_CHECK_MODULES(GSTREAMER, [$gstreamer_pkgconfig],
[with_purple_vv=yes],
[AC_MSG_NOTICE(GStreamer required: disabling purple voice and video support)])],
[AC_MSG_NOTICE(libpurple >= 2.8.0 required: disabling purple voice and video support)])],
@@ -371,19 +383,21 @@
[
AC_MSG_CHECKING(for TCP media transport)
AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include ]],[[return PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE]])],
+ [AC_LANG_PROGRAM([[
+#include
+ ]],
+ [[return PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE]]
+ )],
[
with_purple_tcp=yes
AC_DEFINE(HAVE_ICE_TCP, 1, [Define if we have support for TCP media transport.])
AC_MSG_RESULT(yes)
],
- [AC_MSG_RESULT(no)]
- )
+ [AC_MSG_RESULT(no)])
])
CFLAGS=$ac_save_CFLAGS
- LIBS=$ac_save_LIBS],
- [enable_purple=no])])
+ LIBS=$ac_save_LIBS])])
AM_CONDITIONAL(SIPE_INCLUDE_PURPLE, [test "x$enable_purple" != xno])
dnl build option: telepathy backend
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/debian/changelog new/pidgin-sipe-1.19.1/contrib/debian/changelog
--- old/pidgin-sipe-1.19.0/contrib/debian/changelog 2015-02-07 13:39:31.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/debian/changelog 2015-04-04 16:05:39.000000000 +0200
@@ -1,3 +1,11 @@
+pidgin-sipe (1.19.1-1) unstable; urgency=low
+
+ * New upstream version 1.19.1 "Bug Fixes I" (2015-04-04)
+ - Fixed #278: 488 error after libnice upgrade (Jakub Adam)
+ - fix SIP re-authentication timeout to be max. 8 hours (Stefan Becker)
+
+ -- Stefan Becker Sat, 04 Apr 2015 17:05:00 +0300
+
pidgin-sipe (1.19.0-1) unstable; urgency=low
* New upstream version 1.19.0 "Auto Authentication, MFA & Search Improvements" (2015-02-07)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/PKGBUILD new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/PKGBUILD
--- old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/PKGBUILD 2015-01-16 21:18:15.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/PKGBUILD 2015-04-04 16:06:42.000000000 +0200
@@ -1,7 +1,7 @@
# Maintainer: SIPE Project http://sipe.sourceforge.net/
pkgname=pidgin-sipe
-pkgver=1.19.0
+pkgver=1.19.1
pkgrel=1
pkgdesc="Libpurple protocol plugin to connect to MS Office Communicator"
arch=(i686 x86_64)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc
--- old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc 2015-01-16 21:18:15.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc 2015-04-04 16:06:42.000000000 +0200
@@ -1,6 +1,6 @@
Format: 3.0 (quilt)
Source: pidgin-sipe
-Version: 1.19.0-1
+Version: 1.19.1-1
Binary: pidgin-sipe
Maintainer: pidgin-sipe
Architecture: any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.changes new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.changes
--- old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.changes 2015-02-07 12:48:33.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.changes 2015-04-04 16:08:06.000000000 +0200
@@ -1,7 +1,29 @@
-------------------------------------------------------------------
-Sat Feb 7 11:48:00 UTC 2015 - chemobejk@gmail.com
+Sat Apr 4 14:08:00 UTC 2015 - chemobejk@gmail.com
+
+- Update to version 1.19.1:
+
+-------------------------------------------------------------------
+Fri Feb 13 21:22:20 UTC 2015 - zaitor@opensuse.org
- Update to version 1.19.0:
+ + Move parsing of login name.
+ + Support for Adium group chat bookmarks.
+ + Support searching for SIP ID.
+ + ADFS can't always be used for accounts that have Multi-Factor
+ Authentication (MFA) enabled.
+ + Support buddy photos from contactCard.
+ + Fall back from Kerberos to NTLM.
+ + Raised contact names.
+ + Corrupted HTTP response crashes SIPE.
+ + Fix calendar state machine when EWS URL is set.
+ + Fall back to [MS-DLX] BasicSearch to improve search experience.
+ + Implement search functionality for UCS.
+ + adium:
+ - Add chat room list UI.
+ - Fix duplicate debug log messages.
+ + Support for libnice TCP mode.
+ + Refactor CCCP request code.
-------------------------------------------------------------------
Wed Dec 31 09:36:53 UTC 2014 - jozef.koval03@gmail.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.dsc new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.dsc
--- old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.dsc 2015-01-16 21:18:15.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.dsc 2015-04-04 16:06:42.000000000 +0200
@@ -1,6 +1,6 @@
Format: 3.0 (quilt)
Source: pidgin-sipe
-Version: 1.19.0-1
+Version: 1.19.1-1
Binary: pidgin-sipe
Maintainer: pidgin-sipe
Architecture: any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.spec new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.spec
--- old/pidgin-sipe-1.19.0/contrib/opensuse-build-service/pidgin-sipe.spec 2015-02-07 12:45:25.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/opensuse-build-service/pidgin-sipe.spec 2015-04-04 16:09:17.000000000 +0200
@@ -133,7 +133,7 @@
%endif
%endif
Summary: Pidgin protocol plugin to connect to MS Office Communicator
-Version: 1.19.0
+Version: 1.19.1
Release: 1
Source: pidgin-sipe-%{version}.tar.gz
Group: %{pkg_group}
@@ -535,6 +535,9 @@
%changelog
+* Sat Apr 04 2015 J. D. User 1.19.1
+- update to 1.19.1
+
* Sat Feb 07 2015 J. D. User 1.19.0
- update to 1.19.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/contrib/rpm/pidgin-sipe.spec new/pidgin-sipe-1.19.1/contrib/rpm/pidgin-sipe.spec
--- old/pidgin-sipe-1.19.0/contrib/rpm/pidgin-sipe.spec 2015-02-07 12:45:25.000000000 +0100
+++ new/pidgin-sipe-1.19.1/contrib/rpm/pidgin-sipe.spec 2015-04-04 16:09:44.000000000 +0200
@@ -25,7 +25,7 @@
Name: pidgin-sipe
Summary: Pidgin protocol plugin to connect to MS Office Communicator
-Version: 1.19.0
+Version: 1.19.1
%if 0%{?_with_git:1}
Release: %{gitcount}.%{git}%{?dist}
Source: %{name}-%{git}.tar.bz2
@@ -288,6 +288,9 @@
%changelog
+* Sat Apr 04 2015 J. D. User 1.19.1
+- update to 1.19.1
+
* Sat Feb 07 2015 J. D. User 1.19.0
- update to 1.19.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/siplcs.vcxproj new/pidgin-sipe-1.19.1/siplcs.vcxproj
--- old/pidgin-sipe-1.19.0/siplcs.vcxproj 2015-01-16 21:18:15.000000000 +0100
+++ new/pidgin-sipe-1.19.1/siplcs.vcxproj 2015-04-04 16:06:42.000000000 +0200
@@ -106,7 +106,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;$(ProjectDir)/src/api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.0";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.0";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/projects/p/pidgin-sipe/resource/mob/";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.1";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/projects/p/pidgin-sipe/resource/mob/";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -122,7 +122,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;$(ProjectDir)/src/core;$(ProjectDir)/src/api;$(ProjectDir)/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.0";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/projects/p/pidgin-sipe/resource/mob/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.0";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.1";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/projects/p/pidgin-sipe/resource/mob/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/adium/xcconfigs/Base.xcconfig new/pidgin-sipe-1.19.1/src/adium/xcconfigs/Base.xcconfig
--- old/pidgin-sipe-1.19.0/src/adium/xcconfigs/Base.xcconfig 2015-01-16 21:18:15.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/adium/xcconfigs/Base.xcconfig 2015-04-04 16:06:42.000000000 +0200
@@ -21,7 +21,7 @@
PACKAGE_URL=\"http:${SLASH}/sipe.sourceforge.net/\"
// No need to change version number in the xcodeproj file every release, just here.
-PACKAGE_VERSION=1.19.0
+PACKAGE_VERSION=1.19.1
PACKAGE_STRING=\"pidgin-sipe\ ${PACKAGE_VERSION}\"
GCC_PREPROCESSOR_DEFINITIONS = SIPE_TRANSLATIONS_URL=${SIPE_TRANSLATIONS_URL} LOCALEDIR=\"translations\" PURPLE_STATIC_PRPL=1 HAVE_BIND_TEXTDOMAIN_CODESET=1 ENABLE_NLS=1 ADIUM=1 PACKAGE_NAME=\"pidgin-sipe\" PACKAGE_TARNAME=\"pidgin-sipe\" PACKAGE_BUGREPORT=${PACKAGE_BUGREPORT} PACKAGE_VERSION=\"${PACKAGE_VERSION}\" PACKAGE_STRING=${PACKAGE_STRING} PACKAGE_URL=${PACKAGE_URL} STDC_HEADERS=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_DLFCN_H=1 LT_OBJDIR=\".libs/\" STDC_HEADERS=1 HAVE_LOCALE_H=1 HAVE_LC_MESSAGES=1 HAVE_DLFCN_H=1 HAVE_DCGETTEXT=1 HAVE_GETTEXT=1 HAVE_LOCALE_H=1 HAVE_GSSAPI_GSSAPI_H=1 HAVE_LANGINFO_CODESET=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/core/sip-sec-tls-dsk.c new/pidgin-sipe-1.19.1/src/core/sip-sec-tls-dsk.c
--- old/pidgin-sipe-1.19.0/src/core/sip-sec-tls-dsk.c 2015-01-10 23:44:44.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/core/sip-sec-tls-dsk.c 2015-03-31 11:21:29.000000000 +0200
@@ -93,18 +93,8 @@
ctx->server_key = g_memdup(state->server_key,
state->key_length);
- /* [MS-SIPAE] Section 3.2.2 Timers
- *
- * ... For an SA established using the TLS-DSK
- * authentication protocol, the client MUST
- * retrieve the expiration time of its certificate.
- * The expiration timer value is the lesser of the
- * interval to the certificate expiration and eight
- * hours, ...
- */
+ /* extract certicate expiration time */
ctx->common.expires = sipe_tls_expires(state);
- if (ctx->common.expires > (8 * 60 * 60))
- ctx->common.expires = 8 * 60 * 60;
SIPE_DEBUG_INFO("sip_sec_init_sec_context__tls_dsk: handshake completed, algorithm %d, key length %" G_GSIZE_FORMAT ", expires %d",
ctx->algorithm, ctx->key_length, ctx->common.expires);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/core/sip-transport.c new/pidgin-sipe-1.19.1/src/core/sip-transport.c
--- old/pidgin-sipe-1.19.0/src/core/sip-transport.c 2015-01-10 23:44:44.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/core/sip-transport.c 2015-03-31 11:21:29.000000000 +0200
@@ -46,6 +46,9 @@
* this module (!) Like headers: Via, Route, Contact, Authorization, etc.
* It's all irrelevant to higher layer responsibilities.
*
+ * Specification references:
+ *
+ * - [MS-SIPAE]: http://msdn.microsoft.com/en-us/library/cc431510.aspx
*/
#ifdef HAVE_CONFIG_H
@@ -1056,6 +1059,9 @@
const gchar *server_hdr = sipmsg_find_header(msg, "Server");
if (!transport->reregister_set) {
+ /* Schedule re-register 30 seconds before expiration */
+ if (expires > 30)
+ expires -= 30;
sip_transport_set_reregister(sipe_private,
expires);
transport->reregister_set = TRUE;
@@ -1075,19 +1081,37 @@
}
if (!transport->reauthenticate_set) {
+ /* [MS-SIPAE] Section 3.2.2 Timers
+ *
+ * When the ... authentication handshake completes
+ * and the SA enters the "established" state, the
+ * SIP protocol client MUST start an SA expiration
+ * timer.
+ * ...
+ * The expiration timer value is the lesser of
+ *
+ * - Kerberos: the service ticket expiry time
+ * - TLS-DSK: the certificate expiration time
+ *
+ * and eight hours, further reduced by some buffer
+ * time.
+ * ...
+ * The protocol client MUST choose a sufficient
+ * buffer time to allow for the ... authentication
+ * handshake that reestablishes the SA to complete
+ * ... This value SHOULD be five (5) minutes or
+ * longer.
+ */
guint reauth_timeout = transport->registrar.expires;
SIPE_DEBUG_INFO_NOFORMAT("process_register_response: authentication handshake completed successfully");
- /* Does authentication scheme provide valid expiration time? */
- if (reauth_timeout == 0) {
- SIPE_DEBUG_INFO_NOFORMAT("process_register_response: no expiration time - using default of 8 hours");
+ if ((reauth_timeout == 0) ||
+ (reauth_timeout > 8 * 60 * 60))
reauth_timeout = 8 * 60 * 60;
- }
-
- /* schedule reauthentication 5 minutes before expiration */
if (reauth_timeout > 5 * 60)
reauth_timeout -= 5 * 60;
+
sipe_schedule_seconds(sipe_private,
"<+reauthentication>",
NULL,
@@ -1097,8 +1121,6 @@
transport->reauthenticate_set = TRUE;
}
- sipe_backend_connection_completed(SIPE_CORE_PUBLIC);
-
uuid = get_uuid(sipe_private);
// There can be multiple Contact headers (one per location where the user is logged in) so
@@ -1162,6 +1184,8 @@
hdr = g_slist_next(hdr);
}
+ sipe_backend_connection_completed(SIPE_CORE_PUBLIC);
+
/* rejoin open chats to be able to use them by continue to send messages */
sipe_backend_chat_rejoin_all(SIPE_CORE_PUBLIC);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/core/sipe-media.c new/pidgin-sipe-1.19.1/src/core/sipe-media.c
--- old/pidgin-sipe-1.19.0/src/core/sipe-media.c 2014-12-30 01:13:27.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/core/sipe-media.c 2015-02-18 08:08:55.000000000 +0100
@@ -3,7 +3,7 @@
*
* pidgin-sipe
*
- * Copyright (C) 2011-2014 SIPE Project http://sipe.sourceforge.net/
+ * Copyright (C) 2011-2015 SIPE Project http://sipe.sourceforge.net/
* Copyright (C) 2010 Jakub Adam
*
* This program is free software; you can redistribute it and/or modify
@@ -191,6 +191,56 @@
((const struct sdpcodec *)b)->id;
}
+static GList *
+remove_wrong_farstream_0_1_tcp_candidates(GList *candidates)
+{
+ GList *i = candidates;
+ GHashTable *foundation_to_candidate = g_hash_table_new_full(g_str_hash,
+ g_str_equal,
+ g_free,
+ NULL);
+
+ while (i) {
+ GList *next = i->next;
+ struct sipe_backend_candidate *c1 = i->data;
+
+ if (sipe_backend_candidate_get_protocol(c1) == SIPE_NETWORK_PROTOCOL_UDP) {
+ gchar *foundation = sipe_backend_candidate_get_foundation(c1);
+ struct sipe_backend_candidate *c2 = g_hash_table_lookup(foundation_to_candidate,
+ foundation);
+
+ if (c2) {
+ g_free(foundation);
+
+ if (sipe_backend_candidate_get_port(c1) ==
+ sipe_backend_candidate_get_port(c2) ||
+ (sipe_backend_candidate_get_type(c1) !=
+ SIPE_CANDIDATE_TYPE_HOST &&
+ sipe_backend_candidate_get_base_port(c1) ==
+ sipe_backend_candidate_get_base_port(c2))) {
+ /*
+ * We assume that RTP+RTCP UDP pairs
+ * that share the same port are
+ * actually mistagged TCP candidates.
+ */
+ candidates = g_list_remove(candidates, c2);
+ candidates = g_list_delete_link(candidates, i);
+ sipe_backend_candidate_free(c1);
+ sipe_backend_candidate_free(c2);
+ }
+ } else
+ /* hash table takes ownership of "foundation" */
+ g_hash_table_insert(foundation_to_candidate, foundation, c1);
+ }
+
+ i = next;
+ }
+
+ g_hash_table_destroy(foundation_to_candidate);
+
+ return candidates;
+}
+
static void
fill_zero_tcp_act_ports_from_tcp_pass(GSList *candidates)
{
@@ -315,9 +365,11 @@
// Otherwise send all available local candidates.
candidates = sipe_backend_media_get_active_local_candidates(backend_media,
backend_stream);
- if (!candidates)
+ if (!candidates) {
candidates = sipe_backend_get_local_candidates(backend_media,
backend_stream);
+ candidates = remove_wrong_farstream_0_1_tcp_candidates(candidates);
+ }
media->candidates = backend_candidates_to_sdpcandidate(candidates);
fill_zero_tcp_act_ports_from_tcp_pass(media->candidates);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/purple/purple-media.c new/pidgin-sipe-1.19.1/src/purple/purple-media.c
--- old/pidgin-sipe-1.19.0/src/purple/purple-media.c 2015-01-31 16:38:01.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/purple/purple-media.c 2015-02-08 12:16:14.000000000 +0100
@@ -3,7 +3,7 @@
*
* pidgin-sipe
*
- * Copyright (C) 2010-12 SIPE Project http://sipe.sourceforge.net/
+ * Copyright (C) 2010-15 SIPE Project http://sipe.sourceforge.net/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,11 +52,13 @@
*
* Diagnostic #pragma was added in GCC 4.2.0
*/
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 2)
+#if defined(__GNUC__)
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || (__GNUC__ >= 5)
#if defined(__ARMEL__) || defined(__ARMEB__) || defined(__mips__) || defined(__sparc__) || (defined(__powerpc__) && defined(__NO_FPRS__))
#pragma GCC diagnostic ignored "-Wcast-align"
#endif
#endif
+#endif
#include "media-gst.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pidgin-sipe-1.19.0/src/purple/purple-plugin.c new/pidgin-sipe-1.19.1/src/purple/purple-plugin.c
--- old/pidgin-sipe-1.19.0/src/purple/purple-plugin.c 2015-01-31 16:38:01.000000000 +0100
+++ new/pidgin-sipe-1.19.1/src/purple/purple-plugin.c 2015-04-04 15:56:04.000000000 +0200
@@ -625,8 +625,8 @@
* Diagnostic push/pop was added in GCC 4.6.0
*/
#ifdef __GNUC__
-#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 2)
-#if __GNUC_MINOR__ >= 6
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || (__GNUC__ >= 5)
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ >= 5)
#pragma GCC diagnostic push
#endif
#pragma GCC diagnostic warning "-Wmissing-field-initializers"
@@ -733,13 +733,14 @@
NULL, /* add_buddies_with_invite */
#elif PURPLE_VERSION_CHECK(3,0,0)
NULL, /* get_max_message_size */
+ NULL, /* media_send_dtmf */
#endif
#endif
#endif
#endif
};
#ifdef __GNUC__
-#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6)
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ >= 5)
#pragma GCC diagnostic pop
#endif
#endif