Disable sandboxing when building with WITHOUT_CAPSICUM.

PR: bin/269185 MFC after: 3 days
dzvon · Jan 28, 2023 · 8f02c0d · 8f02c0d
1 parent 050e4bc
commit 8f02c0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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>