From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 28 15:50:01 2008 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 DD8401065677 for ; Mon, 28 Apr 2008 15:50:01 +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 BF5AB8FC1A for ; Mon, 28 Apr 2008 15:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3SFo1Q7084237 for ; Mon, 28 Apr 2008 15:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3SFo1KA084236; Mon, 28 Apr 2008 15:50:01 GMT (envelope-from gnats) Resent-Date: Mon, 28 Apr 2008 15:50:01 GMT Resent-Message-Id: <200804281550.m3SFo1KA084236@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, Yoshihiko Sarumaru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1A8A1065670 for ; Mon, 28 Apr 2008 15:41:32 +0000 (UTC) (envelope-from mistral@imasy.or.jp) Received: from sachiko.yamayuri.org (yumi.yamayuri.org [218.45.22.23]) by mx1.freebsd.org (Postfix) with ESMTP id 6769F8FC19 for ; Mon, 28 Apr 2008 15:41:32 +0000 (UTC) (envelope-from mistral@imasy.or.jp) Received: from sachiko.yamayuri.org (localhost [127.0.0.1]) by sachiko.yamayuri.org (8.14.2/8.14.2/shimako) with ESMTP id m3SF0lfO014965 for ; Tue, 29 Apr 2008 00:00:48 +0900 (JST) (envelope-from mistral@imasy.or.jp) Received: (from sarumaru@localhost) by sachiko.yamayuri.org (8.14.2/8.14.2/Submit) id m3SF0lja014964; Tue, 29 Apr 2008 00:00:47 +0900 (JST) (envelope-from sarumaru) Message-Id: <200804281500.m3SF0lja014964@sachiko.yamayuri.org> Date: Tue, 29 Apr 2008 00:00:47 +0900 (JST) From: Yoshihiko Sarumaru To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/123173: update port: net/stone: update to 2.3d X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yoshihiko Sarumaru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2008 15:50:01 -0000 >Number: 123173 >Category: ports >Synopsis: update port: net/stone: update to 2.3d >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 28 15:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yoshihiko Sarumaru >Release: FreeBSD 6.3-STABLE i386 >Organization: >Environment: System: FreeBSD sachiko.yamayuri.org 6.3-STABLE FreeBSD 6.3-STABLE #9: Sat Jan 19 23:25:35 JST 2008 sarumaru@sachiko.yamayuri.org:/usr/obj/usr/src/sys/VGN-TX92S i386 >Description: update net/stone to the latest version. some bug fixes was performed in this version. >How-To-Repeat: >Fix: Notes: - files/patch-stone.c will be removed because it was included in the latest. - patch to files/stone.1.ja was encoded in EUC-JP. diff -urN stone/Makefile stone-2.3e/Makefile --- stone/Makefile 2007-10-24 01:32:48.000000000 +0900 +++ stone-2.3e/Makefile 2008-04-28 23:41:26.000000000 +0900 @@ -6,14 +6,15 @@ # PORTNAME= stone -PORTVERSION= 2.3d -PORTREVISION= 1 +PORTVERSION= 2.3e CATEGORIES= net ipv6 MASTER_SITES= http://www.gcd.org/sengoku/stone/ MAINTAINER= mistral@imasy.or.jp COMMENT= Stone is a TCP/IP packet repeater in the application layer +WRKSRC= ${WRKDIR}/${PORTNAME}-2.3d-2.3.2.7 + MAN1= stone.1 MANLANG= "" ja diff -urN stone/distinfo stone-2.3e/distinfo --- stone/distinfo 2007-10-08 21:53:36.000000000 +0900 +++ stone-2.3e/distinfo 2008-04-28 23:26:40.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (stone-2.3d.tar.gz) = e4ea40fdc5249f81d854925dafb5fb1f -SHA256 (stone-2.3d.tar.gz) = 9b27a339e04363f36832d9a4d749ff62c6e72b66e54fb542df53620a68c0528b -SIZE (stone-2.3d.tar.gz) = 92665 +MD5 (stone-2.3e.tar.gz) = 3d1ac4e3fd1118ad1acad06f9209f7f4 +SHA256 (stone-2.3e.tar.gz) = b2b664ee6771847672e078e7870e56b886be70d9ff3d7b20d0b3d26ee950c670 +SIZE (stone-2.3e.tar.gz) = 92587 diff -urN stone/files/patch-stone.c stone-2.3e/files/patch-stone.c --- stone/files/patch-stone.c 2007-10-24 01:32:49.000000000 +0900 +++ stone-2.3e/files/patch-stone.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,58 +0,0 @@ -=================================================================== -RCS file: /cvsroot/stone/stone/stone.c,v -retrieving revision 2.3.2.1 -retrieving revision 2.3.2.2 -diff -u -r2.3.2.1 -r2.3.2.2 ---- stone.c 2007/10/05 21:59:48 2.3.2.1 -+++ stone.c 2007/10/22 03:07:17 2.3.2.2 -@@ -93,7 +93,7 @@ - */ - #define VERSION "2.3d" - static char *CVS_ID = --"@(#) $Id: stone.c,v 2.3.2.1 2007/10/05 21:59:48 hiroaki_sengoku Exp $"; -+"@(#) $Id: stone.c,v 2.3.2.2 2007/10/22 03:07:17 hiroaki_sengoku Exp $"; - - #include - #include -@@ -3047,9 +3047,6 @@ - time(&pair->clock); - if (p) p->clock = pair->clock; - pair->tx += len; -- if ((pair->xhost->mode & XHostsMode_Dump) > 0 -- || ((pair->proto & proto_first_w) && Debug > 3)) -- message_buf(pair, len, "UDP"); - return 0; /* success */ - } - -@@ -3143,9 +3140,15 @@ - if (ex != pair->b) ungetExBuf(ex); - if (pos >= len) { /* complete the packet */ - complete: -- if (!err) err = sendPairUDPbuf(stone, pair, -- (char*)(buf+UDP_HEAD_LEN), -- len-UDP_HEAD_LEN); -+ if (!err) { -+ err = sendPairUDPbuf(stone, pair, (char*)(buf+UDP_HEAD_LEN), -+ len-UDP_HEAD_LEN); -+ if (!err) { -+ if ((pair->xhost->mode & XHostsMode_Dump) > 0 -+ || ((pair->proto & proto_first_w) && Debug > 3)) -+ message_buf(pair, len, "tu"); -+ } -+ } - if (cur != pair->b) ungetExBuf(cur); - cur = NULL; - } -@@ -3810,7 +3813,11 @@ - message(LOG_DEBUG, "%d TCP %d: connecting to TCP %d %s", - p1->stone->sd, p2->sd, p1->sd, addrport); - } -- ret = connect(p1->sd, dst, dstlen); -+ if (p1->proto & proto_dgram) { -+ ret = 0; /* do nothing */ -+ } else { -+ ret = connect(p1->sd, dst, dstlen); -+ } - if (ret < 0) { - #ifdef WINDOWS - errno = WSAGetLastError(); diff -urN stone/files/stone.1 stone-2.3e/files/stone.1 --- stone/files/stone.1 2007-10-08 23:06:38.000000000 +0900 +++ stone-2.3e/files/stone.1 2008-04-28 23:30:05.000000000 +0900 @@ -1,5 +1,5 @@ .\" Roff format skeleton provided by Taketo Kabe -.TH stone 1 "version 2.3d" +.TH stone 1 "version 2.3e" . .SH NAME stone \- Simple Repeater @@ -9,7 +9,7 @@ .br .B " [-u \fImax\fP] [-f \fIn\fP] [-l] [-L \fIfile\fP] [-a \fIfile\fP] [-i \fIfile\fP]" .br -.B " [-X \fIn\fP] [-T \fIn\fP] [-r]" +.B " [-X \fIn\fP] [-T \fIn\fP] [-A ] [-r]" .br .B " [-x \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... --]" .br @@ -44,7 +44,7 @@ . .TP .B 2. Simple. -\fBStone\fP's source code is only 9000 lines long (written in C +\fBStone\fP's source code is only 10000 lines long (written in C language), so you can minimize the risk of security holes. . @@ -99,8 +99,10 @@ The \fB-X\fP \fIn\fP flag alters the buffer size of the repeater. The default value is 1000 bytes. If the \fB-T\fP \fIn\fP is used, the timeout of TCP sessions can be -specified to \fIn\fP sec. Default: 600 (10 min). The \fB-r\fP flag is -used, SO_REUSEADDR is set on the socket of \fIst\fP . +specified to \fIn\fP sec. Default: 600 (10 min). +The \fB-A\fP flag specifies the maximum length the +queue of pending connections may grow to. Default: 50. +The \fB-r\fP flag is used, SO_REUSEADDR is set on the socket of \fIst\fP. .P Using the \fB-x\fP \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... \fB--\FP flag, the http proxy (described later) can only connect to diff -urN stone/files/stone.1.ja stone-2.3e/files/stone.1.ja --- stone/files/stone.1.ja 2007-10-08 22:14:23.000000000 +0900 +++ stone-2.3e/files/stone.1.ja 2008-04-28 23:30:11.000000000 +0900 @@ -1,5 +1,5 @@ .\" Roff format skeleton provided by Taketo Kabe -.TH stone 1 "version 2.3d" +.TH stone 1 "version 2.3e" . .SH 名称 stone \- Simple Repeater @@ -9,7 +9,7 @@ .br .B " [-u \fImax\fP] [-f \fIn\fP] [-l] [-L \fIfile\fP] [-a \fIfile\fP] [-i \fIfile\fP]" .br -.B " [-X \fIn\fP] [-T \fIn\fP] [-r]" +.B " [-X \fIn\fP] [-T \fIn\fP] [-A ] [-r]" .br .B " [-x \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... --]" .br @@ -45,7 +45,7 @@ . .TP .B 2. 単純 -わずか 9000 行 (C 言語) ですので、セキュリティホールが生じる可能 +わずか 10000 行 (C 言語) ですので、セキュリティホールが生じる可能 性を最小限にできます。 . .TP @@ -93,8 +93,10 @@ .P \fB-X\fP は中継を行なう際のバッファの大きさを指定します。デフォルトは 1000 バイトです。\fB-T\fP を指定すると TCP セッションのタイムアウトの -秒数を変更できます。デフォルトは 600 (10 分) です。\fB-r\fP を指定する -と \fIst\fP のソケットに SO_REUSEADDR を設定します。 +秒数を変更できます。デフォルトは 600 (10 分) です。 +\fB-A\fP を指定すると listen 呼び出しの未処理接続キューの最大長を変更できます。 +デフォルトは 50 です。 +\fB-r\fP を指定すると \fIst\fP のソケットに SO_REUSEADDR を設定します。 .P \fB-x\fP を指定すると http proxy の接続先を制限できます。接続先のポー ト番号のリスト \fIport\fP[,\fIport\fP][-\fIport\fP]... および接続先ホストの >Release-Note: >Audit-Trail: >Unformatted: