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: ports/121923: [patch] net/relayd unbreak on amd64 and sparc64 Message-ID: <1206032115.74348@gahrtop.localhost> Resent-Message-ID: <200803201930.m2KJU3vr020907@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121923
>Category: ports
>Synopsis: [patch] net/relayd unbreak on amd64 and sparc64
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 20 19:30:03 UTC 2008
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1206032115.74348>