From owner-svn-src-head@freebsd.org  Tue Mar  7 16:06:54 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6CEFD0192E;
 Tue,  7 Mar 2017 16:06:54 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A5BF01E28;
 Tue,  7 Mar 2017 16:06:54 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v27G6rub032735;
 Tue, 7 Mar 2017 16:06:53 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27G6rWq032733;
 Tue, 7 Mar 2017 16:06:53 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201703071606.v27G6rWq032733@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 7 Mar 2017 16:06:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314863 - in head: . lib/libpcap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Mar 2017 16:06:54 -0000

Author: delphij
Date: Tue Mar  7 16:06:53 2017
New Revision: 314863
URL: https://svnweb.freebsd.org/changeset/base/314863

Log:
  Stop installing pcap-int.h, which is the internal interface for libpcap.
  
  Reference:	https://github.com/the-tcpdump-group/libpcap/issues/560
  PR:		217221

Modified:
  head/ObsoleteFiles.inc
  head/lib/libpcap/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Mar  7 15:43:49 2017	(r314862)
+++ head/ObsoleteFiles.inc	Tue Mar  7 16:06:53 2017	(r314863)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170307: remove pcap-int.h
+OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0.
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate

Modified: head/lib/libpcap/Makefile
==============================================================================
--- head/lib/libpcap/Makefile	Tue Mar  7 15:43:49 2017	(r314862)
+++ head/lib/libpcap/Makefile	Tue Mar  7 16:06:53 2017	(r314863)
@@ -14,7 +14,7 @@ SRCS=	grammar.y tokdefs.h pcap_version.h
 	scanner.l sf-pcap.c sf-pcap-ng.c version.c
 
 # Old compatibility headers
-INCS=	pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h
+INCS=	pcap.h pcap-namedb.h pcap-bpf.h
 
 PCAPINCS=	pcap/pcap.h pcap/namedb.h pcap/bpf.h pcap/dlt.h pcap/export-defs.h
 PCAPINCSDIR=	${INCLUDEDIR}/pcap