From owner-svn-src-all@freebsd.org  Mon Sep 19 00:24:10 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 94D94BDD3D0;
 Mon, 19 Sep 2016 00:24:10 +0000 (UTC)
 (envelope-from allanjude@freebsd.org)
Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6])
 (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 3190D226;
 Mon, 19 Sep 2016 00:24:10 +0000 (UTC)
 (envelope-from allanjude@freebsd.org)
Received: from [10.1.1.2] (unknown [10.1.1.2])
 (Authenticated sender: allanjude.freebsd@scaleengine.com)
 by mx1.scaleengine.net (Postfix) with ESMTPSA id CB26219C3;
 Mon, 19 Sep 2016 00:24:08 +0000 (UTC)
Subject: Re: svn commit: r305949 - head/usr.bin/soelim
To: Baptiste Daroussin <bapt@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201609181916.u8IJGnG2062423@repo.freebsd.org>
From: Allan Jude <allanjude@freebsd.org>
Message-ID: <a0a97be6-c09a-5622-c668-16fecad36ea5@freebsd.org>
Date: Sun, 18 Sep 2016 20:24:08 -0400
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <201609181916.u8IJGnG2062423@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Sep 2016 00:24:10 -0000

On 2016-09-18 15:16, Baptiste Daroussin wrote:
> Author: bapt
> Date: Sun Sep 18 19:16:48 2016
> New Revision: 305949
> URL: https://svnweb.freebsd.org/changeset/base/305949
> 
> Log:
>   Simplify the fix for bootstrap tools
>   
>   building head is not supported from prior to stable/10 where sys/capsicum.h was
>   named sys/capabilities.h
>   
>   Reported by:	kib
> 
> Modified:
>   head/usr.bin/soelim/soelim.c
> 
> Modified: head/usr.bin/soelim/soelim.c
> ==============================================================================
> --- head/usr.bin/soelim/soelim.c	Sun Sep 18 18:49:18 2016	(r305948)
> +++ head/usr.bin/soelim/soelim.c	Sun Sep 18 19:16:48 2016	(r305949)
> @@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
>  #include <sys/param.h>
>  #if __FreeBSD_version > 1001510
>  #include <sys/capsicum.h>
> +#else
> +#include <sys/capabilities.h>

I am pretty sure this is spelled: sys/capability.h

>  #endif
>  #include <sys/types.h>
>  
> @@ -163,10 +165,8 @@ main(int argc, char **argv)
>  	int ret = 0;
>  	int flags = 0;
>  	char cwd[MAXPATHLEN];
> -#if __FreeBSD_version > 1001510
>  	unsigned long cmd;
>  	cap_rights_t rights;
> -#endif
>  
>  	includes = sl_init();
>  	if (getcwd(cwd, sizeof(cwd)) != NULL)
> @@ -200,7 +200,6 @@ main(int argc, char **argv)
>  	rootfd = open("/", O_DIRECTORY | O_RDONLY);
>  	if (rootfd == -1)
>  		err(EXIT_FAILURE, "unable to open '/'");
> -#if __FreeBSD_version > 1001510
>  	cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_IOCTL);
>  	/*
>  	 * EBADF in case stdin is closed by the caller
> @@ -227,7 +226,6 @@ main(int argc, char **argv)
>  
>  	if (cap_enter() < 0 && errno != ENOSYS)
>  		err(EXIT_FAILURE, "unable to enter capability mode");
> -#endif
>  
>  	if (argc == 0)
>  		ret = soelim_file(rootfd, stdin, flags);
> 


-- 
Allan Jude