Re: svn commit: r334931 - in head: . sys/sys
On 6/10/18, Jonathan Anderson wrote: > On 10 Jun 2018, at 16:49, Antoine Brodin wrote: > >> On Sun, Jun 10, 2018 at 9:15 PM, Eitan Adler >> wrote: >>> Author: eadler >>> Date: Sun Jun 10 19:15:38 2018 >>> New Revision: 334931 >>> URL: https://svnweb.freebsd.org/changeset/base/334931 >>> >>> Log: >>> Revert r334929 >>> >>> Apparently some software might depend on a header whose sole >>> contents is >>> a `#warning` to remove it. Revert pending exp-run. >> >> Hi, >> >> It's not just a #warning, there is a #include line below... >> And after this change, most ports that supported sandboxing were no >> longer sandboxed. > > This used the be the primary header file for Capsicum, but we switched > to the somewhat-more-portable sys/capsicum.h awhile ago. The current > sys/capability.h includes the new header while emitting a warning in > order to encourage people to switch to capsicum.h without breaking > anything (yet). This is a transitional step, and I think the plan is to > remove sys/capability.h after... maybe the 12-STABLE branch? > As second step, it would be fine to slip the #warning over to #error, and fix the ports. > > Jon > -- > Jonathan Anderson > jonat...@freebsd.org > ___ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r334931 - in head: . sys/sys
On 10 Jun 2018, at 16:49, Antoine Brodin wrote: On Sun, Jun 10, 2018 at 9:15 PM, Eitan Adler wrote: Author: eadler Date: Sun Jun 10 19:15:38 2018 New Revision: 334931 URL: https://svnweb.freebsd.org/changeset/base/334931 Log: Revert r334929 Apparently some software might depend on a header whose sole contents is a `#warning` to remove it. Revert pending exp-run. Hi, It's not just a #warning, there is a #include line below... And after this change, most ports that supported sandboxing were no longer sandboxed. This used the be the primary header file for Capsicum, but we switched to the somewhat-more-portable sys/capsicum.h awhile ago. The current sys/capability.h includes the new header while emitting a warning in order to encourage people to switch to capsicum.h without breaking anything (yet). This is a transitional step, and I think the plan is to remove sys/capability.h after... maybe the 12-STABLE branch? Jon -- Jonathan Anderson jonat...@freebsd.org ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r334931 - in head: . sys/sys
On Sun, Jun 10, 2018 at 9:15 PM, Eitan Adler wrote: > Author: eadler > Date: Sun Jun 10 19:15:38 2018 > New Revision: 334931 > URL: https://svnweb.freebsd.org/changeset/base/334931 > > Log: > Revert r334929 > > Apparently some software might depend on a header whose sole contents is > a `#warning` to remove it. Revert pending exp-run. Hi, It's not just a #warning, there is a #include line below... And after this change, most ports that supported sandboxing were no longer sandboxed. Cheers, Antoine ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r334931 - in head: . sys/sys
Author: eadler Date: Sun Jun 10 19:15:38 2018 New Revision: 334931 URL: https://svnweb.freebsd.org/changeset/base/334931 Log: Revert r334929 Apparently some software might depend on a header whose sole contents is a `#warning` to remove it. Revert pending exp-run. Added: head/sys/sys/capability.h - copied unchanged from r334928, head/sys/sys/capability.h Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sun Jun 10 19:03:21 2018(r334930) +++ head/ObsoleteFiles.inc Sun Jun 10 19:15:38 2018(r334931) @@ -38,8 +38,6 @@ # xargs -n1 | sort | uniq -d; # done -# 20180610: Remove sys/capability.h -OLD_FILES+=usr/include/sys/capability.h # 20180609: obsolete libc++ files missed from the 5.0.0 import OLD_FILES+=usr/include/c++/v1/__refstring OLD_FILES+=usr/include/c++/v1/__undef_min_max Copied: head/sys/sys/capability.h (from r334928, head/sys/sys/capability.h) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/sys/capability.h Sun Jun 10 19:15:38 2018(r334931, copy of r334928, head/sys/sys/capability.h) @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2014 Robert N. M. Watson + * All rights reserved. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Historically, the key userspace and kernel Capsicum definitions were found + * in this file. However, it conflicted with POSIX.1e's capability.h, so has + * been renamed capsicum.h. The file remains for backwards compatibility + * reasons as a nested include. + */ +#ifndef _SYS_CAPABILITY_H_ +#define_SYS_CAPABILITY_H_ + +#warning this file includes which is deprecated +#include + +#endif /* !_SYS_CAPABILITY_H_ */ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
