Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 92ABA7A476 for ; Wed, 6 Jul 2016 05:57:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0E5B085E8E; Wed, 6 Jul 2016 05:57:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9098585E89 for ; Wed, 6 Jul 2016 05:57:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xV_Ln0sBhgoO for ; Wed, 6 Jul 2016 05:57:52 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0BC5B85E61 for ; Wed, 6 Jul 2016 05:57:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F2B33FBB5; Wed, 6 Jul 2016 05:57:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146778467180290" MIME-Version: 1.0 Date: Wed, 6 Jul 2016 05:57:51 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/chat/libpurple To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160706055751.F2B33FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146778467180290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Jul 6 05:57:51 UTC 2016 Modified Files: pkgsrc/chat/libpurple: distinfo Added Files: pkgsrc/chat/libpurple/patches: patch-libpurple_protocols_jabber_auth__scram.c Log Message: Fix conflict with NetBSD's hmac(3) function. Makes this build again on NetBSD-7.99.33. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/chat/libpurple/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146778467180290 Content-Disposition: inline Content-Length: 3140 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/libpurple/distinfo diff -u pkgsrc/chat/libpurple/distinfo:1.44 pkgsrc/chat/libpurple/distinfo:1.45 --- pkgsrc/chat/libpurple/distinfo:1.44 Wed Jan 13 22:25:38 2016 +++ pkgsrc/chat/libpurple/distinfo Wed Jul 6 05:57:51 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2016/01/13 22:25:38 wiz Exp $ +$NetBSD: distinfo,v 1.45 2016/07/06 05:57:51 wiz Exp $ SHA1 (pidgin-2.10.12.tar.bz2) = 4550a447f35b869554c2d7d7bc1c7d84a01ce238 RMD160 (pidgin-2.10.12.tar.bz2) = 22b14ba35cef488cb25d89b59aeb6c9923a4d924 @@ -6,4 +6,5 @@ SHA512 (pidgin-2.10.12.tar.bz2) = 4756be Size (pidgin-2.10.12.tar.bz2) = 9837598 bytes SHA1 (patch-configure) = 74d033d148d74d0233c7ad33411b9ebcfbab7851 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 40326826000ed42e7570486f89f3196b58093d48 +SHA1 (patch-libpurple_protocols_jabber_auth__scram.c) = 26384081c1065a26185019d715a007653b496e1e SHA1 (patch-libpurple_protocols_mxit_profile.c) = e14883061131da2a3d31479584c5b267e451b721 Added files: Index: pkgsrc/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c diff -u /dev/null pkgsrc/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c:1.1 --- /dev/null Wed Jul 6 05:57:51 2016 +++ pkgsrc/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c Wed Jul 6 05:57:51 2016 @@ -0,0 +1,38 @@ +$NetBSD: patch-libpurple_protocols_jabber_auth__scram.c,v 1.1 2016/07/06 05:57:51 wiz Exp $ + +Fix conflict with NetBSD's hmac(3) function. + +--- libpurple/protocols/jabber/auth_scram.c.orig 2015-12-31 23:19:40.000000000 +0000 ++++ libpurple/protocols/jabber/auth_scram.c +@@ -134,7 +134,7 @@ guchar *jabber_scram_hi(const JabberScra + * Needless to say, these are fragile. + */ + static void +-hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str) ++purple_hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str) + { + PurpleCipherContext *context; + +@@ -187,18 +187,18 @@ jabber_scram_calc_proofs(JabberScramData + return FALSE; + + /* client_key = HMAC(salted_password, "Client Key") */ +- hmac(data->hash, client_key, salted_password, "Client Key"); ++ purple_hmac(data->hash, client_key, salted_password, "Client Key"); + /* server_key = HMAC(salted_password, "Server Key") */ +- hmac(data->hash, server_key, salted_password, "Server Key"); ++ purple_hmac(data->hash, server_key, salted_password, "Server Key"); + g_free(salted_password); + + /* stored_key = HASH(client_key) */ + hash(data->hash, stored_key, client_key); + + /* client_signature = HMAC(stored_key, auth_message) */ +- hmac(data->hash, client_signature, stored_key, data->auth_message->str); ++ purple_hmac(data->hash, client_signature, stored_key, data->auth_message->str); + /* server_signature = HMAC(server_key, auth_message) */ +- hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str); ++ purple_hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str); + + /* client_proof = client_key XOR client_signature */ + for (i = 0; i < hash_len; ++i) --_----------=_146778467180290--