Hello community, here is the log from the commit of package pidgin-sipe for openSUSE:Factory checked in at Mon May 23 15:39:39 CEST 2011. -------- --- GNOME/pidgin-sipe/pidgin-sipe.changes 2010-12-07 13:20:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/pidgin-sipe/pidgin-sipe.changes 2011-05-23 11:10:21.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 23 08:50:03 UTC 2011 - idonmez@novell.com + +- Add pidgin-sipe-1.11.2-gcc46.patch: remove write-only variables + to fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pidgin-sipe-1.11.2-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin-sipe.spec ++++++ --- /var/tmp/diff_new_pack.kc4BPy/_old 2011-05-23 15:39:16.000000000 +0200 +++ /var/tmp/diff_new_pack.kc4BPy/_new 2011-05-23 15:39:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pidgin-sipe (Version 1.11.2) +# spec file for package pidgin-sipe # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: pidgin-sipe Version: 1.11.2 -Release: 1 +Release: 6 # 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+ @@ -28,6 +28,8 @@ Url: http://sipe.sourceforge.net/ Group: Productivity/Networking/Instant Messenger Source: %{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 @@ -95,6 +97,7 @@ %prep %setup -q +%patch1 translation-update-upstream %build ++++++ pidgin-sipe-1.11.2-gcc46.patch ++++++ --- 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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org