[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2018-12-04 Thread Amadeusz Piotr Żołnowski
commit: 38a4f7d7fa1765573a9f4b5a8a29935ceb2b13fa
Author: Amadeusz Piotr Żołnowski  gentoo  org>
AuthorDate: Tue Dec  4 22:12:10 2018 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Tue Dec  4 22:13:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a4f7d7

sys-apps/firejail: Remove older versions

Leave only latest stable and testing versions.

Signed-off-by: Amadeusz Piotr Żołnowski  gentoo.org>

 sys-apps/firejail/Manifest   |  6 ---
 sys-apps/firejail/files/0.9.46-contrib-fix.patch | 57 
 sys-apps/firejail/files/0.9.48-contrib-fix.patch | 36 ---
 sys-apps/firejail/files/0.9.52-contrib-fix.patch | 36 ---
 sys-apps/firejail/files/0.9.54-contrib-fix.patch | 36 ---
 sys-apps/firejail/firejail-0.9.44.10.ebuild  | 46 ---
 sys-apps/firejail/firejail-0.9.44.8.ebuild   | 46 ---
 sys-apps/firejail/firejail-0.9.46.ebuild | 49 
 sys-apps/firejail/firejail-0.9.48.ebuild | 49 
 sys-apps/firejail/firejail-0.9.52.ebuild | 49 
 sys-apps/firejail/firejail-0.9.54.ebuild | 50 -
 11 files changed, 460 deletions(-)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 02cfdd6b877..6f30a7cf305 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,8 +1,2 @@
-DIST firejail-0.9.44.10.tar.xz 216216 BLAKE2B 
15e0a9b2dec55639006efc39271dc5317fc06c9a764109e4d11df37d564eee9d017d9cf83ebb16adf39a6229e3119072137a4256906366c5e52f7ad7b429c2b7
 SHA512 
d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6
-DIST firejail-0.9.44.8.tar.xz 214624 BLAKE2B 
05faddb65ea1736ff0a098f5ac8ae8bec62a74aa4e7cbaf1acc2d3c9b549c322a141ab424f73272ad2517817bfff053c798ca8acdfa4e11b1b0829bbdbda162a
 SHA512 
5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f
-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
-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.46-contrib-fix.patch 
b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
deleted file mode 100644
index fc882b4dc6e..000
--- a/sys-apps/firejail/files/0.9.46-contrib-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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.0 
+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.0 +0100
-+++ firejail-0.9.46.new/contrib/fjclip.py  2017-05-29 15:25:39.463236203 
+0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2018-08-15 Thread Amadeusz Piotr Żołnowski
commit: 53e2adcdae66c154ac662c593c36fb1db04933af
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Wed Aug 15 22:19:07 2018 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Wed Aug 15 22:19:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e2adcd

sys-apps/firejail: Bump version

 sys-apps/firejail/Manifest   |  1 +
 sys-apps/firejail/files/0.9.54-contrib-fix.patch | 36 +
 sys-apps/firejail/firejail-0.9.54.ebuild | 50 
 3 files changed, 87 insertions(+)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 352f1a2abe9..44478f3873d 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -4,3 +4,4 @@ DIST firejail-0.9.46.tar.xz 254748 BLAKE2B 
bf9c6af2bbc53c153d39c16b4d1720f61110e
 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
+DIST firejail-0.9.54.tar.xz 315884 BLAKE2B 
62eaf42711aa3560c7ecb965903b64b10e04ea2898950b13c5371d859ccb1633634e1455c5558bf6fc02211d9937270fbc82cdd8409ff060f3a2c5aa8eb51517
 SHA512 
84bb5992ea4846d4398cc72dd9d65a8c4f20da9a2798ccd74a9157088313b768ef361bada62617d02b31174bca4b95e6560140f448021e1b93740a37992fe3df

diff --git a/sys-apps/firejail/files/0.9.54-contrib-fix.patch 
b/sys-apps/firejail/files/0.9.54-contrib-fix.patch
new file mode 100644
index 000..7192bba3480
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.54-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.0 
+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.0 +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.0 
+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.py2017-05-24 23:01:32.0 
+0100
 firejail-0.9.48.new/contrib/fjresize.py2017-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.54.ebuild 
b/sys-apps/firejail/firejail-0.9.54.ebuild
new file mode 100644
index 000..0a32135c461
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.54.ebuild
@@ -0,0 +1,50 @@
+# 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 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' \
+  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2017-08-27 Thread Amadeusz Piotr Żołnowski
commit: aa7a1fa1513015951b604d8b5bffbb6be3a1
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sun Aug 27 22:23:17 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sun Aug 27 22:23:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7a1fa1

sys-apps/firejail: Bump version

Gentoo-Bug: 622540
Package-Manager: Portage-2.3.7, Repoman-2.3.3

 sys-apps/firejail/Manifest   |  1 +
 sys-apps/firejail/files/0.9.48-contrib-fix.patch | 36 ++
 sys-apps/firejail/firejail-0.9.48.ebuild | 47 
 3 files changed, 84 insertions(+)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index d07d98a47a9..8a072ba6376 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,3 +1,4 @@
 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
+DIST firejail-0.9.48.tar.xz 257592 SHA256 
637da4221ff91c351020de15ef07a7b4f72bc015255be74cbbeb898bba254709 SHA512 
63d2d8a6e6b3f505c88b132a3528ec5211ca5325e53ad1878b25bfb7d679b63af769443b464375a96ea5278b0edca98bd295256072dfa2e1a9d3ba829579b0b7
 WHIRLPOOL 
312fb58914a7613e169f1b580f35cd912800c70623faa27cc4216b9198d0e79a65d36b35d67867936e64081a0fa1913951cccf121fc46600a08c1d393d707737

diff --git a/sys-apps/firejail/files/0.9.48-contrib-fix.patch 
b/sys-apps/firejail/files/0.9.48-contrib-fix.patch
new file mode 100644
index 000..7192bba3480
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.48-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.0 
+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.0 +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.0 
+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.py2017-05-24 23:01:32.0 
+0100
 firejail-0.9.48.new/contrib/fjresize.py2017-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.48.ebuild 
b/sys-apps/firejail/firejail-0.9.48.ebuild
new file mode 100644
index 000..ca110fb38c4
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.48.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] )"
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2017-01-31 Thread Amadeusz Piotr Żołnowski
commit: d1f12cb23a22b675d3cc6bc1dee5130a3a99b324
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Tue Jan 31 20:06:08 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Tue Jan 31 20:06:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f12cb2

