Commit 2e068b6d authored by Lorenzo Faletra's avatar Lorenzo Faletra

Import Debian changes 0.9.56-2parrot1

firejail (0.9.56-2parrot1) testing; urgency=medium

  * Import new Debian patch to disable unwanted tests.

firejail (0.9.56-2) unstable; urgency=medium

  * Properly (re)move obsolete conffiles.
    Thanks to Paul Wise for repeatedly reporting these issues.
    (Closes: #909640)
  * Mark autopkgtests as flaky, as some tests behave differently than
    expected depending on the environment they are run in.
  * Cherry-pick upstream patches to skip some environment-dependent tests.
parent e23a7d43
firejail (0.9.56-2parrot1) testing; urgency=medium
* Import new Debian patch to disable unwanted tests.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Thu, 11 Oct 2018 19:19:31 +0200
firejail (0.9.56-2) unstable; urgency=medium
* Properly (re)move obsolete conffiles.
Thanks to Paul Wise for repeatedly reporting these issues.
(Closes: #909640)
* Mark autopkgtests as flaky, as some tests behave differently than
expected depending on the environment they are run in.
* Cherry-pick upstream patches to skip some environment-dependent tests.
-- Reiner Herrmann <reiner@reiner-h.de> Mon, 01 Oct 2018 15:55:51 +0200
firejail (0.9.56-1parrot2) testing; urgency=medium
* Use ${VIDEOS} instead of ${VIDEO}
......
......@@ -2,7 +2,7 @@ Source: firejail
Section: utils
Priority: optional
Maintainer: Reiner Herrmann <reiner@reiner-h.de>
Build-Depends: debhelper (>= 10), libapparmor-dev
Build-Depends: debhelper (>= 11), libapparmor-dev
Standards-Version: 4.2.1
Homepage: https://firejail.wordpress.com
Vcs-Git: https://salsa.debian.org/deki-guest/firejail.git
......
rm_conffile /etc/firejail/lxterminal.profile 0.9.52-2~
mv_conffile /etc/firejail/xmr-stak-cpu.profile /etc/firejail/xmr-stak.profile 0.9.54~rc1-1~
rm_conffile /etc/firejail/Wire.profile 0.9.56-2~
mv_conffile /etc/firejail/wire.profile /etc/firejail/wire-desktop.profile 0.9.56-2~
disable-internet-tests.patch
skip-tests.patch
parrot-patches.patch
Autor: Reiner Herrmann <reiner@reiner-h.de>
Description: Skip some tests in unexpected environment
- cherry-picked from upstream commits 502b05e, 8b9844e, df18312 and 69b0ade
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -35,8 +35,13 @@
echo "TESTING: noroot (test/filters/noroot.exp)"
./noroot.exp
-echo "TESTING: capabilities (test/filters/caps.exp)"
-./caps.exp
+
+if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then
+ echo "TESTING: capabilities (test/filters/caps.exp)"
+ ./caps.exp
+else
+ echo "TESTING SKIP: other capabilities than expected (test/filters/caps.exp)"
+fi
echo "TESTING: capabilities print (test/filters/caps-print.exp)"
./caps-print.exp
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -91,6 +91,7 @@
}
expect {
timeout {puts "TESTING ERROR 14\n";exit}
+ "2" {puts "seccomp already active\n";}
"0"
}
expect {
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -21,8 +21,12 @@
rm -f /tmp/firejail-test-file-7699
rm -f /var/tmp/firejail-test-file-7699
-echo "TESTING: audit (test/utils/audit.exp)"
-./audit.exp
+if [ $(readlink /proc/self) -lt 100 ]; then
+ echo "TESTING SKIP: already running in pid namespace (test/utils/audit.exp)"
+else
+ echo "TESTING: audit (test/utils/audit.exp)"
+ ./audit.exp
+fi
echo "TESTING: name (test/utils/name.exp)"
./name.exp
@@ -114,11 +118,19 @@
echo "TESTING: file transfer (test/utils/ls.exp)"
./ls.exp
-echo "TESTING: firemon seccomp (test/utils/firemon-seccomp.exp)"
-./firemon-seccomp.exp
+if grep -q "^Seccomp.*0" /proc/self/status; then
+ echo "TESTING: firemon seccomp (test/utils/firemon-seccomp.exp)"
+ ./firemon-seccomp.exp
+else
+ echo "TESTING SKIP: seccomp already active (test/utils/firemon-seccomp.exp)"
+fi
-echo "TESTING: firemon caps (test/utils/firemon-caps.exp)"
-./firemon-caps.exp
+if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then
+ echo "TESTING: firemon caps (test/utils/firemon-caps.exp)"
+ ./firemon-caps.exp
+else
+ echo "TESTING SKIP: other capabilities than expected (test/utils/firemon-caps.exp)"
+fi
echo "TESTING: firemon cpu (test/utils/firemon-cpu.exp)"
./firemon-cpu.exp
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -25,8 +25,12 @@
echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)"
./sys_fs.exp
-echo "TESTING: kmsg access (test/fs/kmsg.exp)"
-./kmsg.exp
+if [ -c /dev/kmsg ]; then
+ echo "TESTING: kmsg access (test/fs/kmsg.exp)"
+ ./kmsg.exp
+else
+ echo "TESTING SKIP: /dev/kmsg not available"
+fi
echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
./fs_var_tmp.exp
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -22,11 +22,12 @@
}
expect {
timeout {puts "TESTING ERROR 2\n";exit}
- "blacklist /dev/kmsg"
+ "blacklist /proc/kmsg"
}
expect {
timeout {puts "TESTING ERROR 3\n";exit}
- "blacklist /proc/kmsg"
+ "blacklist /usr/bin/su" {puts "Arch Linux";}
+ "blacklist /bin/su" {puts "Debian"}
}
after 100
puts "\nall done\n"
Tests: simple-tests
Restrictions: allow-stderr
Restrictions: allow-stderr, flaky
Depends: @, expect, file, sudo, procps, xzdec, cpio, less, strace, csh, zsh, man, iputils-ping, wget, x11-common
Tests: application-tests
Restrictions: allow-stderr, isolation-machine
Restrictions: allow-stderr, isolation-machine, flaky
Depends: @, expect, file, strace, sudo, man-db, iptables, iputils-ping, wget, csh, zsh, xvfb, xserver-xephyr, xterm, evince, thunderbird, firefox, transmission-gtk
Tests: network-test
Restrictions: allow-stderr, breaks-testbed, isolation-machine, needs-root
Restrictions: allow-stderr, breaks-testbed, isolation-machine, needs-root, flaky
Depends: @, expect, iproute2, iptables, iputils-ping, net-tools, bridge-utils
......@@ -6,9 +6,6 @@ LOGFILE="$ADTTMP/test.log"
cp -a test "$ADTTMP"
cd "$ADTTMP/test"
# tests in <0.9.56 need those directories and don't create them before
mkdir -p ~/Desktop ~/Documents ~/Downloads ~/Music ~/Pictures ~/Videos
# run tests
for dir in arguments environment fcopy filters fs profiles sysutils utils;
do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment