commit:     d33a6359c10f36577aaa435fe559ccfbf9beccf0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 05:26:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 05:26:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33a6359

sys-apps/firejail-lts: treeclean

Closes: https://bugs.gentoo.org/834601
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/package.mask                              |  7 ---
 sys-apps/firejail-lts/Manifest                     |  1 -
 .../firejail-lts-fix-compressed-manpages.patch     | 17 -------
 .../firejail-lts/firejail-lts-0.9.56.2-r1.ebuild   | 48 ------------------
 .../firejail-lts/firejail-lts-0.9.56.2-r2.ebuild   | 57 ----------------------
 sys-apps/firejail-lts/metadata.xml                 | 33 -------------
 6 files changed, 163 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index d993c8aff32b..135ff44f8a25 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -239,13 +239,6 @@ app-backup/kfoldersync
 # Bugs #845807, #798372, #748531. Removal on 2022-07-21.
 dev-python/pygpgme
 
-# Sam James <[email protected]> (2022-06-19)
-# Unsupported by upstream, no updates in a long time,
-# vulnerable to issues fixed in the main firejail package.
-# bug #834601.
-# Please migrate to sys-apps/firejail. Removal on 2022-07-19.
-sys-apps/firejail-lts
-
 # Matt Turner <[email protected]> (2022-05-30)
 # libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.
 # Bug #848501

diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
deleted file mode 100644
index 39d94c6c0465..000000000000
--- a/sys-apps/firejail-lts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B 
ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838
 SHA512 
75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a

diff --git 
a/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch 
b/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch
deleted file mode 100644
index 313c1c2a9dd3..000000000000
--- a/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9dafb56..4117468 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,10 +127,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-lts/firejail-lts-0.9.56.2-r1.ebuild 
b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
deleted file mode 100644
index 736d806a8f6f..000000000000
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Security sandbox for any type of processes; LTS version"
-HOMEPAGE="https://firejail.wordpress.com/";
-
-MY_PN=firejail
-
-SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
-RESTRICT="!test? ( test )"
-
-DEPEND="!sys-apps/firejail
-               apparmor? ( sys-libs/libapparmor )
-               test? ( dev-tcltk/expect )"
-
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-compressed-manpages.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}-LTS"
-
-src_prepare() {
-       default
-
-       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 globalcfg) \
-               $(use_enable network) \
-               $(use_enable seccomp) \
-               $(use_enable suid) \
-               $(use_enable userns) \
-               $(use_enable whitelist)
-}

diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild 
b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
deleted file mode 100644
index d1393ffd3dc6..000000000000
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Security sandbox for any type of processes; LTS version"
-HOMEPAGE="https://firejail.wordpress.com/";
-
-MY_PN=firejail
-
-SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
-RESTRICT="!test? ( test )"
-
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
-
-DEPEND="${RDEPEND}
-               !sys-apps/firejail
-               test? ( dev-tcltk/expect )"
-
-S="${WORKDIR}/${MY_PN}-${PV}-LTS"
-
-src_prepare() {
-       default
-
-       find -type f -name Makefile.in | xargs sed -i -r \
-               -e '/^\tinstall .*COPYING /d' \
-               -e '/CFLAGS/s: (-O2|-ggdb) : :g' || die
-
-       sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
-       # remove compression of man pages
-       sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die
-       sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die
-       sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 
\$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die
-}
-
-src_configure() {
-       econf \
-               $(use_enable apparmor) \
-               $(use_enable globalcfg) \
-               $(use_enable network) \
-               $(use_enable seccomp) \
-               $(use_enable suid) \
-               $(use_enable userns) \
-               $(use_enable whitelist)
-}
-
-src_compile() {
-       emake CC="$(tc-getCC)"
-}

diff --git a/sys-apps/firejail-lts/metadata.xml 
b/sys-apps/firejail-lts/metadata.xml
deleted file mode 100644
index ae511bfe0155..000000000000
--- a/sys-apps/firejail-lts/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <maintainer type="person" proxied="yes">
-               <email>[email protected]</email>
-               <name>Hank Leininger</name>
-       </maintainer>
-       <maintainer type="project" proxied="proxy">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
-       <longdescription lang="en">
-               Firejail is a SUID program that reduces the risk of security 
breaches by restricting the running environment of
-               untrusted applications using Linux namespaces and seccomp-bpf. 
It allows a process and all its descendants to
-               have their own private view of the globally shared kernel 
resources, such as the network stack, process table,
-               mount table.
-
-               This is long term support branch of firejail. For the regular 
version see sys-apps/firejail. 
-               The code base is approximately 40% smaller than the regular 
version,
-               providing a smaller attack surface for the SUID executable.
-       </longdescription>
-       <upstream>
-               <remote-id type="github">netblue30/firejail</remote-id>
-       </upstream>
-       <use>
-               <flag name="apparmor">Enable support for custom AppArmor 
profiles</flag>
-               <flag name="globalcfg">Enable global config file</flag>
-               <flag name="network">Enable networking features</flag>
-               <flag name="seccomp">Enable system call filtering</flag>
-               <flag name="userns">Enable attaching a new user namespace to a 
sandbox (--noroot option)</flag>
-               <flag name="whitelist">Enable file and directory 
whitelisting</flag>
-       </use>
-</pkgmetadata>

Reply via email to