stefanb pushed to pidgin-sipe (f22). "update to 1.19.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 15:39:39 UTC 2015
>From dbc5b22c863aa5faaa63c688ad1bd80520b5c0dc Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk at gmail.com>
Date: Sat, 4 Apr 2015 18:38:37 +0300
Subject: update to 1.19.1
diff --git a/.gitignore b/.gitignore
index 5b41e87..ef4af7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ pidgin-sipe-1.10.1.tar.bz2
/pidgin-sipe-1.18.4.tar.bz2
/pidgin-sipe-1.18.5.tar.bz2
/pidgin-sipe-1.19.0.tar.bz2
+/pidgin-sipe-1.19.1.tar.bz2
diff --git a/pidgin-sipe-1.19.0-gcc-5.patch b/pidgin-sipe-1.19.0-gcc-5.patch
deleted file mode 100644
index c47a831..0000000
--- a/pidgin-sipe-1.19.0-gcc-5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6970ccf3b6797c67fe8b234edacbac21b6d16f94 Mon Sep 17 00:00:00 2001
-From: Stefan Becker <chemobejk at gmail.com>
-Date: Sun, 8 Feb 2015 12:07:24 +0200
-Subject: [PATCH] purple: update conditionals for GCC 5.0
-
----
- src/purple/purple-media.c | 6 ++++--
- src/purple/purple-plugin.c | 6 +++---
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/purple/purple-media.c b/src/purple/purple-media.c
-index a4eae88..e85a3d4 100644
---- a/src/purple/purple-media.c
-+++ b/src/purple/purple-media.c
-@@ -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 --git a/src/purple/purple-plugin.c b/src/purple/purple-plugin.c
-index f1172f0..f246522 100644
---- a/src/purple/purple-plugin.c
-+++ b/src/purple/purple-plugin.c
-@@ -625,8 +625,8 @@ static PurpleMediaCaps sipe_purple_get_media_caps(SIPE_UNUSED_PARAMETER PurpleAc
- * 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"
-@@ -739,7 +739,7 @@ static PurplePluginProtocolInfo sipe_prpl_info =
- #endif
- };
- #ifdef __GNUC__
--#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6)
-+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ >= 5)
- #pragma GCC diagnostic pop
- #endif
- #endif
---
-2.1.0
-
diff --git a/pidgin-sipe-1.19.0-remove-tcp-candidates.patch b/pidgin-sipe-1.19.0-remove-tcp-candidates.patch
deleted file mode 100644
index d20bbde..0000000
--- a/pidgin-sipe-1.19.0-remove-tcp-candidates.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 7ac053271f74f3c3d3b2d2d01dccda13237b344b Mon Sep 17 00:00:00 2001
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 12 Feb 2015 18:43:57 +0100
-Subject: [PATCH] Fix #278: 488 error after libnice upgrade
-
-When libnice 0.1.10 is combined with Farstream 0.1.x, TCP candidates
-that libnice now always generates are incorrectly labeled as UDP by
-Farstream (which has no support for TCP in 0.1 branch). We try to filter
-them in SIPE, assuming that RTP+RTCP UDP pairs that share the same port
-are actually mistagged TCP candidates.
----
- ChangeLog | 3 +++
- src/core/sipe-media.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 57 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a216fe1..40fef99 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+version 1.20.0 "???" (XXXX-XX-XX)
-+ - Fixed #278: 488 error after libnice upgrade (Jakub Adam)
-+
- 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 --git a/src/core/sipe-media.c b/src/core/sipe-media.c
-index 90b195b..710662e 100644
---- a/src/core/sipe-media.c
-+++ b/src/core/sipe-media.c
-@@ -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 <jakub.adam at ktknet.cz>
- *
- * This program is free software; you can redistribute it and/or modify
-@@ -191,6 +191,56 @@ sdpcodec_compare(gconstpointer a, gconstpointer b)
- ((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 @@ backend_stream_to_sdpmedia(struct sipe_backend_media *backend_media,
- // 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);
---
-2.3.2
-
diff --git a/pidgin-sipe-1.19.0-use-correct-gstreamer.patch b/pidgin-sipe-1.19.0-use-correct-gstreamer.patch
deleted file mode 100644
index f366188..0000000
--- a/pidgin-sipe-1.19.0-use-correct-gstreamer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ea38ced538b96d36183154aa08661eeb55048e84 Mon Sep 17 00:00:00 2001
-From: David Woodhouse <David.Woodhouse at intel.com>
-Date: Thu, 12 Mar 2015 16:43:35 +0000
-Subject: [PATCH] Use same GStreamer version as libpurple
-
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1129a18..bbd7371 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -346,7 +346,11 @@ AS_IF([test "x$enable_purple" != xno],
- dnl check whether enable voice and video support
- AS_IF([test "x$with_vv" = xno], [], dnl disabled by user
- [test "x$with_vv" = xcheck], dnl autodetect
-- [AC_MSG_CHECKING(for purple voice and video support)
-+ [dnl Let purple pkgconfig correct our assumptions about GStreamer
-+ purple_gst=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig`
-+ AS_IF([test "x$purple_gst" != "x"],
-+ [gstreamer_pkgconfig=gstreamer-$purple_gst])
-+ AC_MSG_CHECKING(for purple voice and video support)
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([[
- #include <media.h>
---
-2.3.2
-
diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec
index 4cefcc6..09e9d51 100644
--- a/pidgin-sipe.spec
+++ b/pidgin-sipe.spec
@@ -1,15 +1,12 @@
Name: pidgin-sipe
-Version: 1.19.0
-Release: 3%{?dist}
+Version: 1.19.1
+Release: 1%{?dist}
Summary: Pidgin protocol plugin to connect to MS Office Communicator
Group: Applications/Internet
License: GPLv2+
URL: http://sipe.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-%{version}/pidgin-sipe-%{version}.tar.bz2
-Patch0: pidgin-sipe-1.19.0-gcc-5.patch
-Patch1: pidgin-sipe-1.19.0-remove-tcp-candidates.patch
-Patch2: pidgin-sipe-1.19.0-use-correct-gstreamer.patch
BuildRequires: pkgconfig(glib-2.0) >= 2.12.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.12.0
@@ -66,9 +63,6 @@ This package provides the protocol plugin for libpurple clients.
%prep
%setup -q
-%patch0 -p1 -b .gcc-5
-%patch1 -p1 -b .tcp
-%patch2 -p1 -b .gst
%build
autoreconf -f -i
@@ -107,6 +101,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Apr 04 2015 Stefan Becker <chemobejk at gmail.com> - 1.19.1-1
+- update to 1.19.1:
+ - add workaround for farstream 0.1.x with libnice >= 0.1.10
+ - fix SIP re-authentication timeout to be max. 8 hours
+- drop obsolete patches
+
* Wed Mar 18 2015 David Woodhouse <dwmw2 at infradead.org> - 1.19.0-3
- add upstream patch to ignore TCP candidates with newer libnice
- add upstream patch to build against same GStreamer as Pidgin
diff --git a/sources b/sources
index d051d60..3d4cd7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0022c30982527c9cf94e4ad0a162aa08 pidgin-sipe-1.19.0.tar.bz2
+1a331108f84d4d440ebf38bc488fbaf4 pidgin-sipe-1.19.1.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pidgin-sipe.git/commit/?h=f22&id=dbc5b22c863aa5faaa63c688ad1bd80520b5c0dc
More information about the scm-commits
mailing list