Date: Fri, 5 Nov 2004 05:26:50 +0900 (JST) From: KIMURA Yasuhiro <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73542: [MAINTAINER] irc/riece: fix DCC protocol bug of riece-rdcc Message-ID: <20041104202650.3883354D8@eastasia.home.utahime.org> Resent-Message-ID: <200411042030.iA4KUQwH047708@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Nov 04 20:30:25 GMT 2004 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041104202650.3883354D8>