diff options
author | netblue30 <netblue30@protonmail.com> | 2021-02-09 17:30:39 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2021-02-09 17:30:39 -0500 |
commit | cf737870d433d6a425de370030b9cd69dc5228ea (patch) | |
tree | fa3811c9057d2cf718bf687e69851d449feedd55 | |
parent | add CVE to RELNOTES (diff) | |
download | firejail-cf737870d433d6a425de370030b9cd69dc5228ea.tar.gz firejail-cf737870d433d6a425de370030b9cd69dc5228ea.tar.zst firejail-cf737870d433d6a425de370030b9cd69dc5228ea.zip |
merge #3967 from main branch (TMPFS problem); version changed to development (0.9.64.5)
-rwxr-xr-x | configure | 20 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 12 insertions, 12 deletions
@@ -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.4. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.64.5. |
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. |
581 | PACKAGE_NAME='firejail' | 581 | PACKAGE_NAME='firejail' |
582 | PACKAGE_TARNAME='firejail' | 582 | PACKAGE_TARNAME='firejail' |
583 | PACKAGE_VERSION='0.9.64.4' | 583 | PACKAGE_VERSION='0.9.64.5' |
584 | PACKAGE_STRING='firejail 0.9.64.4' | 584 | PACKAGE_STRING='firejail 0.9.64.5' |
585 | PACKAGE_BUGREPORT='netblue30@protonmail.com' | 585 | PACKAGE_BUGREPORT='netblue30@protonmail.com' |
586 | PACKAGE_URL='https://firejail.wordpress.com' | 586 | PACKAGE_URL='https://firejail.wordpress.com' |
587 | 587 | ||
@@ -1293,7 +1293,7 @@ if test "$ac_init_help" = "long"; then | |||
1293 | # 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. |
1294 | # 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. |
1295 | cat <<_ACEOF | 1295 | cat <<_ACEOF |
1296 | \`configure' configures firejail 0.9.64.4 to adapt to many kinds of systems. | 1296 | \`configure' configures firejail 0.9.64.5 to adapt to many kinds of systems. |
1297 | 1297 | ||
1298 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1298 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1299 | 1299 | ||
@@ -1355,7 +1355,7 @@ fi | |||
1355 | 1355 | ||
1356 | if test -n "$ac_init_help"; then | 1356 | if test -n "$ac_init_help"; then |
1357 | case $ac_init_help in | 1357 | case $ac_init_help in |
1358 | short | recursive ) echo "Configuration of firejail 0.9.64.4:";; | 1358 | short | recursive ) echo "Configuration of firejail 0.9.64.5:";; |
1359 | esac | 1359 | esac |
1360 | cat <<\_ACEOF | 1360 | cat <<\_ACEOF |
1361 | 1361 | ||
@@ -1471,7 +1471,7 @@ fi | |||
1471 | test -n "$ac_init_help" && exit $ac_status | 1471 | test -n "$ac_init_help" && exit $ac_status |
1472 | if $ac_init_version; then | 1472 | if $ac_init_version; then |
1473 | cat <<\_ACEOF | 1473 | cat <<\_ACEOF |
1474 | firejail configure 0.9.64.4 | 1474 | firejail configure 0.9.64.5 |
1475 | generated by GNU Autoconf 2.69 | 1475 | generated by GNU Autoconf 2.69 |
1476 | 1476 | ||
1477 | Copyright (C) 2012 Free Software Foundation, Inc. | 1477 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1773,7 +1773,7 @@ cat >config.log <<_ACEOF | |||
1773 | This file contains any messages produced by compilers while | 1773 | This file contains any messages produced by compilers while |
1774 | running configure, to aid debugging if configure makes a mistake. | 1774 | running configure, to aid debugging if configure makes a mistake. |
1775 | 1775 | ||
1776 | It was created by firejail $as_me 0.9.64.4, which was | 1776 | It was created by firejail $as_me 0.9.64.5, which was |
1777 | generated by GNU Autoconf 2.69. Invocation command line was | 1777 | generated by GNU Autoconf 2.69. Invocation command line was |
1778 | 1778 | ||
1779 | $ $0 $@ | 1779 | $ $0 $@ |
@@ -3539,7 +3539,7 @@ HAVE_OVERLAYFS="" | |||
3539 | # AC_SUBST(HAVE_OVERLAYFS) | 3539 | # AC_SUBST(HAVE_OVERLAYFS) |
3540 | #]) | 3540 | #]) |
3541 | 3541 | ||
3542 | HAVE_USERTMPS="" | 3542 | HAVE_USERTMPFS="" |
3543 | # Check whether --enable-usertmpfs was given. | 3543 | # Check whether --enable-usertmpfs was given. |
3544 | if test "${enable_usertmpfs+set}" = set; then : | 3544 | if test "${enable_usertmpfs+set}" = set; then : |
3545 | enableval=$enable_usertmpfs; | 3545 | enableval=$enable_usertmpfs; |
@@ -4813,7 +4813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4813 | # report actual input values of CONFIG_FILES etc. instead of their | 4813 | # report actual input values of CONFIG_FILES etc. instead of their |
4814 | # values after options handling. | 4814 | # values after options handling. |
4815 | ac_log=" | 4815 | ac_log=" |
4816 | This file was extended by firejail $as_me 0.9.64.4, which was | 4816 | This file was extended by firejail $as_me 0.9.64.5, which was |
4817 | generated by GNU Autoconf 2.69. Invocation command line was | 4817 | generated by GNU Autoconf 2.69. Invocation command line was |
4818 | 4818 | ||
4819 | CONFIG_FILES = $CONFIG_FILES | 4819 | CONFIG_FILES = $CONFIG_FILES |
@@ -4867,7 +4867,7 @@ _ACEOF | |||
4867 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4867 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4868 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4868 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4869 | ac_cs_version="\\ | 4869 | ac_cs_version="\\ |
4870 | firejail config.status 0.9.64.4 | 4870 | firejail config.status 0.9.64.5 |
4871 | configured by $0, generated by GNU Autoconf 2.69, | 4871 | configured by $0, generated by GNU Autoconf 2.69, |
4872 | with options \\"\$ac_cs_config\\" | 4872 | with options \\"\$ac_cs_config\\" |
4873 | 4873 | ||
diff --git a/configure.ac b/configure.ac index 4ab98e682..d15fa83da 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,7 +12,7 @@ | |||
12 | # | 12 | # |
13 | 13 | ||
14 | AC_PREREQ([2.68]) | 14 | AC_PREREQ([2.68]) |
15 | AC_INIT(firejail, 0.9.64.4, netblue30@protonmail.com, , https://firejail.wordpress.com) | 15 | AC_INIT(firejail, 0.9.64.5, netblue30@protonmail.com, , https://firejail.wordpress.com) |
16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
17 | 17 | ||
18 | AC_CONFIG_MACRO_DIR([m4]) | 18 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -77,7 +77,7 @@ AC_SUBST(HAVE_OVERLAYFS) | |||
77 | # AC_SUBST(HAVE_OVERLAYFS) | 77 | # AC_SUBST(HAVE_OVERLAYFS) |
78 | #]) | 78 | #]) |
79 | 79 | ||
80 | HAVE_USERTMPS="" | 80 | HAVE_USERTMPFS="" |
81 | AC_ARG_ENABLE([usertmpfs], | 81 | AC_ARG_ENABLE([usertmpfs], |
82 | AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])) | 82 | AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])) |
83 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ | 83 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ |