From nobody Sat Jan 28 18:53:54 2023 X-Original-To: dev-commits-src-main@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 4P43WQ6W1pz3brWj; Sat, 28 Jan 2023 18:53:54 +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 4P43WQ5vxCz4KLK; Sat, 28 Jan 2023 18:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674932034; 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=a6YIeki449nQpn4RD94NjEbPbkwxAzJ0QJ+pPnuKZyg=; b=G5OdUCcCxooEQm5zDGKy5pD4I+wMGrQrdxf/7zZy9ttjPzQ89smfK3pjGOl8xJHnCDA/kD su80HJhqc+4LyAAYzRxQYhgAFxk9Z6Fq4Du1r8wcP5caNsRs5siZvnl18KlsuFDG+IA4H0 +9PsfJCVY/iUMWUJIHQ/Cb1iTT9pktL8LIsyjbcIeEyIxeBsyayZrCBDiMaOOlOmLs5pLi RimI6RyRFthHrJ4D7wpGuJge6znuGqrdFcWksZ16wX/zZzCHUBjc59nfffU7CwOPFYOgwC LF4VgCnLc3L4/8ESovqDc2ZoAfrnD7KbHz7mEirk7nvkR4Pjw2fjdf7xzDPldA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674932034; 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=a6YIeki449nQpn4RD94NjEbPbkwxAzJ0QJ+pPnuKZyg=; b=lRxdqZTQMpArT1DtXc/GcJCG/Tl5XiLDwvUjNMh/fbQRXUwtMupiy4lWRh5puNYwms7FJY Pxp29K7sKJ7rvmkj1j2H+iiQctcM9zZyqACtrDcTWwt+jDkhMDcCf4nTSELT9HsMyEuPB7 2zGX1TCPhUGu9pzFjj8ZgDrWuGVpKdyH9KjTTTQXPENqB1OdqqFVRKsBe8URa/SSMrHkjZ 64LCCt0p0d5dY5DOHW7iNkMkA+iL7QCqAdRb9mT33h9D2TBHZO6rgJgGDNIwV0/kd3aQW6 CJoDdVgYinNggzTf1EZ5jKOR37Vpx5l3EMCHO8XD2/zDdzqfLO5GteJfNab2RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674932034; a=rsa-sha256; cv=none; b=ZF3XYVQtX5Gd7Aitg0VZ7pmsWy0QquymYnd+eO8z+EBjF3xFSF4Pmk3T7a8S2j7DNvq+vo 8LgGroknNoJY9fP/m/tVU5iHPZpZMHvE9/zZxXXv9jQtXKSS6BihEsNLTWz/loacS6F84d 3Qn8VF96Qnlc7IZ1D3GP0oPTAM90rOqdECNEcPcJwzt5V0wXfMTEauPYYoSd097F70uuub 1GkrRln/6ZYpIXS6slxVs93Oc8ahU1OVgjC3b/eEUi6CtVsHVm6ISxrTKs+eifuqP0bbjZ s66HX/ex+3wPRnxBNkCGcD2ucqdx1XZ8EFue3qT+UVq8bAS5J3uLKPiZPvsWyg== 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 4P43WQ4wmfz10fB; Sat, 28 Jan 2023 18:53:54 +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 30SIrsop036417; Sat, 28 Jan 2023 18:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SIrs4n036416; Sat, 28 Jan 2023 18:53:54 GMT (envelope-from git) Date: Sat, 28 Jan 2023 18:53:54 GMT Message-Id: <202301281853.30SIrs4n036416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8f02c0d15669 - main - Disable sandboxing when building with WITHOUT_CAPSICUM. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8f02c0d15669949bb3b5086800aaf11a65e4c871 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8f02c0d15669949bb3b5086800aaf11a65e4c871 commit 8f02c0d15669949bb3b5086800aaf11a65e4c871 Author: Xin LI AuthorDate: 2023-01-28 18:53:47 +0000 Commit: Xin LI CommitDate: 2023-01-28 18:53:47 +0000 Disable sandboxing when building with WITHOUT_CAPSICUM. PR: bin/269185 MFC after: 3 days --- 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