From 64a8d6a7f771e6457f7998335a8b88d60fe2b6ab Mon Sep 17 00:00:00 2001 From: netblue30 Date: Tue, 27 Oct 2020 09:35:41 -0400 Subject: compile time option to disable --private-cache and --tmpfs for regular user --- configure | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 36890d837..75c2499a9 100755 --- a/configure +++ b/configure @@ -644,6 +644,7 @@ HAVE_PRIVATE_HOME HAVE_FIRETUNNEL HAVE_GAWK HAVE_MAN +HAVE_USERTMPFS HAVE_OVERLAYFS HAVE_DBUSPROXY EXTRA_LDFLAGS @@ -711,6 +712,7 @@ enable_analyzer enable_apparmor enable_dbusproxy enable_overlayfs +enable_usertmpfs enable_man enable_firetunnel enable_private_home @@ -1366,6 +1368,7 @@ Optional Features: --enable-apparmor enable apparmor --disable-dbusproxy disable dbus proxy --disable-overlayfs disable overlayfs + --disable-usertmpfs disable tmpfs as regular user --disable-man disable man pages --disable-firetunnel disable firetunnel --disable-private-home disable private home feature @@ -3417,8 +3420,8 @@ if test "x$enable_apparmor" = "xyes"; then : HAVE_APPARMOR="-DHAVE_APPARMOR" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 -$as_echo_n "checking for libapparmor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 +$as_echo_n "checking for AA... " >&6; } if test -n "$AA_CFLAGS"; then pkg_cv_AA_CFLAGS="$AA_CFLAGS" @@ -3458,7 +3461,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3485,7 +3488,7 @@ Alternatively, you may set the environment variables AA_CFLAGS and AA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -3538,6 +3541,19 @@ if test "x$enable_overlayfs" != "xno"; then : HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" +fi + +HAVE_USERTMPS="" +# Check whether --enable-usertmpfs was given. +if test "${enable_usertmpfs+set}" = set; then : + enableval=$enable_usertmpfs; +fi + +if test "x$enable_usertmpfs" != "xno"; then : + + HAVE_USERTMPFS="-DHAVE_USERTMPFS" + + fi HAVE_MAN="no" @@ -5464,6 +5480,7 @@ echo " private home support: $HAVE_PRIVATE_HOME" echo " file transfer support: $HAVE_FILE_TRANSFER" echo " overlayfs support: $HAVE_OVERLAYFS" echo " DBUS proxy support: $HAVE_DBUSPROXY" +echo " allow tmpfs as regular user: $HAVE_USERTMPFS" echo " Manpage support: $HAVE_MAN" echo " firetunnel support: $HAVE_FIRETUNNEL" echo " busybox workaround: $BUSYBOX_WORKAROUND" -- cgit v1.2.3-54-g00ecf