summaryrefslogtreecommitdiff
path: root/sys-apps/firejail
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2016-12-18 10:57:48 +0000
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2016-12-18 11:14:31 +0000
commit4f4ba7ccdb2bccd1835237c9ffba27e2bafe45c5 (patch)
tree4cdab6933910063bb7fb95870850568c10286168 /sys-apps/firejail
parentf6935dfe9ae06236c38783106fb119ad1c3dd9f6 (diff)
downloadgentoo-4f4ba7ccdb2bccd1835237c9ffba27e2bafe45c5.tar.gz
gentoo-4f4ba7ccdb2bccd1835237c9ffba27e2bafe45c5.tar.xz
sys-apps/firejail-lts: Move LTS version to separate package
Having it in a separate package makes it easier for users to follow LTS branch of firejail. Before that users had to mask older versions to test LTS. It's better than having it slotted because portage by default picks up latest version from any slot and user would have to explicitly install particular slot. Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-apps/firejail')
-rw-r--r--sys-apps/firejail/Manifest1
-rw-r--r--sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch27
-rw-r--r--sys-apps/firejail/firejail-0.9.38.6.ebuild27
-rw-r--r--sys-apps/firejail/firejail-0.9.44.2.ebuild3
-rw-r--r--sys-apps/firejail/metadata.xml3
5 files changed, 5 insertions, 56 deletions
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 302403640a8..18ec9fff21d 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1 @@
-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.6-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch
deleted file mode 100644
index 85830a40cac..00000000000
--- a/sys-apps/firejail/files/firejail-0.9.38.6-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.6.ebuild b/sys-apps/firejail/firejail-0.9.38.6.ebuild
deleted file mode 100644
index d35fd1c90f5..00000000000
--- a/sys-apps/firejail/firejail-0.9.38.6.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.44.2.ebuild b/sys-apps/firejail/firejail-0.9.44.2.ebuild
index 3ce7e3556da..b3b3b4692c7 100644
--- a/sys-apps/firejail/firejail-0.9.44.2.ebuild
+++ b/sys-apps/firejail/firejail-0.9.44.2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="amd64"
IUSE="apparmor +bind +chroot +file-transfer +network
network-restricted +seccomp +userns x11"
-DEPEND="apparmor? ( sys-libs/libapparmor )"
+DEPEND="!sys-apps/firejail
+ apparmor? ( sys-libs/libapparmor )"
RDEPEND="${DEPEND}
x11? ( x11-wm/xpra[client,server] )"
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 13c3aafc81a..34eb184d921 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -12,6 +12,9 @@
descendants to have their own private view of the globally shared
kernel resources, such as the network stack, process table, mount
table.
+
+ This is bleeding edge branch. For long term support version see
+ sys-apps/firejail-lts.
</longdescription>
<upstream>
<remote-id type="sourceforge">firejail</remote-id>