sys-apps/firejail: Remove vulnerable version

Gentoo-Bug: 607382

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 deletions(-)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5788674..af88341 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1 @@
-DIST firejail-0.9.44.4.tar.xz 213648 SHA256 
2d70a2cd554835db0e2eba201c0466e247fbaa2b60c86abd34b9170e0eebc10f SHA512 
222567db00fd85f468fff380dbc875b10fe4eb94ff95669e15adc4db55b36208eaef5ceb65bd2d05d79f8f9230552fb0f597fb6b7bf06bb47537321c9c02a3be
 WHIRLPOOL 
8f19f2bda316cca29057d547d9deb357a55db3ffe3ef0ef02f948bd975e2e66f34a91f121363c15b5f6012fb3bde08fa10d2bc90233a14662406effbaff9fe37
 DIST firejail-0.9.44.8.tar.xz 214624 SHA256 
b9fe191771db2d19344bfc8b1117c33793f78ae1ba10a76e948bfafd71b10771 SHA512 
5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f
 WHIRLPOOL 
f679f7f9592b27382b3653042d15bdc6c69d7ee95cb87a9dbcf1022b284901cfde26efc572e6d540ce15332418e6f80456dec2e9cc133b8b85815b57707245f1

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
deleted file mode 100644
index 1c6612a..
--- a/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE 
- #endif
-+#include 
- #include 
- 
- typedef struct {

diff --git a/sys-apps/firejail/firejail-0.9.44.4.ebuild 
b/sys-apps/firejail/firejail-0.9.44.4.ebuild
deleted file mode 100644
index 4c9e627..
--- a/sys-apps/firejail/firejail-0.9.44.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2017-01-14 Thread Amadeusz Piotr Żołnowski
commit: 1da7e8bff44c4049ccf60bd02befe7fbdba44295
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sat Jan 14 20:53:30 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sat Jan 14 20:53:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7e8bf

sys-apps/firejail: Remove vulnerable version

Gentoo-Bug: 604758

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/firejail/Manifest |  1 -
 .../files/firejail-0.9.44.2-sysmacros.patch| 27 -
 sys-apps/firejail/firejail-0.9.44.2.ebuild | 46 --
 3 files changed, 74 deletions(-)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index bc636c4..251939e 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1 @@
-DIST firejail-0.9.44.2.tar.xz 213092 SHA256 
c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 
c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e
 WHIRLPOOL 
365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf0423575f972e52accc8d08f23b0f0e26141918f2978
 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.2-sysmacros.patch 
b/sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
deleted file mode 100644
index 85830a4..
--- a/sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-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 
- #include 
- 
- 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.2.ebuild 
b/sys-apps/firejail/firejail-0.9.44.2.ebuild
deleted file mode 100644
index c1e2038..
--- a/sys-apps/firejail/firejail-0.9.44.2.ebuild
+++ /dev/null
@@ -1,46 +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.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[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-12-18 Thread Amadeusz Piotr Żołnowski
commit: f8c6a9d9a750222bd14f6876a4d4c8daab18a45e
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sun Dec 18 10:35:46 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sun Dec 18 11:14:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c6a9d9

sys-apps/firejail: Bump LTS version

It includes security bug fix back-ported to 0.9.38.4.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/firejail/Manifest |  1 +
 .../files/firejail-0.9.38.6-sysmacros.patch| 27 ++
 sys-apps/firejail/firejail-0.9.38.6.ebuild | 27 ++
 3 files changed, 55 insertions(+)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 81bc2ae..043bd76 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1,3 @@
 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 
365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf0423575f972e52accc8d08f23b0f0e26141918f2978

diff --git a/sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch 
b/sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch
new file mode 100644
index ..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+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 
+ #include 
+ 
+ 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.6.ebuild 
b/sys-apps/firejail/firejail-0.9.38.6.ebuild
new file mode 100644
index ..d35fd1c
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.38.6.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)
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-12-15 Thread Amadeusz Piotr Żołnowski
commit: af870a94a84b4073fb0db94d2bd2ef852a64cb1d
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Thu Dec 15 21:26:54 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Thu Dec 15 21:27:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af870a94

sys-apps/firejail: Backport security fix to 0.9.38.4

Gentoo-Bug: 601994

Package-Manager: portage-2.3.3

 ...l-0.9.38.4-0001-etc-resolv.conf-overwrite.patch | 59 ++
 ...0.9.38.4.ebuild => firejail-0.9.38.4-r1.ebuild} |  1 +
 2 files changed, 60 insertions(+)

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
new file mode 100644
index ..5905b83
--- /dev/null
+++ 
b/sys-apps/firejail/files/firejail-0.9.38.4-0001-etc-resolv.conf-overwrite.patch
@@ -0,0 +1,59 @@
+From 4f4e59c7529888339fe2337dc893984eb7833d01 Mon Sep 17 00:00:00 2001
+From: netblue30 
+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   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   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, netblu...@yahoo.com, , 
http://firejail.wordpress.com)
++AC_INIT(firejail, 0.9.38.5, netblu...@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/firejail-0.9.38.4.ebuild 
b/sys-apps/firejail/firejail-0.9.38.4-r1.ebuild
similarity index 89%
rename from sys-apps/firejail/firejail-0.9.38.4.ebuild
rename to sys-apps/firejail/firejail-0.9.38.4-r1.ebuild
index d35fd1c..1b95976 100644
--- a/sys-apps/firejail/firejail-0.9.38.4.ebuild
+++ b/sys-apps/firejail/firejail-0.9.38.4-r1.ebuild
@@ -17,6 +17,7 @@ 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



[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-12-08 Thread Amadeusz Piotr Żołnowski
commit: 3d61e223ff92cf2ab456ddd89e242f7b345c4858
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Thu Dec  8 20:38:28 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Thu Dec  8 20:38:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d61e223

sys-apps/firejail: Remove the vulnerable version

Package-Manager: portage-2.3.2

 sys-apps/firejail/Manifest |  1 -
 .../firejail/files/firejail-0.9.42-libstdc++.patch | 11 -
 .../firejail/files/firejail-0.9.42-sysmacros.patch | 27 -
 sys-apps/firejail/firejail-0.9.42-r1.ebuild| 47 --
 4 files changed, 86 deletions(-)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 1d87fac..9d29499 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,3 @@
 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.2.tar.xz 213092 SHA256 
c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 
c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e
 WHIRLPOOL 
365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf0423575f972e52accc8d08f23b0f0e26141918f2978

diff --git a/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch 
b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
deleted file mode 100644
index 936c01e..
--- a/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur firejail-0.9.42/etc/disable-devel.inc 
firejail-0.9.42.new/etc/disable-devel.inc
 firejail-0.9.42/etc/disable-devel.inc  2016-09-06 20:48:23.0 
+0100
-+++ firejail-0.9.42.new/etc/disable-devel.inc  2016-09-19 22:21:14.579410841 
+0100
-@@ -2,7 +2,6 @@
- 
- # GCC
- blacklist /usr/include
--blacklist /usr/lib/gcc
- blacklist /usr/bin/gcc*
- blacklist /usr/bin/cpp*
- blacklist /usr/bin/c9*

diff --git a/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch 
b/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
deleted file mode 100644
index 85830a4..
--- a/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-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 
- #include 
- 
- 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.42-r1.ebuild 
b/sys-apps/firejail/firejail-0.9.42-r1.ebuild
deleted file mode 100644
index d824250..
--- a/sys-apps/firejail/firejail-0.9.42-r1.ebuild
+++ /dev/null
@@ -1,47 +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.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] 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-10-28 Thread Amadeusz Piotr Żołnowski
commit: 52800dad0898b20e64d773d05b0e131410da4d89
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Fri Oct 28 20:40:06 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Fri Oct 28 20:40:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52800dad

sys-apps/firejail: Bump LTS version to 0.9.38.4

0.9.38.4 addresses CVE-2016-7545.

Package-Manager: portage-2.3.2

 sys-apps/firejail/Manifest |  1 +
 .../files/firejail-0.9.38.4-sysmacros.patch| 27 ++
 sys-apps/firejail/firejail-0.9.38.4.ebuild | 27 ++
 3 files changed, 55 insertions(+)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 2c34452..1cbfd4d 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1,3 @@
 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

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
new file mode 100644
index ..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.38.4-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+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 
+ #include 
+ 
+ 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.ebuild 
b/sys-apps/firejail/firejail-0.9.38.4.ebuild
new file mode 100644
index ..d35fd1c
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.38.4.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)
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-09-19 Thread Amadeusz Piotr Żołnowski
commit: b0b3cd027d1d1123ceac87be880aadec636cf151
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Mon Sep 19 19:09:28 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Mon Sep 19 22:24:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b3cd02

