7 files changed, 17 insertions, 37 deletions

diff --git a/README b/README
index 0302114d6..b3cef82b0 100644
--- a/README
+++ b/README
@@ -72,6 +72,8 @@ Fred-Barclay (https://github.com/Fred-Barclay)
         - added eom profile
         - added gnome-chess profile
         - added DOSBox profile
+Sergey Alirzaev (https://github.com/l29ah)
+        - firejail.h enum fix
 greigdp (https://github.com/greigdp)
         - Gajim IM client profile
         - fix Slack profile
diff --git a/RELNOTES b/RELNOTES
index 734a92b4f..e48dbbb0e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,4 +1,4 @@
-firejail (0.9.42~rc2) baseline; urgency=low
+firejail (0.9.42) baseline; urgency=low
   * security: --whitelist deleted files, submitted by Vasya Novikov
   * security: disable x32 ABI in seccomp, submitted by Jann Horn
   * security: tighten --chroot, submitted by Jann Horn
@@ -43,7 +43,7 @@ firejail (0.9.42~rc2) baseline; urgency=low
   * profiles: tar (gtar), unzip, unrar, file, skypeforlinux,
   * profiles: inox, Slack, gnome-chess. Gajim IM client, DOSBox
   * bugfixes
- -- netblue30 <netblue30@yahoo.com>  Fri, 26 Aug 2016 08:00:00 -0500
+ -- netblue30 <netblue30@yahoo.com>  Thu, 8 Sept 2016 08:00:00 -0500
 
 firejail (0.9.40) baseline; urgency=low
   * added --nice option
diff --git a/configure b/configure
index 0b05d42e5..b591987e7 100755
--- a/configure
+++ b/configure
@@ -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.42~rc3.
+# Generated by GNU Autoconf 2.69 for firejail 0.9.42.
 #
 # Report bugs to <netblue30@yahoo.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='firejail'
 PACKAGE_TARNAME='firejail'
-PACKAGE_VERSION='0.9.42~rc3'
-PACKAGE_STRING='firejail 0.9.42~rc3'
+PACKAGE_VERSION='0.9.42'
+PACKAGE_STRING='firejail 0.9.42'
 PACKAGE_BUGREPORT='netblue30@yahoo.com'
 PACKAGE_URL='http://firejail.wordpress.com'
 
@@ -1259,7 +1259,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.42~rc3 to adapt to many kinds of systems.
+\`configure' configures firejail 0.9.42 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1320,7 +1320,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of firejail 0.9.42~rc3:";;
+     short | recursive ) echo "Configuration of firejail 0.9.42:";;
    esac
   cat <<\_ACEOF
 
@@ -1424,7 +1424,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-firejail configure 0.9.42~rc3
+firejail configure 0.9.42
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1726,7 +1726,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.42~rc3, which was
+It was created by firejail $as_me 0.9.42, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4310,7 +4310,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.42~rc3, which was
+This file was extended by firejail $as_me 0.9.42, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4364,7 +4364,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.42~rc3
+firejail config.status 0.9.42
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ca6066d25..11c5b993e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT(firejail, 0.9.42~rc3, netblue30@yahoo.com, , http://firejail.wordpress.com)
+AC_INIT(firejail, 0.9.42, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
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
 send -- "ls -l /etc/shadow\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "root root 0"
+        "root root"
 }
 
 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 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
-}
-sleep 1
-
-send -- "echo b > /proc/sysrq-trigger\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "Read-only file system"
-}
-sleep 1
-
-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
         ./servers6.exp
 fi
 
-echo "TESTING: /proc/sysrq-trigger reset disabled (sysrq-trigger.exp)"
-./sysrq-trigger.exp
-
 echo "TESTING: seccomp umount (seccomp-umount.exp)"
 ./filters/seccomp-umount.exp
 
@@ -80,3 +77,5 @@ rm -f /tmp/chroot/etc/resolv.conf
 ln -s tmp /tmp/chroot/etc/resolv.conf
 ./chroot-resolvconf.exp
 rm -f tmpfile
+rm /tmp/chroot/etc/resolv.conf
+