mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
sys-apps/firejail: drop 0.9.68-r1
Bug: https://bugs.gentoo.org/850748 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Joonas Niilola
@@ -1,2 +1 @@
|
||||
DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
|
||||
DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -urP firejail-0.9.68.orig/src/firejail/firejail.h firejail-0.9.68/src/firejail/firejail.h
|
||||
--- firejail-0.9.68.orig/src/firejail/firejail.h 2022-02-03 07:53:47.000000000 -0700
|
||||
+++ firejail-0.9.68/src/firejail/firejail.h 2022-02-06 21:09:35.279071101 -0700
|
||||
@@ -689,7 +689,7 @@
|
||||
int check_kernel_procs(void);
|
||||
void run_no_sandbox(int argc, char **argv) __attribute__((noreturn));
|
||||
|
||||
-#define MAX_ENVS 256 // some sane maximum number of environment variables
|
||||
+#define MAX_ENVS 2048 // some sane maximum number of environment variables
|
||||
#define MAX_ENV_LEN (PATH_MAX + 32) // FOOBAR=SOME_PATH, only applied to Firejail's own sandboxed apps
|
||||
// env.c
|
||||
typedef enum {
|
||||
@@ -1,81 +0,0 @@
|
||||
--- a/src/firecfg/firecfg.config 2022-02-03 07:53:47.000000000 -0700
|
||||
+++ b/src/firecfg/firecfg.config 2022-02-21 11:56:00.267419833 -0700
|
||||
@@ -213,7 +213,8 @@
|
||||
electron-mail
|
||||
electrum
|
||||
element-desktop
|
||||
-elinks
|
||||
+# Breaks emerge/portage on Gentoo: 'too many environment variables'
|
||||
+#elinks
|
||||
empathy
|
||||
enchant
|
||||
enchant-2
|
||||
@@ -259,7 +260,8 @@
|
||||
flameshot
|
||||
flashpeak-slimjet
|
||||
flowblade
|
||||
-fontforge
|
||||
+# Breaks emerge/portage on Gentoo
|
||||
+#fontforge
|
||||
font-manager
|
||||
fossamail
|
||||
four-in-a-row
|
||||
@@ -490,11 +492,16 @@
|
||||
luminance-hdr
|
||||
lximage-qt
|
||||
lxmusic
|
||||
-lynx
|
||||
+# Breaks emerge/portage on Gentoo: 'too many environment variables'
|
||||
+#lynx
|
||||
lyx
|
||||
macrofusion
|
||||
magicor
|
||||
-man
|
||||
+# Breaks: $ man chromium-browser
|
||||
+# WARNING: terminal is not fully functional
|
||||
+# Press RETURN to continue
|
||||
+# Manual page chromium-browser(1) byte 0/0 (END) (press h for help or q to quit)
|
||||
+#man
|
||||
manaplus
|
||||
marker
|
||||
masterpdfeditor
|
||||
@@ -571,7 +578,8 @@
|
||||
musictube
|
||||
musixmatch
|
||||
mutool
|
||||
-mutt
|
||||
+# Breaks when configs are under ~/.mutt/
|
||||
+#mutt
|
||||
mypaint
|
||||
mypaint-ora-thumbnailer
|
||||
natron
|
||||
@@ -632,7 +640,8 @@
|
||||
palemoon
|
||||
#pandoc
|
||||
parole
|
||||
-patch
|
||||
+# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
|
||||
+#patch
|
||||
pavucontrol
|
||||
pavucontrol-qt
|
||||
pcsxr
|
||||
@@ -758,7 +767,8 @@
|
||||
stellarium
|
||||
strawberry
|
||||
straw-viewer
|
||||
-strings
|
||||
+# Breaks emerge/portage on Gentoo
|
||||
+#strings
|
||||
studio.sh
|
||||
subdownloader
|
||||
supertux2
|
||||
@@ -877,7 +887,8 @@
|
||||
weechat
|
||||
weechat-curses
|
||||
wesnoth
|
||||
-wget
|
||||
+# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
|
||||
+#wget
|
||||
wget2
|
||||
whalebird
|
||||
whois
|
||||
@@ -1,118 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs python-single-r1 linux-info
|
||||
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~x86"
|
||||
else
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
|
||||
EGIT_BRANCH="master"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Security sandbox for any type of processes"
|
||||
HOMEPAGE="https://firejail.wordpress.com/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X"
|
||||
# Needs a lot of work to function within sandbox/portage
|
||||
# bug #769731
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!sys-apps/firejail-lts
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
contrib? ( ${PYTHON_DEPS} )
|
||||
dbusproxy? ( sys-apps/xdg-dbus-proxy )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
sys-libs/libseccomp
|
||||
test? ( dev-tcltk/expect )"
|
||||
|
||||
REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-envlimits.patch"
|
||||
"${FILESDIR}/${P}-firecfg.config.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
CONFIG_CHECK="~SQUASHFS"
|
||||
local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
|
||||
check_extra_config
|
||||
use contrib && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
|
||||
|
||||
sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
|
||||
|
||||
# fix up hardcoded paths to templates and docs
|
||||
local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
|
||||
for file in ${files[@]} ; do
|
||||
sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
|
||||
done
|
||||
|
||||
# remove compression of man pages
|
||||
sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
|
||||
|
||||
if use contrib; then
|
||||
python_fix_shebang -f contrib/*.py
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-firetunnel \
|
||||
--enable-suid \
|
||||
$(use_enable apparmor) \
|
||||
$(use_enable chroot) \
|
||||
$(use_enable dbusproxy) \
|
||||
$(use_enable file-transfer) \
|
||||
$(use_enable globalcfg) \
|
||||
$(use_enable network) \
|
||||
$(use_enable private-home) \
|
||||
$(use_enable userns) \
|
||||
$(use_enable X x11)
|
||||
|
||||
cat > 99firejail <<-EOF || die
|
||||
SANDBOX_WRITE="/run/firejail"
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Gentoo-specific profile customizations
|
||||
insinto /etc/${PN}
|
||||
local profile_local
|
||||
for profile_local in "${FILESDIR}"/profile_*local ; do
|
||||
newins "${profile_local}" "${profile_local/\/*profile_/}"
|
||||
done
|
||||
|
||||
# Prevent sandbox violations when toolchain is firejailed
|
||||
insinto /etc/sandbox.d
|
||||
doins 99firejail
|
||||
|
||||
rm "${ED}"/usr/share/doc/${PF}/COPYING || die
|
||||
|
||||
if use contrib; then
|
||||
python_scriptinto /usr/$(get_libdir)/firejail
|
||||
python_doscript contrib/*.py
|
||||
insinto /usr/$(get_libdir)/firejail
|
||||
dobin contrib/*.sh
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user