sys-apps/firejail: Bump version to 0.9.42

Package-Manager: portage-2.3.0

 sys-apps/firejail/Manifest |  1 +
 .../firejail/files/firejail-0.9.42-libstdc++.patch | 11 +
 .../firejail/files/firejail-0.9.42-sysmacros.patch | 27 
 sys-apps/firejail/firejail-0.9.42.ebuild   | 48 ++
 sys-apps/firejail/metadata.xml |  3 ++
 5 files changed, 90 insertions(+)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5a7ce03..5d3256f 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -2,3 +2,4 @@ DIST firejail-0.9.36.tar.bz2 151123 SHA256 
db16c93e6f838048b0bbcb3b90aa191f79860
 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.42-libstdc++.patch 
b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
new file mode 100644
index ..936c01e
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
@@ -0,0 +1,11 @@
+diff -Naur firejail-0.9.42/etc/disable-devel.inc 
firejail-0.9.42.new/etc/disable-devel.inc
+--- firejail-0.9.42/etc/disable-devel.inc  2016-09-06 20:48:23.0 
+0100
 firejail-0.9.42.new/etc/disable-devel.inc  2016-09-19 22:21:14.579410841 
+0100
+@@ -2,7 +2,6 @@
+ 
+ # GCC
+ blacklist /usr/include
+-blacklist /usr/lib/gcc
+ blacklist /usr/bin/gcc*
+ blacklist /usr/bin/cpp*
+ blacklist /usr/bin/c9*

