From 6eb481b4c5d7ebe56828107b23b8c7ffc16bd70e Mon Sep 17 00:00:00 2001 From: netblue30 Date: Thu, 31 Mar 2016 10:22:40 -0400 Subject: testing --- RELNOTES | 2 +- platform/debian/conffiles | 4 ++-- test/private-whitelist.exp | 2 +- test/private_dir.exp | 4 ++-- test/private_dir_profile.exp | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RELNOTES b/RELNOTES index 0f690860f..2575d2b88 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,4 @@ -firejail (0.9.39) baseline; urgency=low +firejail (0.9.40-rc1) baseline; urgency=low * added --nice option * added --x11 option * added --x11=xpra option diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 267990a24..e628058c9 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles @@ -73,7 +73,7 @@ /etc/firejail/firejail.config /etc/firejail/qutebrowser.profile /etc/firejail/flashpeak-slimjet.profile -/etc/firejail/ssh -/etc/firejail/openbox +/etc/firejail/ssh.profile +/etc/firejail/openbox.profile /etc/firejail/disable-programs.inc /etc/firejail/disable-passwdmgr.inc diff --git a/test/private-whitelist.exp b/test/private-whitelist.exp index f06415c52..7379241ef 100755 --- a/test/private-whitelist.exp +++ b/test/private-whitelist.exp @@ -28,7 +28,7 @@ sleep 1 send -- "ls -a ~ | wc -l\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "4" + "5" } sleep 1 diff --git a/test/private_dir.exp b/test/private_dir.exp index 95f89362a..9dfb2ea9f 100755 --- a/test/private_dir.exp +++ b/test/private_dir.exp @@ -42,8 +42,8 @@ expect { send -- "ls -al | wc -l;pwd\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "5" {puts "normal system\n";} - "4" {puts "OpenSUSE\n";} + "7" {puts "normal system\n";} + "5" {puts "OpenSUSE\n";} } expect { timeout {puts "TESTING ERROR 2\n";exit} diff --git a/test/private_dir_profile.exp b/test/private_dir_profile.exp index e6c01798e..5b38ad0bb 100755 --- a/test/private_dir_profile.exp +++ b/test/private_dir_profile.exp @@ -42,13 +42,13 @@ expect { send -- "ls -al | wc -l;pwd\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "5" {puts "normal system\n";} - "4" {puts "OpenSUSE\n";} + "7" {puts "normal system\n";} + "5" {puts "OpenSUSE\n";} } expect { timeout {puts "TESTING ERROR 2\n";exit} "home" } -puts "\n" +puts "\nall done\n" -- cgit v1.2.3-54-g00ecf