From 70e429d1fc45c239b2b77d62f29467d6f7f4459a Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 16 Dec 2020 23:22:27 +0000 Subject: 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! --- etc/profile-a-l/7z.profile | 2 -- etc/profile-a-l/ar.profile | 2 -- etc/profile-a-l/bsdtar.profile | 2 -- etc/profile-m-z/tar.profile | 4 +--- etc/profile-m-z/unzip.profile | 2 -- 5 files changed, 1 insertion(+), 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 noblacklist ${PATH}/bash noblacklist ${PATH}/sh include archiver-common.inc - -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 include globals.local include archiver-common.inc - -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 include archiver-common.inc -# support compressed archives -private-bin bash,bsdcat,bsdcpio,bsdtar,bzip2,compress,gtar,gzip,lbzip2,libarchive,lz4,lzip,lzma,lzop,sh,xz 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 ignore include disable-shell.inc include archiver-common.inc -# support compressed archives -private-bin awk,bash,bzip2,compress,firejail,grep,gtar,gzip,lbzip2,lzip,lzma,lzop,sh,tar,xz private-etc alternatives,group,localtime,login.defs,passwd -private-lib libfakeroot,liblzma.so.*,libreadline.so.* +#private-lib libfakeroot,liblzma.so.*,libreadline.so.* # Debian based distributions need this for 'dpkg --unpack' (incl. synaptic) 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 # GNOME Shell integration (chrome-gnome-shell) noblacklist ${HOME}/.local/share/gnome-shell -noroot include archiver-common.inc -private-bin unzip private-etc alternatives,group,localtime,passwd -- cgit v1.2.3-70-g09d2