aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2021-02-05 17:13:37 -0500
committerLibravatar netblue30 <netblue30@protonmail.com>2021-02-05 17:13:37 -0500
commit97d8a03cad19501f017587cc4e47d8418273834b (patch)
tree7a459a38f57f267387d44c830322fe54d1112358
parenttests: check with faudit if tests are run sandboxed (diff)
downloadfirejail-97d8a03cad19501f017587cc4e47d8418273834b.tar.gz
firejail-97d8a03cad19501f017587cc4e47d8418273834b.tar.zst
firejail-97d8a03cad19501f017587cc4e47d8418273834b.zip
disabled overlayfs, 0.9.64.4 testing
-rwxr-xr-xconfigure38
-rw-r--r--configure.ac17
2 files changed, 27 insertions, 28 deletions
diff --git a/configure b/configure
index 7d3413eaf..9b82b638e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for firejail 0.9.64.2. 3# Generated by GNU Autoconf 2.69 for firejail 0.9.64.4.
4# 4#
5# Report bugs to <netblue30@protonmail.com>. 5# Report bugs to <netblue30@protonmail.com>.
6# 6#
@@ -580,8 +580,8 @@ MAKEFLAGS=
580# Identity of this package. 580# Identity of this package.
581PACKAGE_NAME='firejail' 581PACKAGE_NAME='firejail'
582PACKAGE_TARNAME='firejail' 582PACKAGE_TARNAME='firejail'
583PACKAGE_VERSION='0.9.64.2' 583PACKAGE_VERSION='0.9.64.4'
584PACKAGE_STRING='firejail 0.9.64.2' 584PACKAGE_STRING='firejail 0.9.64.4'
585PACKAGE_BUGREPORT='netblue30@protonmail.com' 585PACKAGE_BUGREPORT='netblue30@protonmail.com'
586PACKAGE_URL='https://firejail.wordpress.com' 586PACKAGE_URL='https://firejail.wordpress.com'
587 587
@@ -711,7 +711,6 @@ enable_option_checking
711enable_analyzer 711enable_analyzer
712enable_apparmor 712enable_apparmor
713enable_dbusproxy 713enable_dbusproxy
714enable_overlayfs
715enable_usertmpfs 714enable_usertmpfs
716enable_man 715enable_man
717enable_firetunnel 716enable_firetunnel
@@ -1294,7 +1293,7 @@ if test "$ac_init_help" = "long"; then
1294 # Omit some internal or obsolete options to make the list less imposing. 1293 # Omit some internal or obsolete options to make the list less imposing.
1295 # This message is too long to be a string in the A/UX 3.1 sh. 1294 # This message is too long to be a string in the A/UX 3.1 sh.
1296 cat <<_ACEOF 1295 cat <<_ACEOF
1297\`configure' configures firejail 0.9.64.2 to adapt to many kinds of systems. 1296\`configure' configures firejail 0.9.64.4 to adapt to many kinds of systems.
1298 1297
1299Usage: $0 [OPTION]... [VAR=VALUE]... 1298Usage: $0 [OPTION]... [VAR=VALUE]...
1300 1299
@@ -1356,7 +1355,7 @@ fi
1356 1355
1357if test -n "$ac_init_help"; then 1356if test -n "$ac_init_help"; then
1358 case $ac_init_help in 1357 case $ac_init_help in
1359 short | recursive ) echo "Configuration of firejail 0.9.64.2:";; 1358 short | recursive ) echo "Configuration of firejail 0.9.64.4:";;
1360 esac 1359 esac
1361 cat <<\_ACEOF 1360 cat <<\_ACEOF
1362 1361
@@ -1367,7 +1366,6 @@ Optional Features:
1367 --enable-analyzer enable GCC 10 static analyzer 1366 --enable-analyzer enable GCC 10 static analyzer
1368 --enable-apparmor enable apparmor 1367 --enable-apparmor enable apparmor
1369 --disable-dbusproxy disable dbus proxy 1368 --disable-dbusproxy disable dbus proxy
1370 --disable-overlayfs disable overlayfs
1371 --disable-usertmpfs disable tmpfs as regular user 1369 --disable-usertmpfs disable tmpfs as regular user
1372 --disable-man disable man pages 1370 --disable-man disable man pages
1373 --disable-firetunnel disable firetunnel 1371 --disable-firetunnel disable firetunnel
@@ -1473,7 +1471,7 @@ fi
1473test -n "$ac_init_help" && exit $ac_status 1471test -n "$ac_init_help" && exit $ac_status
1474if $ac_init_version; then 1472if $ac_init_version; then
1475 cat <<\_ACEOF 1473 cat <<\_ACEOF
1476firejail configure 0.9.64.2 1474firejail configure 0.9.64.4
1477generated by GNU Autoconf 2.69 1475generated by GNU Autoconf 2.69
1478 1476
1479Copyright (C) 2012 Free Software Foundation, Inc. 1477Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1775,7 +1773,7 @@ cat >config.log <<_ACEOF
1775This file contains any messages produced by compilers while 1773This file contains any messages produced by compilers while
1776running configure, to aid debugging if configure makes a mistake. 1774running configure, to aid debugging if configure makes a mistake.
1777 1775
1778It was created by firejail $as_me 0.9.64.2, which was 1776It was created by firejail $as_me 0.9.64.4, which was
1779generated by GNU Autoconf 2.69. Invocation command line was 1777generated by GNU Autoconf 2.69. Invocation command line was
1780 1778
1781 $ $0 $@ 1779 $ $0 $@
@@ -3530,18 +3528,16 @@ if test "x$enable_dbusproxy" != "xno"; then :
3530 3528
3531fi 3529fi
3532 3530
3531# overlayfs features temporarely disabled pending fixes
3533HAVE_OVERLAYFS="" 3532HAVE_OVERLAYFS=""
3534# Check whether --enable-overlayfs was given.
3535if test "${enable_overlayfs+set}" = set; then :
3536 enableval=$enable_overlayfs;
3537fi
3538
3539if test "x$enable_overlayfs" != "xno"; then :
3540
3541 HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
3542 3533
3543 3534#
3544fi 3535#AC_ARG_ENABLE([overlayfs],
3536# AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
3537#AS_IF([test "x$enable_overlayfs" != "xno"], [
3538# HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
3539# AC_SUBST(HAVE_OVERLAYFS)
3540#])
3545 3541
3546HAVE_USERTMPS="" 3542HAVE_USERTMPS=""
3547# Check whether --enable-usertmpfs was given. 3543# Check whether --enable-usertmpfs was given.
@@ -4817,7 +4813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4817# report actual input values of CONFIG_FILES etc. instead of their 4813# report actual input values of CONFIG_FILES etc. instead of their
4818# values after options handling. 4814# values after options handling.
4819ac_log=" 4815ac_log="
4820This file was extended by firejail $as_me 0.9.64.2, which was 4816This file was extended by firejail $as_me 0.9.64.4, which was
4821generated by GNU Autoconf 2.69. Invocation command line was 4817generated by GNU Autoconf 2.69. Invocation command line was
4822 4818
4823 CONFIG_FILES = $CONFIG_FILES 4819 CONFIG_FILES = $CONFIG_FILES
@@ -4871,7 +4867,7 @@ _ACEOF
4871cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 4867cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4872ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 4868ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
4873ac_cs_version="\\ 4869ac_cs_version="\\
4874firejail config.status 0.9.64.2 4870firejail config.status 0.9.64.4
4875configured by $0, generated by GNU Autoconf 2.69, 4871configured by $0, generated by GNU Autoconf 2.69,
4876 with options \\"\$ac_cs_config\\" 4872 with options \\"\$ac_cs_config\\"
4877 4873
diff --git a/configure.ac b/configure.ac
index 8ff8ef6bc..4ab98e682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
12# 12#
13 13
14AC_PREREQ([2.68]) 14AC_PREREQ([2.68])
15AC_INIT(firejail, 0.9.64.2, netblue30@protonmail.com, , https://firejail.wordpress.com) 15AC_INIT(firejail, 0.9.64.4, netblue30@protonmail.com, , https://firejail.wordpress.com)
16AC_CONFIG_SRCDIR([src/firejail/main.c]) 16AC_CONFIG_SRCDIR([src/firejail/main.c])
17 17
18AC_CONFIG_MACRO_DIR([m4]) 18AC_CONFIG_MACRO_DIR([m4])
@@ -66,13 +66,16 @@ AS_IF([test "x$enable_dbusproxy" != "xno"], [
66 AC_SUBST(HAVE_DBUSPROXY) 66 AC_SUBST(HAVE_DBUSPROXY)
67]) 67])
68 68
69# overlayfs features temporarely disabled pending fixes
69HAVE_OVERLAYFS="" 70HAVE_OVERLAYFS=""
70AC_ARG_ENABLE([overlayfs], 71AC_SUBST(HAVE_OVERLAYFS)
71 AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) 72#
72AS_IF([test "x$enable_overlayfs" != "xno"], [ 73#AC_ARG_ENABLE([overlayfs],
73 HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" 74# AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
74 AC_SUBST(HAVE_OVERLAYFS) 75#AS_IF([test "x$enable_overlayfs" != "xno"], [
75]) 76# HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
77# AC_SUBST(HAVE_OVERLAYFS)
78#])
76 79
77HAVE_USERTMPS="" 80HAVE_USERTMPS=""
78AC_ARG_ENABLE([usertmpfs], 81AC_ARG_ENABLE([usertmpfs],