From nobody Fri Feb 03 07:19:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P7Rq21pgnz2lFXc; Fri, 3 Feb 2023 07:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P7Rq21LRpz4QSZ; Fri, 3 Feb 2023 07:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675408750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPIGe7VFIJJivN+wkUiJyfOcPFffbR8s6J29s5SdOUw=; b=N8qrSis8DyP3LkYT0lYpr7yprfL0k8IMJwlXQrl1cIOaUld5Nt5YvHKPBEKLz0+pl/T7MB PN0qsLlvjGohR8iwJmUikSp2FHjcerKzEhr1BsGKswBfEVPhLi8uLJiz+MowjTryTNL8VP geyi199RGQHHWKQiiGFn80ADJFu0Xqyc90M3JsIFTI5hMjGpdFYcwhOhU6uBstPjdzpOFx LXdx4MCIjbyYkwyj1VMn7IvUe3cwV1hBXmJrO0IoSRbn3QjAiHI4D8vCoOILoD1aYrbmmh 45Q8nRJz9u/k87ysvv4GOn0EOcZDsmLJHdzYLycTdNuVRb31G29G642GXan92w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675408750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPIGe7VFIJJivN+wkUiJyfOcPFffbR8s6J29s5SdOUw=; b=Op9Qev/XhAK24NUquEq1dVIb44zYVhT0uhSp5TXeh+B2/DCmgnLgpiWv1DZbQUS2fV4F0r 9swzCfTtmzGNPMpZs80I9SdNPyvreglLZSbM9NrA0lwFusCAm57jozigWrmh+9ZauoA/It bKBM2vL7sfZs/ogF74fri+97p9fmUsY3qeAnaZTATgyQLQAhySS90ycxbKvaZpgVd0e4J8 6Q9K3FPtdl54cmO9dronCBFJ0klkIEnKtHsmN7KYGi/Kbz1mCd31ALM4byRKRfaw2vkmTe odt9jaqagqELqYmYysmDxKGvDVt4ggtpnCNCBQJjZz9cch6JKrwY3QVPc9yGJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675408750; a=rsa-sha256; cv=none; b=cS7CCA9cE3D3Ai8MDbHcZV9HkG/6f9IHM3kIE4Tkpw6WSUGnYTeRgJAS6d6v8uR4em4BVD Yot4Nq+kIPKBgVRF2qvRJ4r9iNnMBc77LN9J4d9MNTGV7CGsMGnr4UulPpSK8Npo4IYMmp j+dsQnBYW+Mj1kn6VpEd8MMEqhaEVfjcOLMMdiC2B1m+XSgaRQE6jBnmoQiQlAg78x3gx7 NUbaIZ/Y+WHF6lppPwYONCwUM2wxV7QgaITbisNa4fhcGkv0GTjHliqlB3m9DBNeKH4+0g b8wTGAw3kp6NEfLcYVQD9u2Tsc2N2Fyi3okQ43koQ8kElxObG+0dje3fItzRmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P7Rq20C6tzR6v; Fri, 3 Feb 2023 07:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3137J9vb089180; Fri, 3 Feb 2023 07:19:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3137J9dN089179; Fri, 3 Feb 2023 07:19:09 GMT (envelope-from git) Date: Fri, 3 Feb 2023 07:19:09 GMT Message-Id: <202302030719.3137J9dN089179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: b38e81cff896 - stable/13 - Disable sandboxing when building with WITHOUT_CAPSICUM. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b38e81cff896eed0e38f611bd2c93229808a8ef9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b38e81cff896eed0e38f611bd2c93229808a8ef9 commit b38e81cff896eed0e38f611bd2c93229808a8ef9 Author: Xin LI AuthorDate: 2023-01-28 18:53:47 +0000 Commit: Xin LI CommitDate: 2023-02-03 07:18:55 +0000 Disable sandboxing when building with WITHOUT_CAPSICUM. PR: bin/269185 (cherry picked from commit 8f02c0d15669949bb3b5086800aaf11a65e4c871) --- lib/liblzma/config.h | 4 ++++ usr.bin/xz/Makefile | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h index d88e3e105dad..ed6515f56f6e 100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@ -24,8 +24,10 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ +#ifndef WITHOUT_CAPSICUM /* Define to 1 if Capsicum is available. */ #define HAVE_CAPSICUM 1 +#endif /* Define to 1 if the system has the type `CC_SHA256_CTX'. */ /* #undef HAVE_CC_SHA256_CTX */ @@ -283,8 +285,10 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_BYTEORDER_H */ +#ifndef WITHOUT_CAPSICUM /* Define to 1 if you have the header file. */ #define HAVE_SYS_CAPSICUM_H 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_ENDIAN_H */ diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile index f7687116c8fd..e3cbafb0ebc3 100644 --- a/usr.bin/xz/Makefile +++ b/usr.bin/xz/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD$ +.include PROG= xz @@ -43,6 +43,10 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common +.if ${MK_CAPSICUM} == "no" +CFLAGS+= -DWITHOUT_CAPSICUM +.endif + LIBADD= lzma .include