From paulius@noname.csdl.lt  Fri Jan  3 06:03:00 2003
Return-Path: <paulius@noname.csdl.lt>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CEEFA37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Jan 2003 06:03:00 -0800 (PST)
Received: from noname.csdl.lt (noname.csdl.lt [194.176.40.182])
	by mx1.FreeBSD.org (Postfix) with SMTP id 9635343EA9
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Jan 2003 06:02:59 -0800 (PST)
	(envelope-from paulius@noname.csdl.lt)
Received: (qmail 275 invoked by uid 1000); 3 Jan 2003 14:02:57 -0000
Message-Id: <20030103140257.274.qmail@noname.csdl.lt>
Date: 3 Jan 2003 14:02:57 -0000
From: Paulius Bulotas <paulius@kaktusas.org>
Reply-To: Paulius Bulotas <paulius@kaktusas.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Upgrade net/etherboot -> 5.0.8
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46724
>Category:       ports
>Synopsis:       Upgrade net/etherboot -> 5.0.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ambrisko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 03 06:10:02 PST 2003
>Closed-Date:    Mon Feb 03 20:28:35 PST 2003
>Last-Modified:  Mon Feb 03 20:28:35 PST 2003
>Originator:     Paulius Bulotas
>Release:        FreeBSD 4.6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD noname.csdl.lt 4.6.2-RELEASE FreeBSD 4.6.2-RELEASE #0: Thu Aug 15 06:12:24 GMT 2002 root@test.csdl.lt:/usr/src/sys/compile/NONAME i386


	
>Description:
Upgrade Etherboot to 5.0.8
>How-To-Repeat:
Apply provided patch.
>Fix:
--- net/etherboot/Makefile.orig	Fri Jan  3 15:37:20 2003
+++ net/etherboot/Makefile	Fri Jan  3 15:37:34 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	etherboot
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.8
 CATEGORIES=	net
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITE_SUBDIR=	${PORTNAME}
--- net/etherboot/distinfo.orig	Fri Jan  3 15:37:20 2003
+++ net/etherboot/distinfo	Fri Jan  3 15:40:54 2003
@@ -1 +1 @@
-MD5 (etherboot-5.0.5.tar.bz2) = 1b7bcf5544ef8729bd6ea571ef8fc365
+MD5 (etherboot-5.0.8.tar.bz2) = 150e2b96961924e3c4e83c8de90d24fb
--- net/etherboot/files/patch-ab.orig	Fri Jan  3 15:37:20 2003
+++ net/etherboot/files/patch-ab	Fri Jan  3 15:52:49 2003
@@ -1,6 +1,6 @@
---- nfs.c.orig	Tue Mar 12 21:44:19 2002
-+++ nfs.c	Thu Mar 14 07:51:43 2002
-@@ -321,6 +321,14 @@
+--- nfs.c.orig	Mon Mar 18 00:18:17 2002
++++ nfs.c	Fri Jan  3 15:49:03 2003
+@@ -61,6 +61,14 @@
  	int retries;
  	long *p;
  
@@ -15,8 +15,23 @@
  	id = rpc_id++;
  	buf.u.call.id = htonl(id);
  	buf.u.call.type = htonl(MSG_CALL);
-@@ -336,9 +344,14 @@
- 	*p++ = 0;		/* unused parameter */
+@@ -267,6 +275,14 @@
+ 	int retries;
+ 	int pathlen = strlen(path);
+ 
++	static int tokens=0;
++	/*
++	 * Try to implement something similar to a window protocol in
++	 * terms of response to losses. On successful receive, increment
++	 * the number of tokens by 1 (cap at 256). On failure, halve it.
++	 * When the number of tokens is >= 2, use a very short timeout.
++	 */
++
+ 	id = rpc_id++;
+ 	buf.u.call.id = htonl(id);
+ 	buf.u.call.type = htonl(MSG_CALL);
+@@ -285,9 +301,14 @@
+ 	p += (pathlen + 3) / 4;
  	for (retries = 0; retries < MAX_RPC_RETRIES; retries++) {
  		long timeout = rfc2131_sleep_interval(TIMEOUT, retries);
 +		if (tokens >= 2)
@@ -30,8 +45,8 @@
  			rpc = (struct rpc_t *)&nic.packet[ETH_HLEN];
  			if (rpc->u.reply.rstatus || rpc->u.reply.verifier ||
  			    rpc->u.reply.astatus || rpc->u.reply.data[0]) {
-@@ -355,7 +368,8 @@
- 			} else {
+@@ -305,7 +326,8 @@
+ 				memcpy(nfh, rpc->u.reply.data + 1, NFS_FHSIZE);
  				return 0;
  			}
 -		}

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->ambrisko 
Responsible-Changed-By: arved 
Responsible-Changed-When: Tue Jan 7 14:15:36 PST 2003 
Responsible-Changed-Why:  
Over to Maintainer 

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

From: marius@alchemy.franken.de
To: Paulius Bulotas <paulius@kaktusas.org>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG, ambrisko@FreeBSD.ORG
Subject: Re: ports/46724: Upgrade net/etherboot -> 5.0.8
Date: Tue, 7 Jan 2003 23:35:09 +0100

 somebody please also fix the "from from" in the pkg-descr...
 
 futile# cat /usr/ports/net/etherboot/pkg-descr
 This code produce bootloaders for a number of cards that can be
 loaded from from raw or DOS-formatted floppy/hard disks and ROMs
        ^^^^^^^^^
 
State-Changed-From-To: open->closed 
State-Changed-By: ambrisko 
State-Changed-When: Mon Feb 3 20:23:22 PST 2003 
State-Changed-Why:  
Patch has been commited. 

Thanks, 

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