diff options
author | 2020-12-16 23:22:27 +0000 | |
---|---|---|
committer | 2020-12-16 23:22:27 +0000 | |
commit | 70e429d1fc45c239b2b77d62f29467d6f7f4459a (patch) | |
tree | 46893228200c4a8f3b238240d57f4a4926c1b080 /etc | |
parent | disable-shell.inc: add oksh (#3829) (diff) | |
download | firejail-70e429d1fc45c239b2b77d62f29467d6f7f4459a.tar.gz firejail-70e429d1fc45c239b2b77d62f29467d6f7f4459a.tar.zst firejail-70e429d1fc45c239b2b77d62f29467d6f7f4459a.zip |
Archiver fixes - drop private-bin (#3832)
* drop private-bin
* drop private-bin
* drop private-bin
* drop private-bin
* drop private-bin
* disable private-lib in tar.profile
Removing private-bin caused a test to fail - see discussion in https://github.com/netblue30/firejail/pull/3832. Thanks to @reinerh for explaining why I broke things!
Diffstat (limited to 'etc')
-rw-r--r-- | etc/profile-a-l/7z.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/ar.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/bsdtar.profile | 2 | ||||
-rw-r--r-- | etc/profile-m-z/tar.profile | 4 | ||||
-rw-r--r-- | etc/profile-m-z/unzip.profile | 2 |
5 files changed, 1 insertions, 11 deletions
diff --git a/etc/profile-a-l/7z.profile b/etc/profile-a-l/7z.profile index 4f9e72a79..5e1c17b28 100644 --- a/etc/profile-a-l/7z.profile +++ b/etc/profile-a-l/7z.profile | |||
@@ -10,5 +10,3 @@ include globals.local | |||
10 | noblacklist ${PATH}/bash | 10 | noblacklist ${PATH}/bash |
11 | noblacklist ${PATH}/sh | 11 | noblacklist ${PATH}/sh |
12 | include archiver-common.inc | 12 | include archiver-common.inc |
13 | |||
14 | private-bin 7z,7z*,bash,p7zip,sh | ||
diff --git a/etc/profile-a-l/ar.profile b/etc/profile-a-l/ar.profile index a600eddef..c2b215807 100644 --- a/etc/profile-a-l/ar.profile +++ b/etc/profile-a-l/ar.profile | |||
@@ -8,5 +8,3 @@ include ar.local | |||
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | include archiver-common.inc | 10 | include archiver-common.inc |
11 | |||
12 | private-bin ar | ||
diff --git a/etc/profile-a-l/bsdtar.profile b/etc/profile-a-l/bsdtar.profile index f2116f4ab..c37f4071e 100644 --- a/etc/profile-a-l/bsdtar.profile +++ b/etc/profile-a-l/bsdtar.profile | |||
@@ -8,6 +8,4 @@ include globals.local | |||
8 | 8 | ||
9 | include archiver-common.inc | 9 | include archiver-common.inc |
10 | 10 | ||
11 | # support compressed archives | ||
12 | private-bin bash,bsdcat,bsdcpio,bsdtar,bzip2,compress,gtar,gzip,lbzip2,libarchive,lz4,lzip,lzma,lzop,sh,xz | ||
13 | private-etc alternatives,group,localtime,passwd | 11 | private-etc alternatives,group,localtime,passwd |
diff --git a/etc/profile-m-z/tar.profile b/etc/profile-m-z/tar.profile index 5233f5e4e..f6efb0feb 100644 --- a/etc/profile-m-z/tar.profile +++ b/etc/profile-m-z/tar.profile | |||
@@ -13,9 +13,7 @@ noblacklist /var/lib/pacman | |||
13 | ignore include disable-shell.inc | 13 | ignore include disable-shell.inc |
14 | include archiver-common.inc | 14 | include archiver-common.inc |
15 | 15 | ||
16 | # support compressed archives | ||
17 | private-bin awk,bash,bzip2,compress,firejail,grep,gtar,gzip,lbzip2,lzip,lzma,lzop,sh,tar,xz | ||
18 | private-etc alternatives,group,localtime,login.defs,passwd | 16 | private-etc alternatives,group,localtime,login.defs,passwd |
19 | private-lib libfakeroot,liblzma.so.*,libreadline.so.* | 17 | #private-lib libfakeroot,liblzma.so.*,libreadline.so.* |
20 | # Debian based distributions need this for 'dpkg --unpack' (incl. synaptic) | 18 | # Debian based distributions need this for 'dpkg --unpack' (incl. synaptic) |
21 | writable-var | 19 | writable-var |
diff --git a/etc/profile-m-z/unzip.profile b/etc/profile-m-z/unzip.profile index be480923e..8da9ea820 100644 --- a/etc/profile-m-z/unzip.profile +++ b/etc/profile-m-z/unzip.profile | |||
@@ -10,8 +10,6 @@ include globals.local | |||
10 | # GNOME Shell integration (chrome-gnome-shell) | 10 | # GNOME Shell integration (chrome-gnome-shell) |
11 | noblacklist ${HOME}/.local/share/gnome-shell | 11 | noblacklist ${HOME}/.local/share/gnome-shell |
12 | 12 | ||
13 | noroot | ||
14 | include archiver-common.inc | 13 | include archiver-common.inc |
15 | 14 | ||
16 | private-bin unzip | ||
17 | private-etc alternatives,group,localtime,passwd | 15 | private-etc alternatives,group,localtime,passwd |