Accepting request 81421 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/81421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=22

pidgin-sipe-1.11.2-gcc46.patch

@@ -1,162 +0,0 @@
---- src/core/sipe-incoming.c	2010-11-03 05:13:51.000000000 +0100
-+++ src/core/sipe-incoming.c	2011-05-23 10:49:28.191010575 +0200
-@@ -255,7 +255,6 @@
- 	const gchar *oldHeader;
- 	gchar *newHeader;
- 	gboolean is_multiparty = FALSE;
--	gboolean is_triggered = FALSE;
- 	gboolean was_multiparty = TRUE;
- 	gboolean just_joined = FALSE;
- 	gchar *from;
-@@ -311,7 +310,6 @@
- 		}
- 	}
- 	if (trig_invite && !g_strcasecmp(trig_invite, "TRUE")) {
--		is_triggered = TRUE;
- 		is_multiparty = TRUE;
- 	}
- 
---- src/core/sip-sec-krb5.c	2010-11-03 05:13:51.000000000 +0100
-+++ src/core/sip-sec-krb5.c	2011-05-23 10:56:25.383010592 +0200
-@@ -281,13 +280,12 @@
- 			     OM_uint32 status,
- 			     int type)
- {
--	OM_uint32 ret;
- 	OM_uint32 minor;
- 	OM_uint32 message_context = 0;
- 	gss_buffer_desc status_string;
- 
- 	do {
--		ret = gss_display_status(&minor,
-+		gss_display_status(&minor,
- 					 status,
- 					 type,
- 					 GSS_C_NO_OID,
---- src/core/sipe-digest.c	2010-11-03 05:13:51.000000000 +0100
-+++ src/core/sipe-digest.c	2011-05-23 10:58:16.215010617 +0200
-@@ -41,13 +41,12 @@
- 			guchar *digest, gsize digest_length)
- {
- 	PK11Context *context = 0;
--	SECStatus s;
- 	unsigned int len;
- 	
- 	context = PK11_CreateDigestContext(algorithm);
--	s = PK11_DigestBegin(context);
--	s = PK11_DigestOp(context, data, data_length);
--	s = PK11_DigestFinal(context, digest, &len, digest_length);
-+	PK11_DigestBegin(context);
-+	PK11_DigestOp(context, data, data_length);
-+	PK11_DigestFinal(context, digest, &len, digest_length);
- 	PK11_DestroyContext(context, PR_TRUE);
- }
- 
-@@ -59,7 +58,6 @@
- 	SECItem noParams;
- 	PK11SymKey* SymKey;
- 	PK11Context* DigestContext;
--	SECStatus s;
- 
- 	/* For key */
- 	slot = PK11_GetBestSlot(hmacMech, NULL);
-@@ -77,7 +75,7 @@
- 
- 	DigestContext = PK11_CreateContextBySymKey(hmacMech, CKA_SIGN, SymKey, &noParams);
- 	
--	s = PK11_DigestBegin(DigestContext);
-+	PK11_DigestBegin(DigestContext);
- 	
- 	PK11_FreeSymKey(SymKey);
- 	PK11_FreeSlot(slot);
---- src/core/sipe.c	2010-11-03 05:13:51.000000000 +0100
-+++ src/core/sipe.c	2011-05-23 11:02:11.169010611 +0200
-@@ -1526,16 +1526,12 @@
- 	if (diagnostics != NULL) {
- 		reason = sipmsg_find_part_of_header(diagnostics, "reason=\"", "\"", NULL);
- 	} else { // for LCS2005
--		int error_id = 0;
- 		if (event && sipe_strcase_equal(event, "unregistered")) {
--			error_id = 4140; // [MS-SIPREGE]
- 			//reason = g_strdup(_("User logged out")); // [MS-OCER]
- 			reason = g_strdup(_("you are already signed in at another location"));
- 		} else if (event && sipe_strcase_equal(event, "rejected")) {
--			error_id = 4141;
- 			reason = g_strdup(_("user disabled")); // [MS-OCER]
- 		} else if (event && sipe_strcase_equal(event, "deactivated")) {
--			error_id = 4142;
- 			reason = g_strdup(_("user moved")); // [MS-OCER]
- 		}
- 	}
-@@ -4304,7 +4300,6 @@
- 	const sipe_xml *xn_state;
- 	const sipe_xml *xn_contact;
- 	char *note;
--	char *free_activity;
- 	int user_avail;
- 	const char *user_avail_nil;
- 	int res_avail;
-@@ -4341,7 +4336,6 @@
- 		user_avail_since = 0;
- 	}
- 
--	free_activity = NULL;
- 
- 	name = sipe_xml_attribute(xn_presentity, "uri"); /* without 'sip:' prefix */
- 	uri = sip_uri_from_name(name);
-@@ -5492,8 +5486,6 @@
- 	guint cal_data_instance = sipe_get_pub_instance(sipe_private, SIPE_PUB_CALENDAR_DATA);
- 	char *fb_start_str;
- 	char *free_busy_base64;
--	const char *st;
--	const char *fb;
- 	char *res;
- 
- 	/* key is <category><instance><container> */
-@@ -5532,9 +5524,6 @@
- 	fb_start_str = sipe_utils_time_to_str(cal->fb_start);
- 	free_busy_base64 = sipe_cal_get_freebusy_base64(cal->free_busy);
- 
--	st = publication_cal_300 ? publication_cal_300->fb_start_str : NULL;
--	fb = publication_cal_300 ? publication_cal_300->free_busy_base64 : NULL;
--
- 	/* we will rebuplish the same data to refresh publication time,
- 	 * so if data from multiple sources, most recent will be choosen
- 	 */
---- src/core/sip-sec-ntlm-tests.c	2010-11-03 05:13:51.000000000 +0100
-+++ src/core/sip-sec-ntlm-tests.c	2011-05-23 11:08:11.712010625 +0200
-@@ -124,7 +124,6 @@
- 	struct sipmsg *msg;
- 	struct sipmsg_breakdown msgbd;
- 	gchar *msg_str;
--	gchar *sig;
- 	const char *password2;
- 	const char *user2;
- 	const char *domain2;
-@@ -508,7 +507,7 @@
- 		msg_str, 0, exported_session_key2, exported_session_key2, mac);
- 	sipmsg_breakdown_free(&msgbd);
- 	assert_equal ("0100000000000000BF2E52667DDF6DED", mac, 16, TRUE);
--	sig = buff_to_hex_str(mac, 16);
-+	buff_to_hex_str(mac, 16);
- 	}
- 
- 
-@@ -762,7 +761,7 @@
- 	sip_sec_ntlm_sipe_signature_make (flags, msg_str, 0, client_sign_key, client_seal_key, mac);
- 	sipmsg_breakdown_free(&msgbd);
- 	assert_equal ("0100000029618e9651b65a7764000000", mac, 16, TRUE);
--	sig = buff_to_hex_str(mac, 16);
-+	buff_to_hex_str(mac, 16);
- 
- 	printf ("\n\nTesting (NTLMv2 / OC 2007 R2) Message Parsing, Signing, and Verification\nServer response\n(Authentication Protocol version 4)\n");
- 	msg = sipmsg_parse_msg(response);
-@@ -774,7 +773,7 @@
- 	sip_sec_ntlm_sipe_signature_make (flags, msg_str, 0, server_sign_key, server_seal_key, mac);
- 	sipmsg_breakdown_free(&msgbd);
- 	assert_equal ("01000000E615438A917661BE64000000", mac, 16, TRUE);
--	sig = buff_to_hex_str(mac, 16);
-+	buff_to_hex_str(mac, 16);
- 
- 	printf ("\n\nTesting (NTLMv2 / OC 2007 R2) MAC - client signing\n");
- 	MAC (flags,   (gchar*)request_sig,strlen(request_sig),   client_sign_key,16,   client_seal_key,16,   0,  100, mac);

