From leres@ee.lbl.gov  Thu Oct 24 18:57:58 2013
Return-Path: <leres@ee.lbl.gov>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id A605CBAE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Oct 2013 18:57:58 +0000 (UTC)
	(envelope-from leres@ee.lbl.gov)
Received: from fun.ee.lbl.gov (fun.ee.lbl.gov [IPv6:2620:83:8000:102::ca])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 903B72313
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Oct 2013 18:57:58 +0000 (UTC)
Received: from fun.ee.lbl.gov (localhost [127.0.0.1])
	by fun.ee.lbl.gov (8.14.7/8.14.7) with ESMTP id r9OIvw73053562
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 24 Oct 2013 11:57:58 -0700 (PDT)
Received: (from leres@localhost)
	by fun.ee.lbl.gov (8.14.7/8.14.7/Submit) id r9OIvw7B053561;
	Thu, 24 Oct 2013 11:57:58 -0700 (PDT)
Message-Id: <201310241857.r9OIvw7B053561@fun.ee.lbl.gov>
Date: Thu, 24 Oct 2013 11:57:58 -0700 (PDT)
From: Craig Leres <leres@ee.lbl.gov>
Reply-To: Craig Leres <leres@ee.lbl.gov>
To: FreeBSD-gnats-submit@freebsd.org
Cc: leres@ee.lbl.gov
Subject: [PATCH] security/bro: patch newest pkg-fallout/clang problem
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183279
>Category:       ports
>Synopsis:       [PATCH] security/bro: patch newest pkg-fallout/clang problem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 24 19:00:01 UTC 2013
>Closed-Date:    Fri Oct 25 15:03:34 UTC 2013
>Last-Modified:  Fri Oct 25 15:10:00 UTC 2013
>Originator:     Craig Leres
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
System: FreeBSD fun.ee.lbl.gov 9.1-RELEASE FreeBSD 9.1-RELEASE #11 r26: Wed Sep 11 10:30:14 PDT 2013 leres@fun.ee.lbl.gov:/sys/amd64/compile/LBL amd64


	
>Description:
	It appears the -10 build server has yet another new version
	of clang.

>How-To-Repeat:
	http://beefy2.isc.freebsd.org/bulk/10amd64-default/2013-10-24_03h27m40s/logs/bro-2.1_3.log

	/wrkdirs/usr/ports/security/bro/work/bro-2.1/src/logging/Manager.cc:1246:3: error: use of undeclared identifier 'usleep'
			usleep(1000);
			^
	1 warning and 1 error generated.
	*** Error code 1

>Fix:
	Include unistd.h (see attached patch).

--- patch.txt begins here ---
--- Makefile.orig	2013-10-19 10:28:31.000000000 -0700
+++ Makefile	2013-10-24 11:50:42.000000000 -0700
@@ -3,7 +3,7 @@
 
 PORTNAME=	bro
 PORTVERSION=	2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.bro-ids.org/downloads/release/
 
--- /dev/null	2013-10-24 11:52:05.000000000 -0700
+++ files/patch-src-logging-Manager.cc	2013-10-24 11:50:55.000000000 -0700
@@ -0,0 +1,10 @@
+--- src/logging/Manager.cc.orig	2013-10-24 11:44:30.000000000 -0700
++++ src/logging/Manager.cc	2013-10-24 11:45:09.000000000 -0700
+@@ -1,6 +1,7 @@
+ // See the file "COPYING" in the main distribution directory for copyright.
+ 
+ #include <algorithm>
++#include <unistd.h>				/* pick up usleep() prototype */
+ 
+ #include "../Event.h"
+ #include "../EventHandler.h"
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Thu Oct 24 19:19:42 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183279 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Fri Oct 25 15:03:34 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183279: commit references a PR
Date: Fri, 25 Oct 2013 15:03:04 +0000 (UTC)

 Author: tabthorpe
 Date: Fri Oct 25 15:02:57 2013
 New Revision: 331593
 URL: http://svnweb.freebsd.org/changeset/ports/331593
 
 Log:
   - Fix build with clang
   
   PR:		ports/183279
   Submitted by:	Craig Leres <leres@ee.lbl.gov> (maintainer)
 
 Added:
   head/security/bro/files/patch-src-logging-Manager.cc   (contents, props changed)
 
 Added: head/security/bro/files/patch-src-logging-Manager.cc
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/security/bro/files/patch-src-logging-Manager.cc	Fri Oct 25 15:02:57 2013	(r331593)
 @@ -0,0 +1,10 @@
 +--- src/logging/Manager.cc.orig	2013-10-24 11:44:30.000000000 -0700
 ++++ src/logging/Manager.cc	2013-10-24 11:45:09.000000000 -0700
 +@@ -1,6 +1,7 @@
 + // See the file "COPYING" in the main distribution directory for copyright.
 + 
 + #include <algorithm>
 ++#include <unistd.h>				/* pick up usleep() prototype */
 + 
 + #include "../Event.h"
 + #include "../EventHandler.h"
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
