From gahr@FreeBSD.org  Thu Mar 20 19:27:24 2008
Return-Path: <gahr@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9961D1065671
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Mar 2008 19:27:24 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from cpanel03.rubas-s03.net (cpanel03.rubas-s03.net [195.182.222.73])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EE5A8FC1F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Mar 2008 19:27:23 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from [213.142.182.66] (helo=gahrtop.localhost)
	by cpanel03.rubas-s03.net with esmtpa (Exim 4.68)
	(envelope-from <gahr@FreeBSD.org>)
	id 1JcO2w-0004nx-0Y
	for FreeBSD-gnats-submit@freebsd.org; Thu, 20 Mar 2008 17:55:18 +0100
Received: from gahrtop.localhost (localhost [127.0.0.1])
	by gahrtop.localhost (Postfix) with ESMTP id 78BF050848
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Mar 2008 17:55:15 +0100 (CET)
Message-Id: <1206032115.74348@gahrtop.localhost>
Date: Thu, 20 Mar 2008 17:55:15 +0100
From: "Pietro Cerutti" <gahr@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [patch] net/relayd unbreak on amd64 and sparc64
X-Send-Pr-Version: gtk-send-pr 0.4.9 
X-GNATS-Notify:

>Number:         121923
>Category:       ports
>Synopsis:       [patch] net/relayd unbreak on amd64 and sparc64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 20 19:30:03 UTC 2008
>Closed-Date:    Tue Apr 08 15:58:11 UTC 2008
>Last-Modified:  Tue Apr 08 15:58:11 UTC 2008
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
The FreeBSD Project 
>Environment:


System: FreeBSD 8.0-CURRENT #14: Mon Mar 17 14:56:26 CET 2008
    root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:





>How-To-Repeat:





>Fix:


--- relayd.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/relayd/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	19 Feb 2008 21:06:29 -0000	1.2
+++ Makefile	20 Mar 2008 16:28:09 -0000
@@ -52,10 +52,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN=		Does not compile
-.endif
-
 .if ${OSVERSION} < 502106
 IGNORE=	is of no use for you because your system is too old and doesn't have pf
 .endif
Index: files/patch-ctl-relayctl.c
===================================================================
RCS file: /home/pcvs/ports/net/relayd/files/patch-ctl-relayctl.c,v
retrieving revision 1.1
diff -u -r1.1 patch-ctl-relayctl.c
--- files/patch-ctl-relayctl.c	20 Jan 2008 21:38:26 -0000	1.1
+++ files/patch-ctl-relayctl.c	20 Mar 2008 16:27:40 -0000
@@ -1,5 +1,5 @@
---- relayctl/relayctl.c.orig	Thu Feb 22 14:59:13 2007
-+++ relayctl/relayctl.c	Fri Jun  8 13:00:53 2007
+--- relayctl/relayctl.c.orig	2007-12-20 21:15:43.000000000 +0100
++++ relayctl/relayctl.c	2008-03-20 17:15:14.000000000 +0100
 @@ -20,6 +20,7 @@
   */
  
@@ -8,7 +8,7 @@
  #include <sys/socket.h>
  #include <sys/queue.h>
  #include <sys/un.h>
-@@ -286,7 +287,7 @@
+@@ -297,7 +298,7 @@
  	imn = monitor_lookup(imsg->hdr.type);
  	printf("%s: imsg type %u len %u peerid %u pid %d\n", imn->name,
  	    imsg->hdr.type, imsg->hdr.len, imsg->hdr.peerid, imsg->hdr.pid);
@@ -17,3 +17,12 @@
  	if (imn->type == -1)
  		done = 1;
  	if (imn->func != NULL)
+@@ -508,7 +509,7 @@
+ 	printf("\t%8s\ttotal: %llu sessions\n"
+ 	    "\t%8s\tlast: %u/%us %u/h %u/d sessions\n"
+ 	    "\t%8s\taverage: %u/%us %u/h %u/d sessions\n",
+-	    "", crs.cnt,
++	    "", (long long unsigned)crs.cnt,
+ 	    "", crs.last, crs.interval,
+ 	    crs.last_hour, crs.last_day,
+ 	    "", crs.avg, crs.interval,
--- relayd.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 20 19:30:11 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121923 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Tue Apr 8 15:58:10 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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