diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | RELNOTES | 4 | ||||
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rwxr-xr-x | test/profiles/profile_syntax.exp | 2 | ||||
-rwxr-xr-x | test/sysrq-trigger.exp | 21 | ||||
-rwxr-xr-x | test/test-root.sh | 5 |
7 files changed, 17 insertions, 37 deletions
@@ -72,6 +72,8 @@ Fred-Barclay (https://github.com/Fred-Barclay) | |||
72 | - added eom profile | 72 | - added eom profile |
73 | - added gnome-chess profile | 73 | - added gnome-chess profile |
74 | - added DOSBox profile | 74 | - added DOSBox profile |
75 | Sergey Alirzaev (https://github.com/l29ah) | ||
76 | - firejail.h enum fix | ||
75 | greigdp (https://github.com/greigdp) | 77 | greigdp (https://github.com/greigdp) |
76 | - Gajim IM client profile | 78 | - Gajim IM client profile |
77 | - fix Slack profile | 79 | - fix Slack profile |
@@ -1,4 +1,4 @@ | |||
1 | firejail (0.9.42~rc2) baseline; urgency=low | 1 | firejail (0.9.42) baseline; urgency=low |
2 | * security: --whitelist deleted files, submitted by Vasya Novikov | 2 | * security: --whitelist deleted files, submitted by Vasya Novikov |
3 | * security: disable x32 ABI in seccomp, submitted by Jann Horn | 3 | * security: disable x32 ABI in seccomp, submitted by Jann Horn |
4 | * security: tighten --chroot, submitted by Jann Horn | 4 | * security: tighten --chroot, submitted by Jann Horn |
@@ -43,7 +43,7 @@ firejail (0.9.42~rc2) baseline; urgency=low | |||
43 | * profiles: tar (gtar), unzip, unrar, file, skypeforlinux, | 43 | * profiles: tar (gtar), unzip, unrar, file, skypeforlinux, |
44 | * profiles: inox, Slack, gnome-chess. Gajim IM client, DOSBox | 44 | * profiles: inox, Slack, gnome-chess. Gajim IM client, DOSBox |
45 | * bugfixes | 45 | * bugfixes |
46 | -- netblue30 <netblue30@yahoo.com> Fri, 26 Aug 2016 08:00:00 -0500 | 46 | -- netblue30 <netblue30@yahoo.com> Thu, 8 Sept 2016 08:00:00 -0500 |
47 | 47 | ||
48 | firejail (0.9.40) baseline; urgency=low | 48 | firejail (0.9.40) baseline; urgency=low |
49 | * added --nice option | 49 | * added --nice option |
@@ -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.42~rc3. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.42. |
4 | # | 4 | # |
5 | # Report bugs to <netblue30@yahoo.com>. | 5 | # Report bugs to <netblue30@yahoo.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.42~rc3' | 583 | PACKAGE_VERSION='0.9.42' |
584 | PACKAGE_STRING='firejail 0.9.42~rc3' | 584 | PACKAGE_STRING='firejail 0.9.42' |
585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' | 585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' |
586 | PACKAGE_URL='http://firejail.wordpress.com' | 586 | PACKAGE_URL='http://firejail.wordpress.com' |
587 | 587 | ||
@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then | |||
1259 | # Omit some internal or obsolete options to make the list less imposing. | 1259 | # Omit some internal or obsolete options to make the list less imposing. |
1260 | # This message is too long to be a string in the A/UX 3.1 sh. | 1260 | # This message is too long to be a string in the A/UX 3.1 sh. |
1261 | cat <<_ACEOF | 1261 | cat <<_ACEOF |
1262 | \`configure' configures firejail 0.9.42~rc3 to adapt to many kinds of systems. | 1262 | \`configure' configures firejail 0.9.42 to adapt to many kinds of systems. |
1263 | 1263 | ||
1264 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1264 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1265 | 1265 | ||
@@ -1320,7 +1320,7 @@ fi | |||
1320 | 1320 | ||
1321 | if test -n "$ac_init_help"; then | 1321 | if test -n "$ac_init_help"; then |
1322 | case $ac_init_help in | 1322 | case $ac_init_help in |
1323 | short | recursive ) echo "Configuration of firejail 0.9.42~rc3:";; | 1323 | short | recursive ) echo "Configuration of firejail 0.9.42:";; |
1324 | esac | 1324 | esac |
1325 | cat <<\_ACEOF | 1325 | cat <<\_ACEOF |
1326 | 1326 | ||
@@ -1424,7 +1424,7 @@ fi | |||
1424 | test -n "$ac_init_help" && exit $ac_status | 1424 | test -n "$ac_init_help" && exit $ac_status |
1425 | if $ac_init_version; then | 1425 | if $ac_init_version; then |
1426 | cat <<\_ACEOF | 1426 | cat <<\_ACEOF |
1427 | firejail configure 0.9.42~rc3 | 1427 | firejail configure 0.9.42 |
1428 | generated by GNU Autoconf 2.69 | 1428 | generated by GNU Autoconf 2.69 |
1429 | 1429 | ||
1430 | Copyright (C) 2012 Free Software Foundation, Inc. | 1430 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1726,7 +1726,7 @@ cat >config.log <<_ACEOF | |||
1726 | This file contains any messages produced by compilers while | 1726 | This file contains any messages produced by compilers while |
1727 | running configure, to aid debugging if configure makes a mistake. | 1727 | running configure, to aid debugging if configure makes a mistake. |
1728 | 1728 | ||
1729 | It was created by firejail $as_me 0.9.42~rc3, which was | 1729 | It was created by firejail $as_me 0.9.42, which was |
1730 | generated by GNU Autoconf 2.69. Invocation command line was | 1730 | generated by GNU Autoconf 2.69. Invocation command line was |
1731 | 1731 | ||
1732 | $ $0 $@ | 1732 | $ $0 $@ |
@@ -4310,7 +4310,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4310 | # report actual input values of CONFIG_FILES etc. instead of their | 4310 | # report actual input values of CONFIG_FILES etc. instead of their |
4311 | # values after options handling. | 4311 | # values after options handling. |
4312 | ac_log=" | 4312 | ac_log=" |
4313 | This file was extended by firejail $as_me 0.9.42~rc3, which was | 4313 | This file was extended by firejail $as_me 0.9.42, which was |
4314 | generated by GNU Autoconf 2.69. Invocation command line was | 4314 | generated by GNU Autoconf 2.69. Invocation command line was |
4315 | 4315 | ||
4316 | CONFIG_FILES = $CONFIG_FILES | 4316 | CONFIG_FILES = $CONFIG_FILES |
@@ -4364,7 +4364,7 @@ _ACEOF | |||
4364 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4364 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4365 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4365 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4366 | ac_cs_version="\\ | 4366 | ac_cs_version="\\ |
4367 | firejail config.status 0.9.42~rc3 | 4367 | firejail config.status 0.9.42 |
4368 | configured by $0, generated by GNU Autoconf 2.69, | 4368 | configured by $0, generated by GNU Autoconf 2.69, |
4369 | with options \\"\$ac_cs_config\\" | 4369 | with options \\"\$ac_cs_config\\" |
4370 | 4370 | ||
diff --git a/configure.ac b/configure.ac index ca6066d25..11c5b993e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_PREREQ([2.68]) | 1 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.42~rc3, netblue30@yahoo.com, , http://firejail.wordpress.com) | 2 | AC_INIT(firejail, 0.9.42, netblue30@yahoo.com, , http://firejail.wordpress.com) |
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
4 | #AC_CONFIG_HEADERS([config.h]) | 4 | #AC_CONFIG_HEADERS([config.h]) |
5 | 5 | ||
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp index c8cb99a5f..d1be2074a 100755 --- a/test/profiles/profile_syntax.exp +++ b/test/profiles/profile_syntax.exp | |||
@@ -25,7 +25,7 @@ sleep 1 | |||
25 | send -- "ls -l /etc/shadow\r" | 25 | send -- "ls -l /etc/shadow\r" |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 3\n";exit} | 27 | timeout {puts "TESTING ERROR 3\n";exit} |
28 | "root root 0" | 28 | "root root" |
29 | } | 29 | } |
30 | 30 | ||
31 | sleep 1 | 31 | sleep 1 |
diff --git a/test/sysrq-trigger.exp b/test/sysrq-trigger.exp deleted file mode 100755 index 18fb4a01a..000000000 --- a/test/sysrq-trigger.exp +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | #!/usr/bin/expect -f | ||
2 | |||
3 | set timeout 10 | ||
4 | spawn $env(SHELL) | ||
5 | match_max 100000 | ||
6 | |||
7 | send -- "firejail\r" | ||
8 | expect { | ||
9 | timeout {puts "TESTING ERROR 0\n";exit} | ||
10 | "Child process initialized" | ||
11 | } | ||
12 | sleep 1 | ||
13 | |||
14 | send -- "echo b > /proc/sysrq-trigger\r" | ||
15 | expect { | ||
16 | timeout {puts "TESTING ERROR 1\n";exit} | ||
17 | "Read-only file system" | ||
18 | } | ||
19 | sleep 1 | ||
20 | |||
21 | puts "\n" | ||
diff --git a/test/test-root.sh b/test/test-root.sh index aca48d334..0fdaf4ff7 100755 --- a/test/test-root.sh +++ b/test/test-root.sh | |||
@@ -44,9 +44,6 @@ then | |||
44 | ./servers6.exp | 44 | ./servers6.exp |
45 | fi | 45 | fi |
46 | 46 | ||
47 | echo "TESTING: /proc/sysrq-trigger reset disabled (sysrq-trigger.exp)" | ||
48 | ./sysrq-trigger.exp | ||
49 | |||
50 | echo "TESTING: seccomp umount (seccomp-umount.exp)" | 47 | echo "TESTING: seccomp umount (seccomp-umount.exp)" |
51 | ./filters/seccomp-umount.exp | 48 | ./filters/seccomp-umount.exp |
52 | 49 | ||
@@ -80,3 +77,5 @@ rm -f /tmp/chroot/etc/resolv.conf | |||
80 | ln -s tmp /tmp/chroot/etc/resolv.conf | 77 | ln -s tmp /tmp/chroot/etc/resolv.conf |
81 | ./chroot-resolvconf.exp | 78 | ./chroot-resolvconf.exp |
82 | rm -f tmpfile | 79 | rm -f tmpfile |
80 | rm /tmp/chroot/etc/resolv.conf | ||
81 | |||