From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 19 21:30:10 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D97F1065679 for ; Fri, 19 Nov 2010 21:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DECFE8FC18 for ; Fri, 19 Nov 2010 21:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAJLU9e1032243 for ; Fri, 19 Nov 2010 21:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAJLU9cx032238; Fri, 19 Nov 2010 21:30:09 GMT (envelope-from gnats) Resent-Date: Fri, 19 Nov 2010 21:30:09 GMT Resent-Message-Id: <201011192130.oAJLU9cx032238@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ildar Hizbulin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9510E1065674 for ; Fri, 19 Nov 2010 21:21:53 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6A51B8FC15 for ; Fri, 19 Nov 2010 21:21:53 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id oAJLLqK6051062 for ; Fri, 19 Nov 2010 21:21:52 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id oAJLLqUf051061; Fri, 19 Nov 2010 21:21:52 GMT (envelope-from nobody) Message-Id: <201011192121.oAJLLqUf051061@www.freebsd.org> Date: Fri, 19 Nov 2010 21:21:52 GMT From: Ildar Hizbulin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/152413: [PATCH] net-im/py-xmpppy fix patch fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Nov 2010 21:30:10 -0000 >Number: 152413 >Category: ports >Synopsis: [PATCH] net-im/py-xmpppy fix patch fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 19 21:30:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Ildar Hizbulin >Release: 7.3-RELEASE-p2 >Organization: Ariadna-Link, ISP >Environment: FreeBSD vpn2.vyborg.ru 7.3-RELEASE-p2 FreeBSD 7.3-RELEASE-p2 #1: Tue Jul 13 12:12:12 MSD 2010 root@vpn2.vyborg.ru:/usr/obj/usr/src/sys/VPN i386 >Description: Fix previous patch >How-To-Repeat: I use py-jabberbot: #!/usr/bin/env python from jabberbot import JabberBot, botcmd class ZeroJabberBot(JabberBot): @botcmd def whoami( self, mess, args): """Tells you your username""" return mess.getFrom() username = 'user@domain.com' password = 'securepass' bot = ZeroJabberBot(username,password) bot.serve_forever() after ran: Traceback (most recent call last): File "tstbot.py", line 15, in bot.serve_forever() File "/usr/local/lib/python2.6/site-packages/jabberbot.py", line 411, in serve_forever conn = self.connect() File "/usr/local/lib/python2.6/site-packages/jabberbot.py", line 126, in connect authres = conn.auth(self.jid.getNode(), self.__password, self.res) File "/usr/local/lib/python2.6/site-packages/xmpp/client.py", line 225, in auth while self.SASL.startsasl=='in-process' and self.Process(1): pass File "/usr/local/lib/python2.6/site-packages/xmpp/dispatcher.py", line 303, in dispatch handler['func'](session,stanza) File "/usr/local/lib/python2.6/site-packages/xmpp/auth.py", line 204, in SASLHandler A1=C([H(C([resp['username'],resp['realm'],self.password])),resp['nonce'],resp['cnonce']]) NameError: global name 'H' is not defined >Fix: diff -ruN py-xmpppy.orig/Makefile py-xmpppy/Makefile --- py-xmpppy.orig/Makefile 2010-11-20 00:11:00.000000000 +0300 +++ py-xmpppy/Makefile 2010-11-20 00:15:11.000000000 +0300 @@ -7,7 +7,7 @@ PORTNAME= xmpppy PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-rc1/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff -ruN py-xmpppy.orig/files/patch-xmpp-auth.py py-xmpppy/files/patch-xmpp-auth.py --- py-xmpppy.orig/files/patch-xmpp-auth.py 2010-11-20 00:11:00.000000000 +0300 +++ py-xmpppy/files/patch-xmpp-auth.py 2010-11-20 00:11:28.000000000 +0300 @@ -22,7 +22,7 @@ + """ For python version >= 2.6 """ + def _SHA(some): return hashlib.sha1(some) + def HH(some): return hashlib.md5(some).hexdigest() -+ def h(some): return hashlib.md5(some).digest() ++ def H(some): return hashlib.md5(some).digest() + + class NonSASL(PlugIn): >Release-Note: >Audit-Trail: >Unformatted: