ports/123173: update port: net/stone: update to 2.3d

Yoshihiko Sarumaru mistral at imasy.or.jp
Mon Apr 28 15:50:01 UTC 2008 

>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 at 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 at 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 <stdio.h>
- #include <stdlib.h>
-@@ -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 <kabe at sra-tohoku.co.jp>
-.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 <n>] [-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 <kabe at sra-tohoku.co.jp>
-.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 <n>] [-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:

More information about the freebsd-ports-bugs mailing list