pidgin-sipe-1.11.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90c424942cad50f271367acb0ddcf8e5c648d1aed1f395200e5d909515ce7ae9
-size 605656

pidgin-sipe-1.12.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:302a495bbe37d45e6d8836cd29031295eef631211b0cc15067b2f687d2b25717
+size 673336

pidgin-sipe.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Sep  2 10:00:33 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 1.12.0:
+  + Add support for OCS2007R2 Group Chat (sf#3064877)
+  + Support for HTTP/1.1 Transfer-Encoding: chunked (sf##3311026)
+  + Added MS TURN support
+  + Implement timeouts for SIP request. Used for REGISTER
+  + More work on Voice & Video call support
+  + Add random Ms-Conversation-ID to INVITE
+  + Fix parsing of P-Asserted-Identity header
+  + Fix several crashes (including sf#3082602, sf#3148124,
+    sf#3399007)
+  + Fix several authenticfation issues (inclusing sf#2834758,
+    sf#3090663, sf#3130915)
+  + Make it compile against the purple 2.8.x & 3.0.x APIs
+  + More internal changes to prepare for non-purple backends
+  + Updated/add Adium and Miranda ports
+  + Several build system fixes and improvements (including
+    sf#3092324, sf#3150482, sf#3091490, sf#3108246)
+  + Other bugs fixed: sf#3156430, sf#3161273, sf#3198585,
+    sf#3267073.
+- Drop pidgin-sipe-1.11.2-gcc46.patch: fixed upstream.
+- Add pkgconfig(gstreamer-0.10) and pkgconfig(nice) BuildRequires
+  on 12.1 and later (since 11.4 and earlier have a too old version
+  of libnice), to build Voice & Video call support.
+
 -------------------------------------------------------------------
 Mon May 23 08:50:03 UTC 2011 - idonmez@novell.com
 

pidgin-sipe.spec

@@ -19,17 +19,15 @@
 %define build_telepathy 0
 
 Name:           pidgin-sipe
-Version:        1.11.2
+Version:        1.12.0
-Release:        6
+Release:        1
 # FIXME: enable telepathy plugin when it'll be available (not in 1.11.0)
 # FIXME: enable kopete plugin when it'll be available (not in 1.11.0)
 License:        GPLv2+
 Summary:        Pidgin protocol plugin to connect to MS Office Communicator
 Url:            http://sipe.sourceforge.net/
 Group:          Productivity/Networking/Instant Messenger
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.12.0/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM pidgin-sipe-1.11.2-gcc46.patch sf#3306207 idoenmez@suse.de -- Remove write-only variables
-Patch1:         pidgin-sipe-1.11.2-gcc46.patch
 BuildRequires:  gettext-devel
 BuildRequires:  glib2-devel >= 2.12.0
 %if 0%{?suse_version} > 1110
@@ -42,6 +40,11 @@ BuildRequires:  libtool
 # For directory ownership
 BuildRequires:  pidgin
 BuildRequires:  translation-update-upstream
+%if 0%{?suse_version} > 1140
+# Put gstreamer in the %%if too, since it's only checked if we have libnice
+BuildRequires:  pkgconfig(gstreamer-0.10)
+BuildRequires:  pkgconfig(nice) >= 0.1.0
+%endif
 BuildRequires:  pkgconfig(nss)
 %if %{build_telepathy}
 BuildRequires:  pkgconfig(telepathy-glib)
@@ -97,7 +100,6 @@ various products:
 
 %prep
 %setup -q
-%patch1
 translation-update-upstream
 
 %build