From yasu@home.utahime.org  Thu Nov  4 20:26:56 2004
Return-Path: <yasu@home.utahime.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 302C716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Nov 2004 20:26:56 +0000 (GMT)
Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6750C43D6B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Nov 2004 20:26:55 +0000 (GMT)
	(envelope-from yasu@home.utahime.org)
Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1])
	by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id 7E128A995
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Nov 2004 05:26:50 +0900 (JST)
Received: from localhost.home.utahime.org (localhost.home.utahime.org [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 525AC5538;
	Fri,  5 Nov 2004 05:26:50 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1])
	by localhost.home.utahime.org (AvMailGate-2.0.2-5) id 23000-3820D5E9;
	Fri, 05 Nov 2004 05:26:50 +0900
Received: by eastasia.home.utahime.org (Postfix, from userid 1000)
	id 3883354D8; Fri,  5 Nov 2004 05:26:50 +0900 (JST)
Message-Id: <20041104202650.3883354D8@eastasia.home.utahime.org>
Date: Fri,  5 Nov 2004 05:26:50 +0900 (JST)
From: KIMURA Yasuhiro <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [MAINTAINER] irc/riece: fix DCC protocol bug of riece-rdcc
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73542
>Category:       ports
>Synopsis:       [MAINTAINER] irc/riece: fix DCC protocol bug of riece-rdcc
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 04 20:30:25 GMT 2004
>Closed-Date:    Sat Nov 06 13:17:20 GMT 2004
>Last-Modified:  Sat Nov 06 13:17:20 GMT 2004
>Originator:     KIMURA Yasuhiro
>Release:        FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD eastasia.home.utahime.org 4.10-RELEASE-p3 FreeBSD 4.10-RELEASE-p3 #0: Mon Sep 20 23:12:27 JST 2004 root@eastasia.home.utahime.org:/usr/obj/usr1/cvsup/releng_4_10/src/sys/EASTASIA i386


	
>Description:
	

	Apply a patch from original author which fixes DCC protocol bug
	of riece-rdcc.

>How-To-Repeat:
	
>Fix:

	

--- port.irc.riece.diff begins here ---
diff -Nru irc/riece-1.0.4,1/Makefile irc/riece/Makefile
--- irc/riece-1.0.4,1/Makefile	Thu Nov  4 06:03:34 2004
+++ irc/riece/Makefile	Fri Nov  5 05:04:12 2004
@@ -6,6 +6,7 @@
 
 PORTNAME=	riece
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://wiliki.designflaw.org/riece/
diff -Nru irc/riece-1.0.4,1/files/patch-lisp::riece-rdcc.el irc/riece/files/patch-lisp::riece-rdcc.el
--- irc/riece-1.0.4,1/files/patch-lisp::riece-rdcc.el	Thu Jan  1 09:00:00 1970
+++ irc/riece/files/patch-lisp::riece-rdcc.el	Fri Nov  5 05:01:15 2004
@@ -0,0 +1,43 @@
+Index: lisp/riece-rdcc.el
+===================================================================
+RCS file: /cvs/root/riece/lisp/riece-rdcc.el,v
+retrieving revision 1.26
+diff -u -F^( -r1.26 riece-rdcc.el
+--- lisp/riece-rdcc.el	6 Jun 2004 06:11:59 -0000	1.26
++++ lisp/riece-rdcc.el	4 Nov 2004 07:12:26 -0000
+@@ -64,6 +64,9 @@ (defcustom riece-rdcc-send-program
+       total += bytes.length
+       puts(\"#{total}\")
+       session.write(bytes)
++      begin
++        buf = session.read(4)
++      end until buf.unpack('N')[0] == total
+     end
+   }
+   session.close
+@@ -198,13 +201,21 @@ (defun riece-rdcc-filter (process input)
+     (let ((coding-system-for-write 'binary)
+ 	  jka-compr-compression-info-list jam-zcat-filename-list)
+       (write-region (point-min) (point-max) riece-rdcc-temp-file t 0))
++    (setq riece-rdcc-received-size (+ (buffer-size) riece-rdcc-received-size))
++    (process-send-string
++     process
++     (format "%c%c%c%c"
++	     (logand (lsh riece-rdcc-received-size -24) 255)
++	     (logand (lsh riece-rdcc-received-size -16) 255)
++	     (logand (lsh riece-rdcc-received-size -8) 255)
++	     (logand riece-rdcc-received-size 255)))
+     (message "Receiving %s from %s...(%s/%s)"
+ 	     (file-name-nondirectory riece-rdcc-request-file)
+ 	     riece-rdcc-request-user
+-	     (riece-rdcc-format-size
+-	      (setq riece-rdcc-received-size (+ (buffer-size)
+-						riece-rdcc-received-size)))
+-	     (riece-rdcc-format-size riece-rdcc-request-size))))
++	     (riece-rdcc-format-size riece-rdcc-received-size)
++	     (riece-rdcc-format-size riece-rdcc-request-size))
++    (if (= riece-rdcc-received-size riece-rdcc-request-size)
++	(set-process-filter process nil))))
+ 
+ (defun riece-rdcc-sentinel (process status)
+   (save-excursion
--- port.irc.riece.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Nov 6 13:17:13 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73542 
>Unformatted:
