From owner-svn-src-head@freebsd.org  Tue Sep 20 15:13:16 2016
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 7840ABE24C8;
 Tue, 20 Sep 2016 15:13:16 +0000 (UTC)
 (envelope-from emaste@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 476A2313;
 Tue, 20 Sep 2016 15:13:16 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8KFDFwq059208;
 Tue, 20 Sep 2016 15:13:15 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8KFDFpW059207;
 Tue, 20 Sep 2016 15:13:15 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201609201513.u8KFDFpW059207@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 20 Sep 2016 15:13:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306026 - head/usr.bin/bsdiff/bspatch
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, 20 Sep 2016 15:13:16 -0000

Author: emaste
Date: Tue Sep 20 15:13:15 2016
New Revision: 306026
URL: https://svnweb.freebsd.org/changeset/base/306026

Log:
  bspatch: Remove backwards-compatibility sys/capability.h support
  
  bspatch previously included sys/capability.h or sys/capsicum.h based
  on __FreeBSD_version, as FreeBSD is the upstream for bsdiff and we may
  see this file incorporated into other third-party software.
  
  The Capsicum header is now installed as sys/capsicum.h in stable/10 and
  FreeBSD 10.3, so we can just use sys/capsicum.h and simplify the logic.
  
  Reviewed by:	allanjude
  Differential Revision:	https://reviews.freebsd.org/D7954

Modified:
  head/usr.bin/bsdiff/bspatch/bspatch.c

Modified: head/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- head/usr.bin/bsdiff/bspatch/bspatch.c	Tue Sep 20 13:23:08 2016	(r306025)
+++ head/usr.bin/bsdiff/bspatch/bspatch.c	Tue Sep 20 15:13:15 2016	(r306026)
@@ -29,12 +29,9 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__FreeBSD__)
 #include <sys/param.h>
-#if __FreeBSD_version >= 1100014
+#if __FreeBSD_version >= 1001511
 #include <sys/capsicum.h>
 #define HAVE_CAPSICUM
-#elif __FreeBSD_version >= 1000000
-#include <sys/capability.h>
-#define HAVE_CAPSICUM
 #endif
 #endif