tags 625404 + pending tags 630638 + pending thanks Dear maintainer,
I've prepared an NMU for pidgin-sipe (versioned as 1.11.2-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Various Artists: Green Fields of France
diff -Nru pidgin-sipe-1.11.2/debian/changelog pidgin-sipe-1.11.2/debian/changelog --- pidgin-sipe-1.11.2/debian/changelog 2010-11-03 08:21:34.000000000 +0100 +++ pidgin-sipe-1.11.2/debian/changelog 2011-12-23 15:34:16.000000000 +0100 @@ -1,3 +1,16 @@ +pidgin-sipe (1.11.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with pdigin 2.8.0-1 in unstable": + add patch sipe-purple-2.8.0.patch from archlinux, forwarded to the BTS + by Islam Amer. + (Closes: #630638) + * Fix "ftbfs with gcc-4.6 -Werror": + add patch fix-werror.patch from peter green. + (Closes: #625404) (LP: #832881) + + -- gregor herrmann <[email protected]> Fri, 23 Dec 2011 15:31:52 +0100 + pidgin-sipe (1.11.2-1) unstable; urgency=low * New upstream version diff -Nru pidgin-sipe-1.11.2/debian/patches/fix-werror.patch pidgin-sipe-1.11.2/debian/patches/fix-werror.patch --- pidgin-sipe-1.11.2/debian/patches/fix-werror.patch 1970-01-01 01:00:00.000000000 +0100 +++ pidgin-sipe-1.11.2/debian/patches/fix-werror.patch 2011-12-23 15:23:50.000000000 +0100 @@ -0,0 +1,166 @@ +Description: fix errors with gcc-4.6 + fix errors caused by new warnings in gcc-4.6 combined with -Werror +Bug-Debian: http://bugs.debian.org/625404 + +--- pidgin-sipe-1.11.2.orig/src/core/sipe-digest.c ++++ pidgin-sipe-1.11.2/src/core/sipe-digest.c +@@ -41,13 +41,12 @@ static void sipe_digest(const SECOidTag + 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 @@ sipe_digest_hmac_ctx_create(CK_MECHANISM + SECItem noParams; + PK11SymKey* SymKey; + PK11Context* DigestContext; +- SECStatus s; + + /* For key */ + slot = PK11_GetBestSlot(hmacMech, NULL); +@@ -77,7 +75,7 @@ sipe_digest_hmac_ctx_create(CK_MECHANISM + + DigestContext = PK11_CreateContextBySymKey(hmacMech, CKA_SIGN, SymKey, &noParams); + +- s = PK11_DigestBegin(DigestContext); ++ PK11_DigestBegin(DigestContext); + + PK11_FreeSymKey(SymKey); + PK11_FreeSlot(slot); +--- pidgin-sipe-1.11.2.orig/src/core/sip-sec-ntlm-tests.c ++++ pidgin-sipe-1.11.2/src/core/sip-sec-ntlm-tests.c +@@ -124,7 +124,6 @@ gboolean sip_sec_ntlm_tests(void) + 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 @@ Response: + 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 @@ Message (length 352): + 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 @@ Message (length 352): + 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.orig/src/core/sipe.c ++++ pidgin-sipe-1.11.2/src/core/sipe.c +@@ -1526,16 +1526,12 @@ static void sipe_process_registration_no + 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 @@ static void process_incoming_notify_msrt + 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 @@ static void process_incoming_notify_msrt + 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 @@ sipe_publish_get_category_cal_free_busy( + 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 @@ sipe_publish_get_category_cal_free_busy( + 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 + */ +--- pidgin-sipe-1.11.2.orig/src/core/sip-sec-krb5.c ++++ pidgin-sipe-1.11.2/src/core/sip-sec-krb5.c +@@ -281,13 +281,12 @@ sip_sec_krb5_print_gss_error0(char *func + 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, +--- pidgin-sipe-1.11.2.orig/src/core/sipe-incoming.c ++++ pidgin-sipe-1.11.2/src/core/sipe-incoming.c +@@ -255,7 +255,6 @@ void process_incoming_invite(struct sipe + 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 @@ void process_incoming_invite(struct sipe + } + } + if (trig_invite && !g_strcasecmp(trig_invite, "TRUE")) { +- is_triggered = TRUE; + is_multiparty = TRUE; + } + diff -Nru pidgin-sipe-1.11.2/debian/patches/series pidgin-sipe-1.11.2/debian/patches/series --- pidgin-sipe-1.11.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ pidgin-sipe-1.11.2/debian/patches/series 2011-12-23 15:21:25.000000000 +0100 @@ -0,0 +1,2 @@ +sipe-purple-2.8.0.patch +fix-werror.patch diff -Nru pidgin-sipe-1.11.2/debian/patches/sipe-purple-2.8.0.patch pidgin-sipe-1.11.2/debian/patches/sipe-purple-2.8.0.patch --- pidgin-sipe-1.11.2/debian/patches/sipe-purple-2.8.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ pidgin-sipe-1.11.2/debian/patches/sipe-purple-2.8.0.patch 2011-12-23 15:14:24.000000000 +0100 @@ -0,0 +1,60 @@ +diff -drupN pidgin-sipe-1.11.2/src/purple/purple-dnsquery.c pidgin-sipe-1.11.2-new/src/purple/purple-dnsquery.c +--- pidgin-sipe-1.11.2/src/purple/purple-dnsquery.c 2010-11-03 05:13:51.000000000 +0100 ++++ pidgin-sipe-1.11.2-new/src/purple/purple-dnsquery.c 2011-06-11 00:14:57.000000000 +0200 +@@ -22,6 +22,10 @@ + + #include "glib.h" + ++#include "version.h" ++#if PURPLE_VERSION_CHECK(2,8,0) ++#include "account.h" ++#endif + #include "dnssrv.h" + + #include "sipe-backend.h" +diff -drupN pidgin-sipe-1.11.2/src/purple/purple-plugin.c pidgin-sipe-1.11.2-new/src/purple/purple-plugin.c +--- pidgin-sipe-1.11.2/src/purple/purple-plugin.c 2010-11-03 05:13:51.000000000 +0100 ++++ pidgin-sipe-1.11.2-new/src/purple/purple-plugin.c 2011-06-10 23:58:20.000000000 +0200 +@@ -506,6 +506,10 @@ static PurplePluginProtocolInfo prpl_inf + NULL, /* get_moods */ + NULL, /* set_public_alias */ + NULL, /* get_public_alias */ ++#if PURPLE_VERSION_CHECK(2,8,0) ++ NULL, /* add_buddy_with_invite */ ++ NULL, /* add_buddies_with_invite */ ++#endif + #endif + #endif + #endif +diff -drupN pidgin-sipe-1.11.2/src/purple/purple-private.h pidgin-sipe-1.11.2-new/src/purple/purple-private.h +--- pidgin-sipe-1.11.2/src/purple/purple-private.h 2010-11-03 05:13:51.000000000 +0100 ++++ pidgin-sipe-1.11.2-new/src/purple/purple-private.h 2011-06-11 00:14:49.000000000 +0200 +@@ -20,18 +20,28 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include "version.h" ++ + /* Forward declarations */ + struct sipe_core_public; + struct _PurpleAccount; + struct _PurpleConnection; ++#if PURPLE_VERSION_CHECK(2,8,0) ++struct _PurpleSrvTxtQueryData; ++#else + struct _PurpleSrvQueryData; ++#endif + struct _PurpleXfer; + + struct sipe_backend_private { + struct sipe_core_public *public; + struct _PurpleConnection *gc; + struct _PurpleAccount *account; ++#if PURPLE_VERSION_CHECK(2,8,0) ++ struct _PurpleSrvTxtQueryData *dns_query; ++#else + struct _PurpleSrvQueryData *dns_query; ++#endif + time_t last_keepalive; + }; +
signature.asc
Description: Digital signature
