From sunpoet@sunpoet.net  Sun Jun 10 10:32:45 2012
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B9EA0106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jun 2012 10:32:45 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 19C388FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jun 2012 10:32:45 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 3W9DFS4mhJz6Hm; Sun, 10 Jun 2012 18:32:28 +0800 (CST)
Message-Id: <3W9DFS4mhJz6Hm@sunpoet.net>
Date: Sun, 10 Jun 2012 18:32:28 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: josh.carroll@gmail.com
Subject: [PATCH] net/shaperprobe: update to latest release (Jan '12)
X-Send-Pr-Version: 3.113
X-GNATS-Notify: josh.carroll@gmail.com

>Number:         168916
>Category:       ports
>Synopsis:       [PATCH] net/shaperprobe: update to latest release (Jan '12)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 10 10:40:11 UTC 2012
>Closed-Date:    Wed Jul 04 08:33:26 UTC 2012
>Last-Modified:  Wed Jul 04 08:33:26 UTC 2012
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Thu May 31 14:45:51 CST 2012
>Description:
- Update to latest release (Jan '12)

Port maintainer (josh.carroll@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:

--- shaperprobe-0.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/shaperprobe/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile	12 Jun 2011 20:17:29 -0000	1.2
+++ Makefile	10 Jun 2012 10:31:44 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	shaperprobe
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cc.gatech.edu/~partha/diffprobe/
 DISTNAME=	${PORTNAME}
@@ -21,6 +22,6 @@
 PLIST_FILES=	bin/prober
 
 do-install:
-	@${INSTALL} ${WRKSRC}/prober ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/prober ${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/shaperprobe/distinfo,v
retrieving revision 1.1
diff -u -u -r1.1 distinfo
--- distinfo	12 Jun 2011 16:00:42 -0000	1.1
+++ distinfo	10 Jun 2012 10:31:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (shaperprobe.tgz) = 9b19cd96f987dad9a90873342325b5921537848ce8082af8a6798d79f49dffd6
-SIZE (shaperprobe.tgz) = 16455
+SHA256 (shaperprobe.tgz) = 0d978a0e6bd978c5ee4a47a0c38e31d07ac0def87a92ecd03a9d9d3951a63e6d
+SIZE (shaperprobe.tgz) = 16387
Index: files/patch-diffprobe.h
===================================================================
RCS file: /home/ncvs/ports/net/shaperprobe/files/patch-diffprobe.h,v
retrieving revision 1.1
diff -u -u -r1.1 patch-diffprobe.h
--- files/patch-diffprobe.h	12 Jun 2011 16:00:42 -0000	1.1
+++ files/patch-diffprobe.h	10 Jun 2012 10:31:44 -0000
@@ -1,12 +1,12 @@
---- ./diffprobe.h.orig	2009-12-01 12:47:55.000000000 -0800
-+++ ./diffprobe.h	2011-06-11 10:51:08.000000000 -0700
+--- diffprobe.h.orig	2012-01-25 04:33:22.000000000 +0800
++++ diffprobe.h	2012-06-07 16:32:41.050222578 +0800
 @@ -26,6 +26,8 @@
  #ifndef _DIFFPROBE_H_
  #define _DIFFPROBE_H_
  
 +#include <netinet/in.h>
 +
- #define VERSION 3
+ #define VERSION 4
  #define RATE_FACTOR 0.9
  #define RATE_DROP_FACTOR 2
 @@ -69,7 +71,7 @@
Index: files/patch-prober.c
===================================================================
RCS file: /home/ncvs/ports/net/shaperprobe/files/patch-prober.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-prober.c
--- files/patch-prober.c	12 Jun 2011 16:00:42 -0000	1.1
+++ files/patch-prober.c	10 Jun 2012 10:31:44 -0000
@@ -1,5 +1,5 @@
---- ./prober.c.orig	2009-11-29 00:47:46.000000000 -0800
-+++ ./prober.c	2011-06-11 10:51:08.000000000 -0700
+--- prober.c.orig	2012-01-25 04:33:22.000000000 +0800
++++ prober.c	2012-06-07 16:37:14.013216127 +0800
 @@ -34,6 +34,8 @@
  #include <stdlib.h>
  #include <string.h>
@@ -9,37 +9,47 @@
  #define __FAVOR_BSD /* For compilation in Linux.  */
  #include <netinet/in.h>
  #include <netinet/udp.h>
-@@ -356,27 +358,27 @@
-   //XXX: the meas code needs trains and lower cpu
+@@ -357,27 +359,27 @@
+   //following two lines for 802.11a/b/g/n links
    if(capacityup < 80000) capacityup = measupcap;
    if(capacitydown < 80000) capacitydown = measdowncap;
--  if(capacityup > 100000)
-+  /* if(capacityup > 100000)
-   {
- 	  printf("Upstream: greater than 100 Mbps.\n");
- 	  capacityup = 95000;
-   }
-   else
+-  if(capacityup > 200000)
 -  {
-+  { */
+-	  printf("Upstream: greater than 200 Mbps.\n");
+-	  capacityup = 195000;
+-  }
+-  else
+-  {
++//  if(capacityup > 200000)
++//  {
++//	  printf("Upstream: greater than 200 Mbps.\n");
++//	  capacityup = 195000;
++//  }
++//  else
++//  {
  	  printf("Upstream: %d Kbps.\n", (int)capacityup);
  //	  capacityup *= 0.95; //reduce loss-based aborts
 -  }
-+  /* } */
++//  }
    truecapup = capacityup;
--  if(capacitydown > 100000)
-+  /* if(capacitydown > 100000)
-   {
- 	  printf("Downstream: greater than 100 Mbps.\n");
- 	  capacitydown = 95000;
-   }
-   else
+-  if(capacitydown > 200000)
+-  {
+-	  printf("Downstream: greater than 200 Mbps.\n");
+-	  capacitydown = 195000;
+-  }
+-  else
 -  {
-+  { */
++//  if(capacitydown > 200000)
++//  {
++//	  printf("Downstream: greater than 200 Mbps.\n");
++//	  capacitydown = 195000;
++//  }
++//  else
++//  {
  	  printf("Downstream: %d Kbps.\n", (int)capacitydown);
  //	  capacitydown *= 0.95; //reduce loss-based aborts
 -  }
-+  /* } */
++//  }
    truecapdown = capacitydown;
  
    printf("\nThe measurement will last for about %.1f minutes. Please wait.\n",
--- shaperprobe-0.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jun 10 13:12:23 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168916 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 10 13:12:38 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: josh.carroll@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/168916: [PATCH] net/shaperprobe: update to latest release (Jan '12)
Date: Sun, 10 Jun 2012 13:12:30 UT

 Maintainer of net/shaperprobe,
 
 Please note that PR ports/168916 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/168916
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168916: commit references a PR
Date: Wed,  4 Jul 2012 08:27:29 +0000 (UTC)

 sunpoet     2012-07-04 08:27:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/shaperprobe      Makefile distinfo 
     net/shaperprobe/files patch-diffprobe.h patch-prober.c 
   Log:
   - Update to 0.2
   
   Note that maintainer requested author to release new version (Jan '12) as 0.2.
   
   PR:             ports/168916
   Submitted by:   sunpoet (myself)
   Approved by:    Josh Carroll <josh.carroll@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.3       +2 -2      ports/net/shaperprobe/Makefile
   1.2       +2 -2      ports/net/shaperprobe/distinfo
   1.2       +3 -3      ports/net/shaperprobe/files/patch-diffprobe.h
   1.2       +32 -22    ports/net/shaperprobe/files/patch-prober.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: sunpoet 
State-Changed-When: Wed Jul 4 08:33:24 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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