Date: Sat, 28 Jan 2023 18:53:54 GMT From: Xin LI <delphij@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8f02c0d15669 - main - Disable sandboxing when building with WITHOUT_CAPSICUM. Message-ID: <202301281853.30SIrs4n036416@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8f02c0d15669949bb3b5086800aaf11a65e4c871 commit 8f02c0d15669949bb3b5086800aaf11a65e4c871 Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2023-01-28 18:53:47 +0000 Commit: Xin LI <delphij@FreeBSD.org> 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 <byteswap.h> 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 <sys/byteorder.h> header file. */ /* #undef HAVE_SYS_BYTEORDER_H */ +#ifndef WITHOUT_CAPSICUM /* Define to 1 if you have the <sys/capsicum.h> header file. */ #define HAVE_SYS_CAPSICUM_H 1 +#endif /* Define to 1 if you have the <sys/endian.h> 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 <src.opts.mk> 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 <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301281853.30SIrs4n036416>