* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2022-07-15 12:10 Joonas Niilola
0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2022-07-15 12:10 UTC (permalink / raw
To: gentoo-commits
commit: c4841bfc1121b88d8603a594046429ca4eaa6978
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 12:10:04 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 12:10:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4841bfc
sys-apps/firejail: drop 0.9.68-r1
Bug: https://bugs.gentoo.org/850748
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-apps/firejail/Manifest | 1 -
.../firejail/files/firejail-0.9.68-envlimits.patch | 12 ---
.../files/firejail-0.9.68-firecfg.config.patch | 81 --------------
sys-apps/firejail/firejail-0.9.68-r1.ebuild | 118 ---------------------
4 files changed, 212 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 93c7782e051e..4b34c30dcd84 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -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
diff --git a/sys-apps/firejail/files/firejail-0.9.68-envlimits.patch b/sys-apps/firejail/files/firejail-0.9.68-envlimits.patch
deleted file mode 100644
index 4b306342e532..000000000000
--- a/sys-apps/firejail/files/firejail-0.9.68-envlimits.patch
+++ /dev/null
@@ -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 {
diff --git a/sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch b/sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch
deleted file mode 100644
index eaec87a108d5..000000000000
--- a/sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch
+++ /dev/null
@@ -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
diff --git a/sys-apps/firejail/firejail-0.9.68-r1.ebuild b/sys-apps/firejail/firejail-0.9.68-r1.ebuild
deleted file mode 100644
index 1946f9ec29dc..000000000000
--- a/sys-apps/firejail/firejail-0.9.68-r1.ebuild
+++ /dev/null
@@ -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
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2022-06-15 5:47 Joonas Niilola
0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2022-06-15 5:47 UTC (permalink / raw
To: gentoo-commits
commit: cc196a524bd19f0f9e5960c0fb4744347f0fd3af
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Thu Jun 9 22:01:22 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 05:47:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc196a52
sys-apps/firejail: bump to 0.9.70 for security fixes; cleanup
Fix for CVE-2022-31214. Drop old version & un-tended-to live ebuild.
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Bug: https://bugs.gentoo.org/850748
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/25840
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-apps/firejail/Manifest | 1 +
.../firejail/files/firejail-0.9.70-envlimits.patch | 12 +++
.../files/firejail-0.9.70-firecfg.config.patch | 82 ++++++++++++++++++
...rejail-0.9.68.ebuild => firejail-0.9.70.ebuild} | 6 +-
sys-apps/firejail/firejail-9999.ebuild | 99 ----------------------
sys-apps/firejail/metadata.xml | 1 -
6 files changed, 98 insertions(+), 103 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index ae81ea9d7be4..93c7782e051e 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1 +1,2 @@
DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
+DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
diff --git a/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
new file mode 100644
index 000000000000..d99db424c052
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
@@ -0,0 +1,12 @@
+diff -urP firejail-0.9.70.orig/src/firejail/firejail.h firejail-0.9.70/src/firejail/firejail.h
+--- firejail-0.9.70.orig/src/firejail/firejail.h 2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firejail/firejail.h 2022-06-09 13:06:04.094034022 -0600
+@@ -706,7 +706,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 {
diff --git a/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
new file mode 100644
index 000000000000..ff751b9dc684
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
@@ -0,0 +1,82 @@
+diff -urP firejail-0.9.70.orig/src/firecfg/firecfg.config firejail-0.9.70/src/firecfg/firecfg.config
+--- firejail-0.9.70.orig/src/firecfg/firecfg.config 2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firecfg/firecfg.config 2022-06-09 13:06:38.646038407 -0600
+@@ -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
+@@ -635,7 +643,8 @@
+ palemoon
+ #pandoc
+ parole
+-patch
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#patch
+ pavucontrol
+ pavucontrol-qt
+ pcsxr
+@@ -761,7 +770,8 @@
+ stellarium
+ strawberry
+ straw-viewer
+-strings
++# Breaks emerge/portage on Gentoo
++#strings
+ studio.sh
+ subdownloader
+ supertux2
+@@ -880,7 +890,8 @@
+ weechat
+ weechat-curses
+ wesnoth
+-wget
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#wget
+ wget2
+ whalebird
+ whois
diff --git a/sys-apps/firejail/firejail-0.9.68.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
similarity index 96%
rename from sys-apps/firejail/firejail-0.9.68.ebuild
rename to sys-apps/firejail/firejail-0.9.70.ebuild
index 50077c0d2db7..5c5a610f1024 100644
--- a/sys-apps/firejail/firejail-0.9.68.ebuild
+++ b/sys-apps/firejail/firejail-0.9.70.ebuild
@@ -9,7 +9,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
@@ -21,7 +21,7 @@ HOMEPAGE="https://firejail.wordpress.com/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X"
+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"
@@ -39,6 +39,7 @@ REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/${P}-envlimits.patch"
+ "${FILESDIR}/${P}-firecfg.config.patch"
)
pkg_setup() {
@@ -81,7 +82,6 @@ src_configure() {
$(use_enable network) \
$(use_enable private-home) \
$(use_enable userns) \
- $(use_enable whitelist) \
$(use_enable X x11)
cat > 99firejail <<-EOF || die
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
deleted file mode 100644
index 440d20af51ec..000000000000
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ /dev/null
@@ -1,99 +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 +whitelist 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} )"
-
-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 whitelist) \
- $(use_enable X x11)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- 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
-}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index ea3a52f878b9..91bf2e4aa95b 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -31,7 +31,6 @@
<flag name="network">Enable networking features</flag>
<flag name="private-home">Enable private home feature</flag>
<flag name="userns">Enable attaching a new user namespace to a sandbox (--noroot option)</flag>
- <flag name="whitelist">Enable whitelist</flag>
<flag name="X">Enable X11 sandboxing</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2022-02-22 9:43 Florian Schmaus
0 siblings, 0 replies; 16+ messages in thread
From: Florian Schmaus @ 2022-02-22 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 0246df2ab9257ecb01fa6fc453a7c647cd1ca543
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Mon Feb 21 19:15:13 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 09:43:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0246df2a
sys-apps/firejail: apply firecfg patch; misc cleanups
Update firecfg patch from my testing tree and apply it. Also
remove an obsolete use/configure flag.
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/833596
Closes: https://github.com/gentoo/gentoo/pull/24299
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24305
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
....patch => firejail-0.9.68-firecfg.config.patch} | 32 ++++--
sys-apps/firejail/firejail-0.9.68-r1.ebuild | 118 +++++++++++++++++++++
2 files changed, 139 insertions(+), 11 deletions(-)
diff --git a/sys-apps/firejail/files/firecfg.config.patch b/sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch
similarity index 69%
rename from sys-apps/firejail/files/firecfg.config.patch
rename to sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch
index f4f5f34a196a..eaec87a108d5 100644
--- a/sys-apps/firejail/files/firecfg.config.patch
+++ b/sys-apps/firejail/files/firejail-0.9.68-firecfg.config.patch
@@ -1,6 +1,6 @@
---- firecfg.config.orig 2021-11-05 20:30:20.451017470 -0600
-+++ firecfg.config 2022-02-06 20:53:53.948407229 -0700
-@@ -207,7 +207,8 @@
+--- 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
@@ -10,17 +10,17 @@
empathy
enchant
enchant-2
-@@ -254,7 +255,8 @@
+@@ -259,7 +260,8 @@
+ flameshot
flashpeak-slimjet
flowblade
- font-manager
-fontforge
+# Breaks emerge/portage on Gentoo
+#fontforge
+ font-manager
fossamail
four-in-a-row
- fractal
-@@ -478,11 +480,16 @@
+@@ -490,11 +492,16 @@
luminance-hdr
lximage-qt
lxmusic
@@ -39,7 +39,7 @@
manaplus
marker
masterpdfeditor
-@@ -558,7 +565,8 @@
+@@ -571,7 +578,8 @@
musictube
musixmatch
mutool
@@ -49,17 +49,17 @@
mypaint
mypaint-ora-thumbnailer
natron
-@@ -616,7 +624,8 @@
+@@ -632,7 +640,8 @@
palemoon
#pandoc
parole
-patch
-+# Breaks emerge/portage on Gentoo: 'too many environment variables'
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
+#patch
pavucontrol
pavucontrol-qt
pcsxr
-@@ -736,7 +745,8 @@
+@@ -758,7 +767,8 @@
stellarium
strawberry
straw-viewer
@@ -69,3 +69,13 @@
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
diff --git a/sys-apps/firejail/firejail-0.9.68-r1.ebuild b/sys-apps/firejail/firejail-0.9.68-r1.ebuild
new file mode 100644
index 000000000000..5c5a610f1024
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.68-r1.ebuild
@@ -0,0 +1,118 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2019-08-07 4:58 Dennis Lamm
0 siblings, 0 replies; 16+ messages in thread
From: Dennis Lamm @ 2019-08-07 4:58 UTC (permalink / raw
To: gentoo-commits
commit: 2aa6df74f87a2e7a4870fcf19695db6b2390b061
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 04:57:58 2019 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 04:58:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa6df74
sys-apps/firejail: remove old
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
sys-apps/firejail/Manifest | 1 -
sys-apps/firejail/files/0.9.56-contrib-fix.patch | 36 -----------------
sys-apps/firejail/firejail-0.9.56-r1.ebuild | 47 ----------------------
sys-apps/firejail/firejail-0.9.56.ebuild | 48 ----------------------
sys-apps/firejail/firejail-0.9.60.ebuild | 51 ------------------------
5 files changed, 183 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 4aa1ae5d5fa..69947b7d043 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,3 +1,2 @@
DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
-DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24
DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
deleted file mode 100644
index 7192bba3480..00000000000
--- a/sys-apps/firejail/files/0.9.56-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
-
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
-
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
-
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
-
- import sys
- import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.56-r1.ebuild b/sys-apps/firejail/firejail-0.9.56-r1.ebuild
deleted file mode 100644
index 6da35dbc147..00000000000
--- a/sys-apps/firejail/firejail-0.9.56-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apparmor +chroot contrib +file-transfer +network
- +seccomp suid +userns x11"
-
-DEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
-
-RESTRICT=test
-
-src_prepare() {
- default
- find -name Makefile.in -exec sed -i -r \
- -e '/^\tinstall .*COPYING /d' \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable apparmor)
- $(use_enable chroot)
- $(use_enable contrib contrib-install)
- $(use_enable file-transfer)
- $(use_enable network)
- $(use_enable seccomp)
- $(use_enable suid)
- $(use_enable userns)
- $(use_enable x11)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/firejail/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild
deleted file mode 100644
index e3704836fb2..00000000000
--- a/sys-apps/firejail/firejail-0.9.56.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apparmor +chroot contrib +file-transfer +network
- +seccomp suid +userns x11"
-
-DEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )"
-RDEPEND="${DEPEND}
- x11? ( x11-wm/xpra[client,server] )"
-
-PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
-
-RESTRICT=test
-
-src_prepare() {
- default
- find -name Makefile.in -exec sed -i -r \
- -e '/^\tinstall .*COPYING /d' \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable apparmor)
- $(use_enable chroot)
- $(use_enable contrib contrib-install)
- $(use_enable file-transfer)
- $(use_enable network)
- $(use_enable seccomp)
- $(use_enable suid)
- $(use_enable userns)
- $(use_enable x11)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/firejail/firejail-0.9.60.ebuild b/sys-apps/firejail/firejail-0.9.60.ebuild
deleted file mode 100644
index 31f38bf0483..00000000000
--- a/sys-apps/firejail/firejail-0.9.60.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns +whitelist x11"
-
-DEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )
- test? ( dev-tcltk/expect )"
-
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
-
-RESTRICT="test"
-
-src_prepare() {
- default
-
- find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die
-
- find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
- --expression='/^\tinstall .*COPYING /d' \
- --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
-
- sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-}
-
-src_configure() {
- econf \
- $(use_enable apparmor) \
- $(use_enable chroot) \
- $(use_enable contrib contrib-install) \
- $(use_enable file-transfer) \
- $(use_enable globalcfg) \
- $(use_enable network) \
- $(use_enable overlayfs) \
- $(use_enable private-home)
- $(use_enable seccomp) \
- $(use_enable suid) \
- $(use_enable userns) \
- $(use_enable whitelist) \
- $(use_enable x11)
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2019-08-05 19:22 Dennis Lamm
0 siblings, 0 replies; 16+ messages in thread
From: Dennis Lamm @ 2019-08-05 19:22 UTC (permalink / raw
To: gentoo-commits
commit: c24972258d3a3d31bb960d79be1b14928e98b7dd
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 19:22:04 2019 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 19:22:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2497225
sys-apps/firejail: [QA] fix compressed man pages
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
.../files/firejail-compressed-manpages.patch | 17 ++++++
sys-apps/firejail/firejail-0.9.60-r1.ebuild | 65 ++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/sys-apps/firejail/files/firejail-compressed-manpages.patch b/sys-apps/firejail/files/firejail-compressed-manpages.patch
new file mode 100644
index 00000000000..8a43bcac261
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-compressed-manpages.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index 9c9b93d..2eb8ab2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -141,10 +141,9 @@ endif
+ install -m 0755 -d $(DESTDIR)/$(mandir)/man5
+ for man in $(MANPAGES); do \
+ rm -f $$man.gz; \
+- gzip -9n $$man; \
+ case "$$man" in \
+- *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \
+- *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \
++ *.1) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man1/; ;; \
++ *.5) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man5/; ;; \
+ esac; \
+ done
+ rm -f $(MANPAGES) $(MANPAGES:%=%.gz)
diff --git a/sys-apps/firejail/firejail-0.9.60-r1.ebuild b/sys-apps/firejail/firejail-0.9.60-r1.ebuild
new file mode 100644
index 00000000000..c8262c74d0d
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.60-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )
+ test? ( dev-tcltk/expect )"
+
+RDEPEND="apparmor? ( sys-libs/libapparmor )"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-compressed-manpages.patch" )
+
+src_prepare() {
+ default
+
+ find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die
+
+ find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
+ --expression='/^\tinstall .*COPYING /d' \
+ --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
+
+ sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable apparmor) \
+ $(use_enable chroot) \
+ $(use_enable contrib contrib-install) \
+ $(use_enable file-transfer) \
+ $(use_enable globalcfg) \
+ $(use_enable network) \
+ $(use_enable overlayfs) \
+ $(use_enable private-home) \
+ $(use_enable seccomp) \
+ $(use_enable suid) \
+ $(use_enable userns) \
+ $(use_enable whitelist) \
+ $(use_enable x11)
+}
+
+src_install() {
+ default
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins contrib/vim/ftdetect/firejail.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins contrib/vim/syntax/firejail.vim
+ fi
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2018-10-10 20:40 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2018-10-10 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 410d79a13666d97f1b141dc17687c29add1564db
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 20:22:57 2018 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 20:40:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410d79a1
sys-apps/firejail: Bump version
Bug: https://bugs.gentoo.org/668178
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>
sys-apps/firejail/Manifest | 1 +
sys-apps/firejail/files/0.9.56-contrib-fix.patch | 36 ++++++++++++++++++
sys-apps/firejail/firejail-0.9.56.ebuild | 48 ++++++++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 44478f3873d..02cfdd6b877 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -5,3 +5,4 @@ DIST firejail-0.9.48.tar.xz 257592 BLAKE2B 6e346f97417ceb2fbd31779715b652130466d
DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
DIST firejail-0.9.52.tar.xz 299396 BLAKE2B 62b7798e46b69f1ae12ac85f219cc7414652e64d3bf9e1b206f8956febdc53c78151f08052fe694c691b787356b6821e8ff0df71a4277a238a4dc7d724165969 SHA512 f7318bcbd68f6d8c709cdc1f5065cb1019c1c64fdbd47c0fd698975412c4e075c7209bd275056daf61558b79d79127c88f1580cb8e4e034cc0551c7d34e11d06
DIST firejail-0.9.54.tar.xz 315884 BLAKE2B 62eaf42711aa3560c7ecb965903b64b10e04ea2898950b13c5371d859ccb1633634e1455c5558bf6fc02211d9937270fbc82cdd8409ff060f3a2c5aa8eb51517 SHA512 84bb5992ea4846d4398cc72dd9d65a8c4f20da9a2798ccd74a9157088313b768ef361bada62617d02b31174bca4b95e6560140f448021e1b93740a37992fe3df
+DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24
diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
new file mode 100644
index 00000000000..7192bba3480
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
@@ -0,0 +1,36 @@
+diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
+--- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ __author__ = "KOLANICH"
+ __copyright__ = """This is free and unencumbered software released into the public domain.
+diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
+--- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
+--- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
+--- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import sys
+ import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild
new file mode 100644
index 00000000000..e3704836fb2
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.56.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apparmor +chroot contrib +file-transfer +network
+ +seccomp suid +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
+
+RESTRICT=test
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/^\tinstall .*COPYING /d' \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable chroot)
+ $(use_enable contrib contrib-install)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable suid)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2018-03-06 23:20 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2018-03-06 23:20 UTC (permalink / raw
To: gentoo-commits
commit: ff50e6ea6059b64f22af046cc85de3e60bef7d8e
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 22:31:23 2018 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 23:20:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff50e6ea
sys-apps/firejail: Bump version
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-apps/firejail/Manifest | 1 +
sys-apps/firejail/files/0.9.52-contrib-fix.patch | 36 +++++++++++++++++
sys-apps/firejail/firejail-0.9.52.ebuild | 49 ++++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index bab7c66c876..352f1a2abe9 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -3,3 +3,4 @@ DIST firejail-0.9.44.8.tar.xz 214624 BLAKE2B 05faddb65ea1736ff0a098f5ac8ae8bec62
DIST firejail-0.9.46.tar.xz 254748 BLAKE2B bf9c6af2bbc53c153d39c16b4d1720f61110e40b5b7a57fd1f4edc4d758d7edb3cbfde17dbc1865ab1d3ad7cfc58e28d0e4d6aab1109bcdf9a4fb0179d1f5c98 SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786
DIST firejail-0.9.48.tar.xz 257592 BLAKE2B 6e346f97417ceb2fbd31779715b652130466dc007be6ebdca7f1d7c46a784b9f6a938370fc6abf50d131e1959001ffcbf9b98dc9968647339677a101b1d974ea SHA512 63d2d8a6e6b3f505c88b132a3528ec5211ca5325e53ad1878b25bfb7d679b63af769443b464375a96ea5278b0edca98bd295256072dfa2e1a9d3ba829579b0b7
DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
+DIST firejail-0.9.52.tar.xz 299396 BLAKE2B 62b7798e46b69f1ae12ac85f219cc7414652e64d3bf9e1b206f8956febdc53c78151f08052fe694c691b787356b6821e8ff0df71a4277a238a4dc7d724165969 SHA512 f7318bcbd68f6d8c709cdc1f5065cb1019c1c64fdbd47c0fd698975412c4e075c7209bd275056daf61558b79d79127c88f1580cb8e4e034cc0551c7d34e11d06
diff --git a/sys-apps/firejail/files/0.9.52-contrib-fix.patch b/sys-apps/firejail/files/0.9.52-contrib-fix.patch
new file mode 100644
index 00000000000..7192bba3480
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.52-contrib-fix.patch
@@ -0,0 +1,36 @@
+diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
+--- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ __author__ = "KOLANICH"
+ __copyright__ = """This is free and unencumbered software released into the public domain.
+diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
+--- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
+--- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
+--- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import sys
+ import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.52.ebuild b/sys-apps/firejail/firejail-0.9.52.ebuild
new file mode 100644
index 00000000000..ac978533eb6
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.52.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apparmor +bind +chroot contrib +file-transfer +network
+ network-restricted +seccomp +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
+
+RESTRICT=test
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/^\tinstall .*COPYING /d' \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable bind)
+ $(use_enable chroot)
+ $(use_enable contrib contrib-install)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ use network-restricted && myeconfargs+=( --enable-network=restricted )
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2017-09-30 15:41 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2017-09-30 15:41 UTC (permalink / raw
To: gentoo-commits
commit: a53d23fb7001d7a0967e97877076b7a676f35ac8
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 15:29:53 2017 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 15:41:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53d23fb
sys-apps/firejail: Bump version
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-apps/firejail/Manifest | 1 +
sys-apps/firejail/files/0.9.50-contrib-fix.patch | 36 +++++++++++++++++
sys-apps/firejail/firejail-0.9.50.ebuild | 49 ++++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 8a072ba6376..bdc48404e64 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -2,3 +2,4 @@ DIST firejail-0.9.44.10.tar.xz 216216 SHA256 b21e264a0cbe14b09f8220e79066b1791fd
DIST firejail-0.9.44.8.tar.xz 214624 SHA256 b9fe191771db2d19344bfc8b1117c33793f78ae1ba10a76e948bfafd71b10771 SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f WHIRLPOOL f679f7f9592b27382b3653042d15bdc6c69d7ee95cb87a9dbcf1022b284901cfde26efc572e6d540ce15332418e6f80456dec2e9cc133b8b85815b57707245f1
DIST firejail-0.9.46.tar.xz 254748 SHA256 82f5691de90f8652b78803b6a5d8b93e749e107a86fd03518f5a3e2cdbd17b1d SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786 WHIRLPOOL 18e493370072acb71c37ef7dd8ea4d1cdbf102fbf2e91e03519b5e92e1279be733560300294aa353e2ba34f5b9b4e495e973ed5e77b7673e562dfe674c8bd314
DIST firejail-0.9.48.tar.xz 257592 SHA256 637da4221ff91c351020de15ef07a7b4f72bc015255be74cbbeb898bba254709 SHA512 63d2d8a6e6b3f505c88b132a3528ec5211ca5325e53ad1878b25bfb7d679b63af769443b464375a96ea5278b0edca98bd295256072dfa2e1a9d3ba829579b0b7 WHIRLPOOL 312fb58914a7613e169f1b580f35cd912800c70623faa27cc4216b9198d0e79a65d36b35d67867936e64081a0fa1913951cccf121fc46600a08c1d393d707737
+DIST firejail-0.9.50.tar.xz 279488 SHA256 c15475b7ec8b42ee8707f03207bef9ba92d801fc61fd8d1e0f8cfc03833bb800 SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d WHIRLPOOL 15df41a85664b160f053b539c27771a6723f1ea2cd67c21b2d393e9776cd713dc1243c0ab4459d0c4d08827241d726ff079d57d0899d0f53ad2ec3316a59dbc3
diff --git a/sys-apps/firejail/files/0.9.50-contrib-fix.patch b/sys-apps/firejail/files/0.9.50-contrib-fix.patch
new file mode 100644
index 00000000000..7192bba3480
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.50-contrib-fix.patch
@@ -0,0 +1,36 @@
+diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
+--- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ __author__ = "KOLANICH"
+ __copyright__ = """This is free and unencumbered software released into the public domain.
+diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
+--- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
+--- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
+--- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import sys
+ import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.50.ebuild b/sys-apps/firejail/firejail-0.9.50.ebuild
new file mode 100644
index 00000000000..e1943e7842a
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.50.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +bind +chroot contrib +file-transfer +network
+ network-restricted +seccomp +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
+
+RESTRICT=test
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/^\tinstall .*COPYING /d' \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable bind)
+ $(use_enable chroot)
+ $(use_enable contrib contrib-install)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ use network-restricted && myeconfargs+=( --enable-network=restricted )
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2017-05-29 14:37 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2017-05-29 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 659b987d6f023a2dfc104454ef7dbe83a8a37144
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 14:36:33 2017 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon May 29 14:37:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659b987d
sys-apps/firejail: Bump version
Gentoo-Bug: 6201180
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-apps/firejail/Manifest | 1 +
sys-apps/firejail/files/0.9.46-contrib-fix.patch | 57 ++++++++++++++++++++++++
sys-apps/firejail/firejail-0.9.46.ebuild | 47 +++++++++++++++++++
sys-apps/firejail/metadata.xml | 1 +
4 files changed, 106 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 10a1a4e77fa..d07d98a47a9 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1,3 @@
DIST firejail-0.9.44.10.tar.xz 216216 SHA256 b21e264a0cbe14b09f8220e79066b1791fd8f2d5a8ceca1e669a7152e0b094a7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6 WHIRLPOOL 34c8beac00a706ed3aea6429f4297421716e473460a9079b2ab9d5796e8ee5e560e5359202ec14beab0f470a076b635513b1082a07dac0f579e86a8113b3a8ee
DIST firejail-0.9.44.8.tar.xz 214624 SHA256 b9fe191771db2d19344bfc8b1117c33793f78ae1ba10a76e948bfafd71b10771 SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f WHIRLPOOL f679f7f9592b27382b3653042d15bdc6c69d7ee95cb87a9dbcf1022b284901cfde26efc572e6d540ce15332418e6f80456dec2e9cc133b8b85815b57707245f1
+DIST firejail-0.9.46.tar.xz 254748 SHA256 82f5691de90f8652b78803b6a5d8b93e749e107a86fd03518f5a3e2cdbd17b1d SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786 WHIRLPOOL 18e493370072acb71c37ef7dd8ea4d1cdbf102fbf2e91e03519b5e92e1279be733560300294aa353e2ba34f5b9b4e495e973ed5e77b7673e562dfe674c8bd314
diff --git a/sys-apps/firejail/files/0.9.46-contrib-fix.patch b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
new file mode 100644
index 00000000000..fc882b4dc6e
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
@@ -0,0 +1,57 @@
+diff -Naur firejail-0.9.46/contrib/fix_private-bin.py firejail-0.9.46.new/contrib/fix_private-bin.py
+--- firejail-0.9.46/contrib/fix_private-bin.py 2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fix_private-bin.py 2017-05-29 15:25:56.355489307 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ __author__ = "KOLANICH"
+ __copyright__ = """This is free and unencumbered software released into the public domain.
+diff -Naur firejail-0.9.46/contrib/fjclip.py firejail-0.9.46.new/contrib/fjclip.py
+--- firejail-0.9.46/contrib/fjclip.py 2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjclip.py 2017-05-29 15:25:39.463236203 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+@@ -32,4 +32,4 @@
+ else:
+ display = fjdisplay.getdisplay(sys.argv[2])
+ clipout = subprocess.Popen(['xsel','-b','-i','--display',display],stdin=subprocess.PIPE)
+- clipout.communicate(clipin)
+\ Brak znaku nowej linii na końcu pliku
++ clipout.communicate(clipin)
+diff -Naur firejail-0.9.46/contrib/fjdisplay.py firejail-0.9.46.new/contrib/fjdisplay.py
+--- firejail-0.9.46/contrib/fjdisplay.py 2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjdisplay.py 2017-05-29 15:25:47.191351983 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import re
+ import sys
+@@ -40,4 +40,4 @@
+ if len(sys.argv) == 1:
+ print(getfirejails())
+ if len(sys.argv) == 2:
+- print (getdisplay(sys.argv[1]))
+\ Brak znaku nowej linii na końcu pliku
++ print (getdisplay(sys.argv[1]))
+diff -Naur firejail-0.9.46/contrib/fjresize.py firejail-0.9.46.new/contrib/fjresize.py
+--- firejail-0.9.46/contrib/fjresize.py 2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjresize.py 2017-05-29 15:26:03.728599816 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ import sys
+ import fjdisplay
+@@ -22,4 +22,4 @@
+ out = subprocess.check_output(['xrandr','--display',fjdisplay.getdisplay(sys.argv[1]),'--output','default','--mode',sys.argv[2]])
+ print(out)
+ else:
+- print(usage)
+\ Brak znaku nowej linii na końcu pliku
++ print(usage)
diff --git a/sys-apps/firejail/firejail-0.9.46.ebuild b/sys-apps/firejail/firejail-0.9.46.ebuild
new file mode 100644
index 00000000000..ca110fb38c4
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.46.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +bind +chroot contrib +file-transfer +network
+ network-restricted +seccomp +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/^\tinstall .*COPYING /d' \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable bind)
+ $(use_enable chroot)
+ $(use_enable contrib contrib-install)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ use network-restricted && myeconfargs+=( --enable-network=restricted )
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 34eb184d921..395160fe393 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -24,6 +24,7 @@
profiles</flag>
<flag name="bind">Enable custom bind mounts</flag>
<flag name="chroot">Enable chrooting to custom directory</flag>
+ <flag name="contrib">Install contrib scripts</flag>
<flag name="file-transfer">Enable file transfers between sandboxes and
the host system</flag>
<flag name="network">Enable networking features</flag>
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2017-01-11 19:50 Sebastian Pipping
0 siblings, 0 replies; 16+ messages in thread
From: Sebastian Pipping @ 2017-01-11 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 8323924482277778d11fb699aa24303338fabdc8
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 19:49:46 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 19:50:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83239244
sys-apps/firejail: 0.9.44.4 (bug #604758)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/firejail/Manifest | 1 +
.../files/firejail-0.9.44.4-sysmacros.patch | 10 +++++
sys-apps/firejail/firejail-0.9.44.4.ebuild | 46 ++++++++++++++++++++++
3 files changed, 57 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 18ec9ff..bc636c4 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1 +1,2 @@
DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
+DIST firejail-0.9.44.4.tar.xz 213648 SHA256 2d70a2cd554835db0e2eba201c0466e247fbaa2b60c86abd34b9170e0eebc10f SHA512 222567db00fd85f468fff380dbc875b10fe4eb94ff95669e15adc4db55b36208eaef5ceb65bd2d05d79f8f9230552fb0f597fb6b7bf06bb47537321c9c02a3be WHIRLPOOL 8f19f2bda316cca29057d547d9deb357a55db3ffe3ef0ef02f948bd975e2e66f34a91f121363c15b5f6012fb3bde08fa10d2bc90233a14662406effbaff9fe37
diff --git a/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch
new file mode 100644
index 00000000..1c6612a
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch
@@ -0,0 +1,10 @@
+--- a/src/firejail/fs_dev.c
++++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+ typedef struct {
diff --git a/sys-apps/firejail/firejail-0.9.44.4.ebuild b/sys-apps/firejail/firejail-0.9.44.4.ebuild
new file mode 100644
index 00000000..f1b612f
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.44.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +bind +chroot +file-transfer +network
+ network-restricted +seccomp +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable bind)
+ $(use_enable chroot)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ use network-restricted && myeconfargs+=( --enable-network=restricted )
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-12-18 11:14 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-12-18 11:14 UTC (permalink / raw
To: gentoo-commits
commit: f6935dfe9ae06236c38783106fb119ad1c3dd9f6
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 10:42:08 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 11:14:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6935dfe
sys-apps/firejail: Remove older LTS version
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/firejail/Manifest | 1 -
...l-0.9.38.4-0001-etc-resolv.conf-overwrite.patch | 59 ----------------------
.../files/firejail-0.9.38.4-sysmacros.patch | 27 ----------
sys-apps/firejail/firejail-0.9.38.4-r1.ebuild | 28 ----------
4 files changed, 115 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 043bd76..3024036 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,3 +1,2 @@
-DIST firejail-0.9.38.4.tar.bz2 158075 SHA256 47b0707f7d726631e0c9ee6555acb6836b16920fcf02ed7ba6593c86fd7bf5c2 SHA512 b8d2a49e34f3b54b832188f209b4fc6573a951acaf546f1b1c25b681f226ad86b4439a1a3e05e1342746f51fca750261b3d22e7dcf9decd12929e2b790e05890 WHIRLPOOL ce150dcf164f5c3d0656e02830d353fab8d972c364dfead2379f13e0dc9bbc55f09cd28f1741321243183da0c0821c493cd77b7377628201cadbd46dd2fc3c3e
DIST firejail-0.9.38.6.tar.bz2 158685 SHA256 76a25da5d2c3e2b50d0f3ff750614a43742f7115b0c65b92ba5c71a226006b70 SHA512 ba65ba77faa5f278a632f01cabc7ce963cd9a6c665a531ab4b5abfb076e670b52b1326c097a7e180aa717085aace4ecc4b9922c28066752f1afc77e123dfad26 WHIRLPOOL fcafc4155bdf2fc914eebc45bad7ce0c1ebc042705f57334f820453b3095aec444f7b49dbd84284e308d0f63185163be3f6089025df8815eca4983a007a853c0
DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
diff --git a/sys-apps/firejail/files/firejail-0.9.38.4-0001-etc-resolv.conf-overwrite.patch b/sys-apps/firejail/files/firejail-0.9.38.4-0001-etc-resolv.conf-overwrite.patch
deleted file mode 100644
index 5905b83..00000000
--- a/sys-apps/firejail/files/firejail-0.9.38.4-0001-etc-resolv.conf-overwrite.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4f4e59c7529888339fe2337dc893984eb7833d01 Mon Sep 17 00:00:00 2001
-From: netblue30 <netblue30@yahoo.com>
-Date: Wed, 2 Nov 2016 09:17:19 -0400
-Subject: [PATCH] /etc/resolv.conf overwrite
-
----
- RELNOTES | 7 ++++++-
- configure.ac | 2 +-
- src/firejail/main.c | 8 ++++++++
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/RELNOTES b/RELNOTES
-index 4b5b662..0957292 100644
---- a/RELNOTES
-+++ b/RELNOTES
-@@ -1,4 +1,9 @@
--firejail (0.9.38.3) baseline; urgency=low
-+firejail (0.9.38.5) baseline; urgency=low
-+ * this is a development release
-+ * security: overwrite /etc/resolv.conf found by Martin Carpenter
-+ -- netblue30 <netblue30@yahoo.com> Mon, 2 Nov 2016 10:00:00 -0500
-+
-+firejail (0.9.38.4) baseline; urgency=low
- * CVE-2016-7545 submitted by Aleksey Manevich
- * bugfixes
- -- netblue30 <netblue30@yahoo.com> Mon, 10 Oct 2016 10:00:00 -0500
-diff --git a/configure.ac b/configure.ac
-index 718cfd3..edd528d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.68])
--AC_INIT(firejail, 0.9.38.4, netblue30@yahoo.com, , http://firejail.wordpress.com)
-+AC_INIT(firejail, 0.9.38.5, netblue30@yahoo.com, , http://firejail.wordpress.com)
- AC_CONFIG_SRCDIR([src/firejail/main.c])
- #AC_CONFIG_HEADERS([config.h])
-
-diff --git a/src/firejail/main.c b/src/firejail/main.c
-index 9e2aec4..9c1b73e 100644
---- a/src/firejail/main.c
-+++ b/src/firejail/main.c
-@@ -903,6 +903,14 @@ int main(int argc, char **argv) {
- return 1;
- }
-
-+ // don't allow "--chroot=/"
-+ char *rpath = realpath(cfg.chrootdir, NULL);
-+ if (rpath == NULL || strcmp(rpath, "/") == 0) {
-+ fprintf(stderr, "Error: invalid chroot directory\n");
-+ exit(1);
-+ }
-+ free(rpath);
-+
- // check chroot directory structure
- if (fs_check_chroot_dir(cfg.chrootdir)) {
- fprintf(stderr, "Error: invalid chroot\n");
---
-2.11.0
-
diff --git a/sys-apps/firejail/files/firejail-0.9.38.4-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.38.4-sysmacros.patch
deleted file mode 100644
index 85830a4..00000000
--- a/sys-apps/firejail/files/firejail-0.9.38.4-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it. Update the files
-to include it explicitly.
----
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
---- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
---
-2.7.4
-
diff --git a/sys-apps/firejail/firejail-0.9.38.4-r1.ebuild b/sys-apps/firejail/firejail-0.9.38.4-r1.ebuild
deleted file mode 100644
index 1b95976..00000000
--- a/sys-apps/firejail/firejail-0.9.38.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+seccomp"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- epatch "${FILESDIR}"/${P}-0001-etc-resolv.conf-overwrite.patch
- find -name Makefile.in -exec sed -i -r \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- econf $(use_enable seccomp)
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-12-13 20:29 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-12-13 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 54291a2597d81a8c7a1e6fc3d886387b0db45078
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 20:28:50 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 20:28:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54291a25
sys-apps/firejail: Remove vulnerable stable version
Gentoo-Bug: 601994
Package-Manager: portage-2.3.3
sys-apps/firejail/Manifest | 1 -
.../files/firejail-0.9.38.2-sysmacros.patch | 27 ----------------------
sys-apps/firejail/firejail-0.9.38.2.ebuild | 27 ----------------------
3 files changed, 55 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 9d29499..81bc2ae 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,3 +1,2 @@
-DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
DIST firejail-0.9.38.4.tar.bz2 158075 SHA256 47b0707f7d726631e0c9ee6555acb6836b16920fcf02ed7ba6593c86fd7bf5c2 SHA512 b8d2a49e34f3b54b832188f209b4fc6573a951acaf546f1b1c25b681f226ad86b4439a1a3e05e1342746f51fca750261b3d22e7dcf9decd12929e2b790e05890 WHIRLPOOL ce150dcf164f5c3d0656e02830d353fab8d972c364dfead2379f13e0dc9bbc55f09cd28f1741321243183da0c0821c493cd77b7377628201cadbd46dd2fc3c3e
DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
diff --git a/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch
deleted file mode 100644
index 85830a4..00000000
--- a/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it. Update the files
-to include it explicitly.
----
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
---- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
---
-2.7.4
-
diff --git a/sys-apps/firejail/firejail-0.9.38.2.ebuild b/sys-apps/firejail/firejail-0.9.38.2.ebuild
deleted file mode 100644
index 08e0119..00000000
--- a/sys-apps/firejail/firejail-0.9.38.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+seccomp"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- find -name Makefile.in -exec sed -i -r \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- econf $(use_enable seccomp)
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-12-08 20:38 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-12-08 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 9e539f31c16a9eb67135d4858d651a5ec5063862
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 20:18:13 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 20:38:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e539f31
sys-apps/firejail: Bump version
0.9.44.2 is a maintenance and security release for version 0.9.44.
Gentoo-Bug: 601994
Package-Manager: portage-2.3.2
sys-apps/firejail/Manifest | 2 +-
...irejail-0.9.44-sysmacros.patch => firejail-0.9.44.2-sysmacros.patch} | 0
sys-apps/firejail/{firejail-0.9.44.ebuild => firejail-0.9.44.2.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 1727c80..1d87fac 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,4 @@
DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
DIST firejail-0.9.38.4.tar.bz2 158075 SHA256 47b0707f7d726631e0c9ee6555acb6836b16920fcf02ed7ba6593c86fd7bf5c2 SHA512 b8d2a49e34f3b54b832188f209b4fc6573a951acaf546f1b1c25b681f226ad86b4439a1a3e05e1342746f51fca750261b3d22e7dcf9decd12929e2b790e05890 WHIRLPOOL ce150dcf164f5c3d0656e02830d353fab8d972c364dfead2379f13e0dc9bbc55f09cd28f1741321243183da0c0821c493cd77b7377628201cadbd46dd2fc3c3e
DIST firejail-0.9.42.tar.xz 204608 SHA256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 SHA512 bea126c41cbd275ef64bce1fa65419a168a3d39a5eeb2bc78d904e1f7c93357caca0446cdaced2f1e0757d30ebc9dfadce14fe283597abad430f1a2df05581ad WHIRLPOOL 2dacfc0ac8e2707609c53d36fff568b23700d68a464e4f251f1b414d6abdb379403883ac25a3886cfe8c671ac20baf98467190ac36ed0d9b0276005d29edb852
-DIST firejail-0.9.44.tar.xz 212532 SHA256 2cd8ba061a546b593e52748ebbcd8dbdac55973aaeff21250ada43fe3405992c SHA512 6865cf1402f98cf4aceef18239777ca4518a702edd9e119b849385895156661fec560cbcb1738f785725f6c3d55cc478770b8db9d77f2debc386fe4780b6e7f2 WHIRLPOOL 8da1c2d70133618dc2ac4bf45cb10205f7bf168954b9d693b9553eb6b3a504c19addb3a6fd06f4e91eed4a577f0b3ca9bc67697988206f32f1c11afb7924ce77
+DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
diff --git a/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
similarity index 100%
rename from sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch
rename to sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
diff --git a/sys-apps/firejail/firejail-0.9.44.ebuild b/sys-apps/firejail/firejail-0.9.44.2.ebuild
similarity index 100%
rename from sys-apps/firejail/firejail-0.9.44.ebuild
rename to sys-apps/firejail/firejail-0.9.44.2.ebuild
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-12-01 21:41 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-12-01 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 0b30026274ff572c80500c8849dac7f262cf9548
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 20:49:43 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 21:41:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b300262
sys-apps/firejail: Bump version
Package-Manager: portage-2.3.2
sys-apps/firejail/Manifest | 1 +
.../firejail/files/firejail-0.9.44-sysmacros.patch | 27 +++++++++++++
sys-apps/firejail/firejail-0.9.44.ebuild | 45 ++++++++++++++++++++++
3 files changed, 73 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 1cbfd4d..1727c80 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,3 +1,4 @@
DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
DIST firejail-0.9.38.4.tar.bz2 158075 SHA256 47b0707f7d726631e0c9ee6555acb6836b16920fcf02ed7ba6593c86fd7bf5c2 SHA512 b8d2a49e34f3b54b832188f209b4fc6573a951acaf546f1b1c25b681f226ad86b4439a1a3e05e1342746f51fca750261b3d22e7dcf9decd12929e2b790e05890 WHIRLPOOL ce150dcf164f5c3d0656e02830d353fab8d972c364dfead2379f13e0dc9bbc55f09cd28f1741321243183da0c0821c493cd77b7377628201cadbd46dd2fc3c3e
DIST firejail-0.9.42.tar.xz 204608 SHA256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 SHA512 bea126c41cbd275ef64bce1fa65419a168a3d39a5eeb2bc78d904e1f7c93357caca0446cdaced2f1e0757d30ebc9dfadce14fe283597abad430f1a2df05581ad WHIRLPOOL 2dacfc0ac8e2707609c53d36fff568b23700d68a464e4f251f1b414d6abdb379403883ac25a3886cfe8c671ac20baf98467190ac36ed0d9b0276005d29edb852
+DIST firejail-0.9.44.tar.xz 212532 SHA256 2cd8ba061a546b593e52748ebbcd8dbdac55973aaeff21250ada43fe3405992c SHA512 6865cf1402f98cf4aceef18239777ca4518a702edd9e119b849385895156661fec560cbcb1738f785725f6c3d55cc478770b8db9d77f2debc386fe4780b6e7f2 WHIRLPOOL 8da1c2d70133618dc2ac4bf45cb10205f7bf168954b9d693b9553eb6b3a504c19addb3a6fd06f4e91eed4a577f0b3ca9bc67697988206f32f1c11afb7924ce77
diff --git a/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch
new file mode 100644
index 00000000..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 00:14:21 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs have been defined in sys/sysmacros.h forever, and Linux C
+libs are moving away from implicitly including it. Update the files
+to include it explicitly.
+---
+ src/firejail/fs_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
+index 97ee9de..2f66980 100644
+--- a/src/firejail/fs_dev.c
++++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+ static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
+--
+2.7.4
+
diff --git a/sys-apps/firejail/firejail-0.9.44.ebuild b/sys-apps/firejail/firejail-0.9.44.ebuild
new file mode 100644
index 00000000..b2b0381
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.44.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +bind +chroot +file-transfer +network
+ network-restricted +seccomp +userns x11"
+
+DEPEND="apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+ x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
+
+src_prepare() {
+ default
+ find -name Makefile.in -exec sed -i -r \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable apparmor)
+ $(use_enable bind)
+ $(use_enable chroot)
+ $(use_enable file-transfer)
+ $(use_enable network)
+ $(use_enable seccomp)
+ $(use_enable userns)
+ $(use_enable x11)
+ )
+ use network-restricted && myeconfargs+=( --enable-network=restricted )
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-09-27 19:40 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-09-27 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 349374cf1253c5ba4c9cb966dd2f390ea58ed920
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 19:12:47 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 19:40:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349374cf
sys-apps/firejail: Remove versions with potential security failures
See news from September 2016 at <https://firejail.wordpress.com/>.
Package-Manager: portage-2.3.1
sys-apps/firejail/Manifest | 2 --
.../firejail/files/firejail-0.9.38-sysmacros.patch | 27 --------------
.../firejail/files/firejail-0.9.40-sysmacros.patch | 27 --------------
sys-apps/firejail/firejail-0.9.38.ebuild | 27 --------------
sys-apps/firejail/firejail-0.9.40-r2.ebuild | 42 ----------------------
5 files changed, 125 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 3d2d0d9..2c34452 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,2 @@
DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
-DIST firejail-0.9.38.tar.bz2 157543 SHA256 b61b15c03a30b92f5ffddc458b6488eedd1cf87ffe22d77d423e5a254efd16bb SHA512 c1f5e0f56eb0fa6796f3b6eb6037aa8ae4c79b2440dfd64d5a656a775ac01c55db71c5a45d85d4ffb456d1d551038f87ad587dc822d470d41dfdc9a6f8eac9fc WHIRLPOOL 78823d088d8b8f2a15d2f68083c75a1ad5c5638a62cc93fb7358db821f813eb7aab3c3aa29b48ab8b5c6b3818571fd2ffa4e8992e101d4bea0f603bbdf4b26a6
-DIST firejail-0.9.40.tar.bz2 197184 SHA256 49ed9c76fb77bf71543f0e6cacf9491f8280ae5602ecf805b57a011b528222b6 SHA512 aef20c5061d5e8e8d064f8cfb807a3b0034f2eb108bde234af56c2d2fd3c06cd7129539db22e142b251c15cbb0b82b89a9acee98ebaa36d3029ffc91c37456fc WHIRLPOOL 622dc3a10beb23a4d2756850eb69bd911aa0610442e6e73b8bedcf7d455f0e6580984ca1010eae35ac313f7c26660fd6e78e3e0911f24a7e35c1e5f438fa02d8
DIST firejail-0.9.42.tar.xz 204608 SHA256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 SHA512 bea126c41cbd275ef64bce1fa65419a168a3d39a5eeb2bc78d904e1f7c93357caca0446cdaced2f1e0757d30ebc9dfadce14fe283597abad430f1a2df05581ad WHIRLPOOL 2dacfc0ac8e2707609c53d36fff568b23700d68a464e4f251f1b414d6abdb379403883ac25a3886cfe8c671ac20baf98467190ac36ed0d9b0276005d29edb852
diff --git a/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch
deleted file mode 100644
index 85830a4..00000000
--- a/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it. Update the files
-to include it explicitly.
----
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
---- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
---
-2.7.4
-
diff --git a/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch
deleted file mode 100644
index 85830a4..00000000
--- a/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it. Update the files
-to include it explicitly.
----
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
---- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
---
-2.7.4
-
diff --git a/sys-apps/firejail/firejail-0.9.38.ebuild b/sys-apps/firejail/firejail-0.9.38.ebuild
deleted file mode 100644
index 08e0119..00000000
--- a/sys-apps/firejail/firejail-0.9.38.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+seccomp"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- find -name Makefile.in -exec sed -i -r \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- econf $(use_enable seccomp)
-}
diff --git a/sys-apps/firejail/firejail-0.9.40-r2.ebuild b/sys-apps/firejail/firejail-0.9.40-r2.ebuild
deleted file mode 100644
index 137fe82..00000000
--- a/sys-apps/firejail/firejail-0.9.40-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+bind +chroot +file-transfer +network network-restricted +seccomp
- +userns x11"
-
-RDEPEND="x11? ( x11-wm/xpra[client,server] )"
-
-PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
-
-src_prepare() {
- default
- find -name Makefile.in -exec sed -i -r \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable bind)
- $(use_enable chroot)
- $(use_enable file-transfer)
- $(use_enable network)
- $(use_enable seccomp)
- $(use_enable userns)
- $(use_enable x11)
- )
- use network-restricted && myeconfargs+=( --enable-network=restricted )
- econf "${myeconfargs[@]}"
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/
@ 2016-06-03 20:37 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 16+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-06-03 20:37 UTC (permalink / raw
To: gentoo-commits
commit: e26674f6f18d61edd98f344217512db5295d0ec0
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 20:09:52 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 20:37:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26674f6
sys-apps/firejail: Bump version
Package-Manager: portage-2.3.0_rc1
sys-apps/firejail/Manifest | 1 +
.../firejail/files/firejail-0.9.40-sysmacros.patch | 27 ++++++++++++++++++++++
sys-apps/firejail/firejail-0.9.40.ebuild | 27 ++++++++++++++++++++++
3 files changed, 55 insertions(+)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index d02dbae..7a6d4c9 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1,3 @@
DIST firejail-0.9.36.tar.bz2 151123 SHA256 db16c93e6f838048b0bbcb3b90aa191f79860382c5197fd2ac6df51f1a469510 SHA512 8b9b7f3dd071825117a45e41c1e33871bf4f7788faf27f322913079a7094e6fa4eb7a94362630664c4b441213c357531a2f9f41bd94ff06c64bc6f8a6ee68fd1 WHIRLPOOL 413bab0edf6259129f75a8242546a2f290366bb3bd1711689fd0530a895262db5e78afee0a90639c9edc59bbcc8f93225003b1f1340f9e1479dd491f26edd1d6
DIST firejail-0.9.38.tar.bz2 157543 SHA256 b61b15c03a30b92f5ffddc458b6488eedd1cf87ffe22d77d423e5a254efd16bb SHA512 c1f5e0f56eb0fa6796f3b6eb6037aa8ae4c79b2440dfd64d5a656a775ac01c55db71c5a45d85d4ffb456d1d551038f87ad587dc822d470d41dfdc9a6f8eac9fc WHIRLPOOL 78823d088d8b8f2a15d2f68083c75a1ad5c5638a62cc93fb7358db821f813eb7aab3c3aa29b48ab8b5c6b3818571fd2ffa4e8992e101d4bea0f603bbdf4b26a6
+DIST firejail-0.9.40.tar.bz2 197184 SHA256 49ed9c76fb77bf71543f0e6cacf9491f8280ae5602ecf805b57a011b528222b6 SHA512 aef20c5061d5e8e8d064f8cfb807a3b0034f2eb108bde234af56c2d2fd3c06cd7129539db22e142b251c15cbb0b82b89a9acee98ebaa36d3029ffc91c37456fc WHIRLPOOL 622dc3a10beb23a4d2756850eb69bd911aa0610442e6e73b8bedcf7d455f0e6580984ca1010eae35ac313f7c26660fd6e78e3e0911f24a7e35c1e5f438fa02d8
diff --git a/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch
new file mode 100644
index 0000000..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.40-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 00:14:21 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs have been defined in sys/sysmacros.h forever, and Linux C
+libs are moving away from implicitly including it. Update the files
+to include it explicitly.
+---
+ src/firejail/fs_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
+index 97ee9de..2f66980 100644
+--- a/src/firejail/fs_dev.c
++++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+ static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
+--
+2.7.4
+
diff --git a/sys-apps/firejail/firejail-0.9.40.ebuild b/sys-apps/firejail/firejail-0.9.40.ebuild
new file mode 100644
index 0000000..d35fd1c
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.40.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+seccomp"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch
+ find -name Makefile.in -exec sed -i -r \
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+ -e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+ econf $(use_enable seccomp)
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-07-15 12:10 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-15 12:10 [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/, sys-apps/firejail/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-06-15 5:47 Joonas Niilola
2022-02-22 9:43 Florian Schmaus
2019-08-07 4:58 Dennis Lamm
2019-08-05 19:22 Dennis Lamm
2018-10-10 20:40 Amadeusz Piotr Żołnowski
2018-03-06 23:20 Amadeusz Piotr Żołnowski
2017-09-30 15:41 Amadeusz Piotr Żołnowski
2017-05-29 14:37 Amadeusz Piotr Żołnowski
2017-01-11 19:50 Sebastian Pipping
2016-12-18 11:14 Amadeusz Piotr Żołnowski
2016-12-13 20:29 Amadeusz Piotr Żołnowski
2016-12-08 20:38 Amadeusz Piotr Żołnowski
2016-12-01 21:41 Amadeusz Piotr Żołnowski
2016-09-27 19:40 Amadeusz Piotr Żołnowski
2016-06-03 20:37 Amadeusz Piotr Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox