From owner-svn-ports-head@FreeBSD.ORG  Tue Sep 10 10:40:46 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D27DEDA8;
 Tue, 10 Sep 2013 10:40:46 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF6182C5B;
 Tue, 10 Sep 2013 10:40:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AAeksJ019173;
 Tue, 10 Sep 2013 10:40:46 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AAekWH019172;
 Tue, 10 Sep 2013 10:40:46 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201309101040.r8AAekWH019172@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 10 Sep 2013 10:40:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326891 - head/security/prelude-pflogger/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.14
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: Tue, 10 Sep 2013 10:40:46 -0000

Author: bdrewery
Date: Tue Sep 10 10:40:46 2013
New Revision: 326891
URL: http://svnweb.freebsd.org/changeset/ports/326891

Log:
  - Fix build for upcoming HEAD changes by removing reference to
    CTL_IPPROTO_NAMES which is being removed and replacing with
    getprotobynumber(3)
  
  PR:		ports/181488
  Submitted by:	jhb
  Approved by:	maintainer timeout

Modified:
  head/security/prelude-pflogger/files/patch-process_packet.c

Modified: head/security/prelude-pflogger/files/patch-process_packet.c
==============================================================================
--- head/security/prelude-pflogger/files/patch-process_packet.c	Tue Sep 10 10:27:53 2013	(r326890)
+++ head/security/prelude-pflogger/files/patch-process_packet.c	Tue Sep 10 10:40:46 2013	(r326891)
@@ -1,5 +1,5 @@
---- src/process_packet.c.orig	2012-04-11 12:08:57.000000000 -0500
-+++ src/process_packet.c	2012-04-11 12:05:26.000000000 -0500
+--- src/process_packet.c.orig	2005-09-18 10:29:54.000000000 -0400
++++ src/process_packet.c	2013-08-16 14:36:28.000000000 -0400
 @@ -43,10 +43,10 @@
  #include <net/if_pflog.h>
  #include <net/pfvar.h>
@@ -12,3 +12,20 @@
  #include <errno.h>
  
  #include <libprelude/prelude.h>
+@@ -494,12 +494,12 @@
+ 					    char *dir_str,
+ 					    char *buffer, size_t size)
+ {
+-	struct { char *name; int n; } ip_proto_table[] = CTL_IPPROTO_NAMES;
++	struct protoent *proto;
+ 	char *proto_name = "unknown";
+ 
+-	if ( packet_info->ip_proto_type < sizeof (ip_proto_table) / sizeof (ip_proto_table[0]) &&
+-	     ip_proto_table[packet_info->ip_proto_type].name )
+-		proto_name = ip_proto_table[packet_info->ip_proto_type].name;
++	proto = getprotobynumber(packet_info->ip_proto_type);
++	if (proto != NULL)
++		proto_name = proto->p_name;
+ 
+ 	return snprintf(buffer, size,
+ 			"OpenBSD PF %s an %s %s packet %s -> %s on interface %s (TTL:%hhu)",