From 3397c6c8e97afdb10b0ed35c372987163e95d4c0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 29 May 2020 21:48:25 +0200 Subject: [PATCH] net-firewall/ufw-frontends: Remove last-rited package Closes: https://bugs.gentoo.org/708152 Signed-off-by: Andreas Sturmlechner --- net-firewall/ufw-frontends/Manifest | 1 - .../files/org.gentoo.pkexec.ufw-gtk.policy | 21 ------ .../ufw-frontends-0.3.2-no-log-crash.patch | 61 ------------------ net-firewall/ufw-frontends/metadata.xml | 22 ------- .../ufw-frontends-0.3.2-r5.ebuild | 64 ------------------- profiles/package.mask | 5 -- 6 files changed, 174 deletions(-) delete mode 100644 net-firewall/ufw-frontends/Manifest delete mode 100644 net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy delete mode 100644 net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch delete mode 100644 net-firewall/ufw-frontends/metadata.xml delete mode 100644 net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild diff --git a/net-firewall/ufw-frontends/Manifest b/net-firewall/ufw-frontends/Manifest deleted file mode 100644 index cbcaf4cd7123..000000000000 --- a/net-firewall/ufw-frontends/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ufw-frontends-0.3.2.tar.gz 85472 BLAKE2B 9aa53a2b2c87de416334c5e9c0c9c63ccf14405c896ad7ba9fc266df728ab29b79186102ee3fdd346dcf470f0a24327f1fc475d2fe25380c96da1645d236d446 SHA512 9f311596a3bad71562ca98acb8bf4d0d55990520cb5373c299dad05d1a1986e791eac984385013a511af4693a9988351ec37d8735ae6748818a9570db416b274 diff --git a/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy b/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy deleted file mode 100644 index 7410debbc818..000000000000 --- a/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Gentoo - http://www.gentoo.org/ - - - Authentication is required to run the ufw configuration tool - - auth_admin - auth_admin - auth_admin - - /usr/sbin/ufw-gtk - true - - - diff --git a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch b/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch deleted file mode 100644 index f4adb49826ec..000000000000 --- a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e7bcf87788588c3a38ce18c9a8d69bbe156860e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C5=82awomir=20Nizio?= -Date: Mon, 3 Mar 2014 08:31:47 +0100 -Subject: [PATCH] Fix crash when no log in supported location can be found - -This can happen for example on systems that use Journal -from systemd. - -In this case, ufw-gtk exits with a traceback containing: -IOError: [Errno 2] No such file or directory: '/var/log/messages.log' -(this is the last log file tried). - -The patch works around the issue by handling the error -and disabling the widget in the "Events" tab. ---- - gfw/frontend_gtk.py | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/gfw/frontend_gtk.py b/gfw/frontend_gtk.py -index 75ebb33..75dfde0 100644 ---- a/gfw/frontend_gtk.py -+++ b/gfw/frontend_gtk.py -@@ -33,14 +33,21 @@ from gfw.frontend import Frontend - - class Notifier(gfw.event.Notifier): - -- def __init__(self, callback): -- gfw.event.Notifier.__init__(self, callback) -+ def __init__(self, callback, inactive_handler): -+ self._active = False -+ try: -+ gfw.event.Notifier.__init__(self, callback) -+ except IOError: -+ inactive_handler() -+ return -+ self._active = True - self._w = gobject.io_add_watch(self._fd, gobject.IO_IN | gobject.IO_PRI, - self._trigger) - - def __del__(self): -- gfw.event.Notifier.__del__(self) -- gobject.source_remove(self._w) -+ if self._active: -+ gfw.event.Notifier.__del__(self) -+ gobject.source_remove(self._w) - - - class Builder(gtk.Builder): -@@ -90,7 +97,8 @@ class GtkFrontend(Frontend): - data = (timestamp, event, conn['IN'], conn['OUT'], conn['PROTO'], - conn['SRC'], spt, conn['DST'], dpt) - self.ui.events_model.append(data) -- self._notifier = Notifier(callback) -+ self._notifier = Notifier(callback, -+ lambda: self.ui.events_view.set_sensitive(False)) - self.ui.main_window.show_all() - ## FIXME: for the 0.3.0 release, hide the tab for the connections view - page = self.ui.view.get_nth_page(2) --- -1.9.0 - diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml deleted file mode 100644 index a3ab739d57cd..000000000000 --- a/net-firewall/ufw-frontends/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - slawomir.nizio@sabayon.org - Sławomir Nizio - - - proxy-maint@gentoo.org - Proxy Maintainers - - Currently, UFW provides only a command-line interface (CLI) for user - interaction--the ufw command. This project implements graphical frontends - for UFW using PyGTK and PyQt (the latter in early stage of development). - - baudm/ufw-frontends - - - Use pkexec to gain root privileges - Use kdesu to gain root privileges (note: the flag has lower priority than "policykit") - - diff --git a/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild deleted file mode 100644 index 6110449589c7..000000000000 --- a/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 - -DESCRIPTION="Provides graphical frontend to ufw" -HOMEPAGE="https://github.com/baudm/ufw-frontends" -SRC_URI="https://github.com/baudm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -# CC-BY-NC-SA-3.0 is for a png file -LICENSE="GPL-3 CC-BY-NC-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kde policykit" - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/pygtk[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - net-firewall/ufw[${PYTHON_USEDEP}] - !policykit? ( kde? ( kde-plasma/kde-cli-tools[kdesu] ) ) - policykit? ( sys-auth/polkit ) -" - -# fix crash when no ufw logs in supported locations can be found -PATCHES=( "${FILESDIR}/${P}-no-log-crash.patch" ) - -python_prepare_all() { - if use policykit; then - sed -i 's/^Exec=su-to-root -X -c/Exec=pkexec/' \ - share/ufw-gtk.desktop || die - elif use kde; then - sed -i 's/^Exec=su-to-root -X -c/Exec=kdesu/' \ - share/ufw-gtk.desktop || die - fi - - # don't try to override run() to install the script - # under /usr/sbin; it does not work with distutils-r1 - # and so it is handled differently (in python_install) - sed -i '/cmdclass=/d' setup.py || die - - # Qt version is unusable - rm gfw/frontend_qt.py || die - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install --install-scripts="/usr/sbin" -} - -python_install_all() { - distutils-r1_python_install_all - - if use policykit; then - insinto /usr/share/polkit-1/actions/ - doins "${FILESDIR}"/org.gentoo.pkexec.ufw-gtk.policy - elif ! use kde; then - rm "${ED}usr/share/applications/ufw-gtk.desktop" || die - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index 699dd7983fda..c61c46803ba5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -199,11 +199,6 @@ x11-plugins/fsviewer # Last release in 2007. Masked for removal in 30 days. x11-misc/wmakerconf -# Andreas Sturmlechner (2020-04-30) -# Py3 porting "not in the near future", bug #708152 -# Stuck on Python 2 and pygtk. Masked for removal in 30 days. -net-firewall/ufw-frontends - # Matt Turner (2020-04-29) # Masked for testing >=dev-libs/gjs-1.64 -- 2.26.2