From scode@hyperion.scode.org  Sun Jan 13 07:32:49 2008
Return-Path: <scode@hyperion.scode.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90DA816A417
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Jan 2008 07:32:49 +0000 (UTC)
	(envelope-from scode@hyperion.scode.org)
Received: from hyperion.scode.org (hyperion.scode.org [85.17.42.115])
	by mx1.freebsd.org (Postfix) with ESMTP id 787B013C4D5
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Jan 2008 07:32:49 +0000 (UTC)
	(envelope-from scode@hyperion.scode.org)
Received: by hyperion.scode.org (Postfix, from userid 1001)
	id D9ACD23C424; Sun, 13 Jan 2008 08:32:47 +0100 (CET)
Message-Id: <20080113073247.D9ACD23C424@hyperion.scode.org>
Date: Sun, 13 Jan 2008 08:32:47 +0100 (CET)
From: peter.schuller@infidyne.com
Reply-To: peter.schuller@infidyne.com
To: FreeBSD-gnats-submit@freebsd.org
Cc: garga@freebsd.org
Subject: [patch] net-im/jabber-pyicq broken with utf-8 decoding errors
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         119619
>Category:       ports
>Synopsis:       [patch] net-im/jabber-pyicq broken with utf-8 decoding errors
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 13 07:40:00 UTC 2008
>Closed-Date:    Tue Jan 15 13:12:22 UTC 2008
>Last-Modified:  Tue Jan 15 13:20:01 UTC 2008
>Originator:     peter.schuller@infidyne.com
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD hyperion.scode.org 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Fri Oct 19 05:50:09 CEST 2007 scode@hyperion.scode.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
	After an upgrade to current versions of ports, ICQ presence code fails with:

	exceptions.UnicodeDecodeError: 'utf8' codec can't decode byte 0x97 in
	position 19: unexpected code byte

	There are several issues open that describe this upstream. This patch
	applies the change suggested here (and bumps PORTREVISION):

		http://code.google.com/p/pyicqt/issues/detail?id=79
>How-To-Repeat:
>Fix:
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net-im/jabber-pyicq.orig/Makefile /usr/ports/net-im/jabber-pyicq/Makefile
--- /usr/ports/net-im/jabber-pyicq.orig/Makefile	2007-06-15 22:57:18.000000000 +0200
+++ /usr/ports/net-im/jabber-pyicq/Makefile	2008-01-13 08:25:44.801860827 +0100
@@ -6,6 +6,7 @@
 
 PORTNAME=	pyicq
 PORTVERSION=	0.8a
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
 PKGNAMEPREFIX=	jabber-
diff -ruN --exclude=CVS /usr/ports/net-im/jabber-pyicq.orig/files/patch-src_legacy_icqt.py /usr/ports/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py
--- /usr/ports/net-im/jabber-pyicq.orig/files/patch-src_legacy_icqt.py	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py	2008-01-13 08:22:00.559630072 +0100
@@ -0,0 +1,12 @@
+--- src/legacy/icqt.py.orig	2008-01-09 04:58:42.000000000 +0100
++++ src/legacy/icqt.py	2008-01-13 08:06:51.411126927 +0100
+@@ -327,7 +327,8 @@
+ 					status = msg[0] + ": " + status
+ 
+ 			status = status.decode(charset, 'replace')
+-			LogEvent(INFO, self.session.jabberID, "Away (%s, %s) message %s" % (charset, msg[0], status))
++			utfmsg = unicode(msg[0], errors='replace')
++			LogEvent(INFO, self.session.jabberID, "Away (%s, %s) message %s" % (charset, utfmsg[0], status))
+ 
+ 		if status == "Away" or status=="I am currently away from the computer." or status=="I am away from my computer right now.":
+ 			status = ""


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 13 07:40:07 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119619 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Tue Jan 15 13:12:20 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119619 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/119619: commit references a PR
Date: Tue, 15 Jan 2008 13:11:33 +0000 (UTC)

 garga       2008-01-15 13:11:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/jabber-pyicq  Makefile 
     net-im/jabber-pyicq/files jabber-pyicq-transport.sh.in 
   Added files:
     net-im/jabber-pyicq/files patch-src_legacy_icqt.py 
   Log:
   - Fix UTF8 decoding errors [1]
   - Fix startup script rcorder conflict with jabberd [2]
   - Bump PORTREVISION
   
   PR:             ports/119619 [1]
   Submitted by:   peter.schuller@infidyne.com [1]
                   Guido Falsi <mad@madpilot.net. [2]
   
   Revision  Changes    Path
   1.22      +1 -0      ports/net-im/jabber-pyicq/Makefile
   1.9       +1 -2      ports/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
   1.1       +12 -0     ports/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
