From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 16 10:52:47 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7E271437;
 Mon, 16 Mar 2015 10:52:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68DBFAE1;
 Mon, 16 Mar 2015 10:52:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GAqltO041658;
 Mon, 16 Mar 2015 10:52:47 GMT (envelope-from vsevolod@FreeBSD.org)
Received: (from vsevolod@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GAqlGM041657;
 Mon, 16 Mar 2015 10:52:47 GMT (envelope-from vsevolod@FreeBSD.org)
Message-Id: <201503161052.t2GAqlGM041657@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to
 vsevolod@FreeBSD.org using -f
From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Date: Mon, 16 Mar 2015 10:52:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381380 - head/net-mgmt/ng_ipacct/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Mar 2015 10:52:47 -0000

Author: vsevolod
Date: Mon Mar 16 10:52:46 2015
New Revision: 381380
URL: https://svnweb.freebsd.org/changeset/ports/381380
QAT: https://qat.redports.org/buildarchive/r381380/

Log:
  - Fix build on 8.4.
  - Do not bump portrevision: package is unchanged
  
  Submitted by:	Eugene Grossbein via IRC

Added:
  head/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c   (contents, props changed)

Added: head/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c	Mon Mar 16 10:52:46 2015	(r381380)
@@ -0,0 +1,25 @@
+--- ng_ipacct/ng_ipacct.c.orig	2015-03-16 13:38:23.000000000 +0700
++++ ng_ipacct/ng_ipacct.c	2015-03-16 13:46:21.000000000 +0700
+@@ -965,7 +965,11 @@ pcb_get_cred(struct ip_acct_stream *r, s
+ 	int i;
+ 	uid_t res;
+ 
++#if __FreeBSD_version < 900039
++	INP_INFO_RLOCK(pcbinfo);
++#else
+ 	INP_HASH_RLOCK(pcbinfo);
++#endif
+ 	for (i = 0, ina = r->r_dst, port = r->r_dport; i < 2; i++) {
+ #if __FreeBSD_version >= 700110
+ 		pcb = in_pcblookup_local(pcbinfo, ina, port, 1, NOCRED);
+@@ -984,6 +988,10 @@ pcb_get_cred(struct ip_acct_stream *r, s
+ 	    (pcb->inp_socket != NULL) && (pcb->inp_socket->so_cred != NULL)) {
+ 		res = pcb->inp_socket->so_cred->cr_uid;
+ 	}
++#if __FreeBSD_version < 900039
++	INP_INFO_RUNLOCK(pcbinfo);
++#else
+ 	INP_HASH_RUNLOCK(pcbinfo);
++#endif
+ 	return res;
+ }