Skip to content

Commit

Permalink
disabled overlayfs, 0.9.64.4 testing
Browse files Browse the repository at this point in the history
  • Loading branch information
netblue30 committed Feb 5, 2021
1 parent 2d68073 commit 97d8a03
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
38 changes: 17 additions & 21 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for firejail 0.9.64.2.
# Generated by GNU Autoconf 2.69 for firejail 0.9.64.4.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='firejail'
PACKAGE_TARNAME='firejail'
PACKAGE_VERSION='0.9.64.2'
PACKAGE_STRING='firejail 0.9.64.2'
PACKAGE_VERSION='0.9.64.4'
PACKAGE_STRING='firejail 0.9.64.4'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL='https://firejail.wordpress.com'

Expand Down Expand Up @@ -711,7 +711,6 @@ enable_option_checking
enable_analyzer
enable_apparmor
enable_dbusproxy
enable_overlayfs
enable_usertmpfs
enable_man
enable_firetunnel
Expand Down Expand Up @@ -1294,7 +1293,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures firejail 0.9.64.2 to adapt to many kinds of systems.
\`configure' configures firejail 0.9.64.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1356,7 +1355,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of firejail 0.9.64.2:";;
short | recursive ) echo "Configuration of firejail 0.9.64.4:";;
esac
cat <<\_ACEOF
Expand All @@ -1367,7 +1366,6 @@ Optional Features:
--enable-analyzer enable GCC 10 static analyzer
--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
Expand Down Expand Up @@ -1473,7 +1471,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
firejail configure 0.9.64.2
firejail configure 0.9.64.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1775,7 +1773,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by firejail $as_me 0.9.64.2, which was
It was created by firejail $as_me 0.9.64.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -3530,18 +3528,16 @@ if test "x$enable_dbusproxy" != "xno"; then :

fi

# overlayfs features temporarely disabled pending fixes
HAVE_OVERLAYFS=""
# Check whether --enable-overlayfs was given.
if test "${enable_overlayfs+set}" = set; then :
enableval=$enable_overlayfs;
fi

if test "x$enable_overlayfs" != "xno"; then :

HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"


fi
#
#AC_ARG_ENABLE([overlayfs],
# AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
#AS_IF([test "x$enable_overlayfs" != "xno"], [
# HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
# AC_SUBST(HAVE_OVERLAYFS)
#])

HAVE_USERTMPS=""
# Check whether --enable-usertmpfs was given.
Expand Down Expand Up @@ -4817,7 +4813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by firejail $as_me 0.9.64.2, which was
This file was extended by firejail $as_me 0.9.64.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4871,7 +4867,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
firejail config.status 0.9.64.2
firejail config.status 0.9.64.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
17 changes: 10 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#

AC_PREREQ([2.68])
AC_INIT(firejail, 0.9.64.2, [email protected], , https://firejail.wordpress.com)
AC_INIT(firejail, 0.9.64.4, [email protected], , https://firejail.wordpress.com)
AC_CONFIG_SRCDIR([src/firejail/main.c])

AC_CONFIG_MACRO_DIR([m4])
Expand Down Expand Up @@ -66,13 +66,16 @@ AS_IF([test "x$enable_dbusproxy" != "xno"], [
AC_SUBST(HAVE_DBUSPROXY)
])

# overlayfs features temporarely disabled pending fixes
HAVE_OVERLAYFS=""
AC_ARG_ENABLE([overlayfs],
AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
AS_IF([test "x$enable_overlayfs" != "xno"], [
HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
AC_SUBST(HAVE_OVERLAYFS)
])
AC_SUBST(HAVE_OVERLAYFS)
#
#AC_ARG_ENABLE([overlayfs],
# AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
#AS_IF([test "x$enable_overlayfs" != "xno"], [
# HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
# AC_SUBST(HAVE_OVERLAYFS)
#])

HAVE_USERTMPS=""
AC_ARG_ENABLE([usertmpfs],
Expand Down

0 comments on commit 97d8a03

Please sign in to comment.