diff --git a/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch 
b/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
new file mode 100644
index ..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+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 
+ #include 
+ 
+ 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.42.ebuild 
b/sys-apps/firejail/firejail-0.9.42.ebuild
new file mode 100644
index ..1d9159d
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.42.ebuild
@@ -0,0 +1,48 @@
+# 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 +busybox +chroot +file-transfer +network
+   network-restricted +seccomp 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/, sys-apps/firejail/

2016-04-19 Thread Mike Frysinger
commit: f68a6983ad59f37cb04c236730ff5dde1748af25
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Apr 20 04:19:35 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Apr 20 04:19:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a6983

sys-apps/firejail: fix build w/newer glibc #580390

 .../firejail/files/firejail-0.9.38-sysmacros.patch | 27 ++
 sys-apps/firejail/firejail-0.9.38.ebuild   |  7 --
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch 
b/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch
new file mode 100644
index 000..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.38-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+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 
+ #include 
+ 
+ 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
index 5269406..19a45f9 100644
--- a/sys-apps/firejail/firejail-0.9.38.ebuild
+++ b/sys-apps/firejail/firejail-0.9.38.ebuild
@@ -4,6 +4,8 @@
 
 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"
@@ -13,8 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+seccomp"
 
-DEPEND=""
-RDEPEND=""
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-sysmacros.patch
+}
 
 src_configure() {
econf $(use_enable seccomp)