From 29da82d08aab5120262f42032fed6dc7807e5b0d Mon Sep 17 00:00:00 2001 From: netblue30 Date: Fri, 10 Feb 2023 14:38:57 -0500 Subject: private-etc: kdiff3, gzip, gunzip, tar etc --- etc/profile-a-l/archiver-common.profile | 1 + etc/profile-a-l/kdiff3.profile | 1 + test/sysutils/gzip.exp | 16 +++++----------- test/sysutils/sysutils.sh | 8 ++++++++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/etc/profile-a-l/archiver-common.profile b/etc/profile-a-l/archiver-common.profile index b0f83aa32..ef875c5b7 100644 --- a/etc/profile-a-l/archiver-common.profile +++ b/etc/profile-a-l/archiver-common.profile @@ -44,6 +44,7 @@ x11 none private-cache private-dev +private-etc dbus-user none dbus-system none diff --git a/etc/profile-a-l/kdiff3.profile b/etc/profile-a-l/kdiff3.profile index e0b3eadfd..d9e4480f5 100644 --- a/etc/profile-a-l/kdiff3.profile +++ b/etc/profile-a-l/kdiff3.profile @@ -52,6 +52,7 @@ disable-mnt private-bin kdiff3 private-cache private-dev +private-etc @x11 dbus-user none dbus-system none diff --git a/test/sysutils/gzip.exp b/test/sysutils/gzip.exp index 75b51694c..b0c41e429 100755 --- a/test/sysutils/gzip.exp +++ b/test/sysutils/gzip.exp @@ -7,20 +7,14 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "/bin/gzip -c /usr/bin/firejail > firejail_t1\r" -sleep 1 +send -- "rm index.html*\r" +after 500 -send -- "firejail /bin/gzip -c /usr/bin/firejail > firejail_t2\r" -sleep 1 - -send -- "diff -s firejail_t1 firejail_t2\r" +send -- "firejail gzip -c ../../mkdeb.sh | firejail gunzip -c\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "firejail_t1 and firejail_t2 are identical" + "This file is part of Firejail project" } - -send -- "rm firejail_t*\r" -sleep 1 - +after 500 puts "\nall done\n" diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh index 3c035c69c..c74a7d9e8 100755 --- a/test/sysutils/sysutils.sh +++ b/test/sysutils/sysutils.sh @@ -7,6 +7,14 @@ export MALLOC_CHECK_=3 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export LC_ALL=C +if command -v gzip +then + echo "TESTING: gzip" + ./gzip.exp +else + echo "TESTING SKIP: md5sum not found" +fi + if command -v md5sum then echo "TESTING: md5sum" -- cgit v1.2.3-70-g09d2