summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2014-03-29 14:09:09 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2014-03-29 14:09:09 +0000
commit3c4beb3b3f8cb9f20601f42a9f7bf47a5257008c (patch)
tree9bfd40fcaf6b46e909d73f015d2aeac7185315a5 /net-firewall/ufw-frontends
parentFix typo in updated preference file, bug #506144 (diff)
downloadhistorical-3c4beb3b3f8cb9f20601f42a9f7bf47a5257008c.tar.gz
historical-3c4beb3b3f8cb9f20601f42a9f7bf47a5257008c.tar.bz2
historical-3c4beb3b3f8cb9f20601f42a9f7bf47a5257008c.zip
Revbump with upstream patch to fix crash when no log file is found. Thanks to Sławomir Nizio <slawomir.nizio@sabayon.org>
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!
Diffstat (limited to 'net-firewall/ufw-frontends')
-rw-r--r--net-firewall/ufw-frontends/ChangeLog10
-rw-r--r--net-firewall/ufw-frontends/Manifest32
-rw-r--r--net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch61
-rw-r--r--net-firewall/ufw-frontends/ufw-frontends-0.3.2-r2.ebuild66
4 files changed, 153 insertions, 16 deletions
diff --git a/net-firewall/ufw-frontends/ChangeLog b/net-firewall/ufw-frontends/ChangeLog
index 016b5bd28c73..1c8c91e99e69 100644
--- a/net-firewall/ufw-frontends/ChangeLog
+++ b/net-firewall/ufw-frontends/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-firewall/ufw-frontends
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ChangeLog,v 1.9 2014/02/16 11:28:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ChangeLog,v 1.10 2014/03/29 14:09:00 hwoarang Exp $
+
+*ufw-frontends-0.3.2-r2 (29 Mar 2014)
+
+ 29 Mar 2014; Markos Chandras <hwoarang@gentoo.org>
+ +ufw-frontends-0.3.2-r2.ebuild,
+ +files/ufw-frontends-0.3.2-no-log-crash.patch:
+ Revbump with upstream patch to fix crash when no log file is found. Thanks to
+ Sławomir Nizio <slawomir.nizio@sabayon.org>
16 Feb 2014; Markos Chandras <hwoarang@gentoo.org>
-ufw-frontends-0.3.2.ebuild:
diff --git a/net-firewall/ufw-frontends/Manifest b/net-firewall/ufw-frontends/Manifest
index 451227dfedfe..9d6ae9710020 100644
--- a/net-firewall/ufw-frontends/Manifest
+++ b/net-firewall/ufw-frontends/Manifest
@@ -2,26 +2,28 @@
Hash: SHA256
AUX org.gentoo.pkexec.ufw-gtk.policy 778 SHA256 abeae0fbfffbc09f6f208c713612e8425d8a11268baeae774fd12ee8aacae1c0 SHA512 f2b47a01535d565d2d3f40266f61b5b0ee3ad5befa4aa9f704000000f111980ac219eccea7d22fe3b0995d91aa794c278daa4f6a6d36649cd0db7b53772bd61f WHIRLPOOL 7119bad2f11779a3beb8c2267c918d31048eb9d70e949cb14b0e3068594b148ca88fca46cd46ff3b6e17216c1be208596eee1be9d8d182396769dac1d892c8fd
+AUX ufw-frontends-0.3.2-no-log-crash.patch 2224 SHA256 4e0120c76321900bc8ede1acb5c2aaad8e37d1989365e0576da718f15bace2b1 SHA512 a68e414c92d6570ba7368526ddefae30897d79f7b352e841f69fa95435a1b14c26b551b37b3431830ee3df700d3a48fc62d454c9be8f8e59d070f5e47ece7ea7 WHIRLPOOL 1a3550ee0e1cde3740a5d56515181822bf46f349741572eeb76e2cc53be74ec0b0220b2eab3d4f0c7bedb414d4138f49b489b503db24d6a6951aa5988ad4de9a
DIST ufw-frontends-0.3.2.tar.gz 85472 SHA256 7ff838d1f20a122307ef5e2bc94f6cbb5ea019a1d3d7ec72f7493c5f8c0a7910 SHA512 9f311596a3bad71562ca98acb8bf4d0d55990520cb5373c299dad05d1a1986e791eac984385013a511af4693a9988351ec37d8735ae6748818a9570db416b274 WHIRLPOOL 8b12a19c3338210d388b3d5ed24e22cbb49357d9fa9c768ad7b9ff8bcb6481cf4888048ec4c60266915a69095a90e2ce776a81f92f0f9692d8c2ef3fc4b669ed
EBUILD ufw-frontends-0.3.2-r1.ebuild 1712 SHA256 6ab3dade8132c7083e7a5caf7a3df654269cb08e29877ab82ddaa0b9dfe242e4 SHA512 1b95587f17741675e57a310d5d0266dae627a4009b01dc4799a9f3e250b4510ed91afa2ad0331421ad9479a01dc5ed8d91638d6b319382f28ce8fc36bded2c34 WHIRLPOOL 95deabfb066174789586b8b853af32f39667dc010741230838de76f9e6dfa1784af52da727c1a975c9c769fa8b74e93c988b06e678d5e2221bbd797e903a66f5
-MISC ChangeLog 1732 SHA256 7f0f19256d951c579f12ff8f712cce44a2a99b2bfcc38d1f2bae2804779a9034 SHA512 248e07bdc9abd148dce9dc6dd293c2de746ebfe247ef6955e6e38ddb725b4f2e2bced5de998f8902179268b6b1e3920e40a58463d14ff1d4633868e96fdbb01d WHIRLPOOL a743d47e2edd2d1dd8c1bcba78f6ff77db90a45bcc94e9ab1851a3ec733d76ac1bc62258f5fb1d0487bacf04a4ce45d43611eeba84702ae2a6093772f69c30fd
+EBUILD ufw-frontends-0.3.2-r2.ebuild 1828 SHA256 7ec041cb78c275719ffb60efd7bba90e9223c9417df248d24d93c81903970dee SHA512 f42b0d7e19d50c153977cc35d5501a5eb3cefbbb8b8d075ded11b7f1e4e0be3703c8b76dcf03289bebc0713615721d53f6ac8da4854b376725f4f4d50cd7386c WHIRLPOOL 783909af272df7f5ba51191caf4f177eaa01ad0be75d7e42902f54d0d164ed98ef7af7199bd106dee09b7528dd3a475e59a431d1e9a51838817d7f28dd52b6d0
+MISC ChangeLog 2036 SHA256 2f021db97f81ff8de76138ba780e31dc5a465a2bc927bc44da8b0543cc58b86e SHA512 f87f8e8a4906bac5c4f810fbbeba18f3569451b0da88042bffd1b5da16f27eed5e555d91a17f8f0fcd16576920f808bfb56fd65e6d45ffce5cba88316856faa5 WHIRLPOOL bb0c9b9174e8705c1d16874679de00738c136620ec8a5f4dd27ebcfbac02c6c9717934c2d9eb76a0f7ae3ce05b182a1e1d09bccebf69ead1cdb97a8f1558ea97
MISC metadata.xml 822 SHA256 4252988eb484e7ab30f1b8cce97e4ad793d437ec40bd6920b111bf59cfc44fde SHA512 b5394fbb4d959861fa83e8fcdc5c9c1c0ddf4063d5a96b834d3f47d6cb75ed3bfdd9a096a1a15651bc9401934ba76100cba726945ba391ba3833c05e517d124e WHIRLPOOL c45ea1994ae42a7fd4931b877f64dbbf5e3c4ec2ba5945b21d93c0fb9d1f0fa0baa68af5f5370ced31b73e97fc4cbc4d18a8452042badf94ef5d9f2629b45686
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTAKCLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTNtO3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88kskQAIO5NnUg05RTHVawjM7A5JaB
-5mhnLxUpX0VD6uKa1i1Cy8C4Py46iOTioSetkgmk5/iTb+mMpJqM/2wlrd7eUdw6
-MaJXPISUlCP7Wx6WM1+ZYIWjSm5DXMFui/5KL/t4F05LG6Z1QJtatAwh0QjUPiO+
-CwEByVwwHEcVojH0QUTo/FWiUhEzaNIADxxluO/cwrdK17m+1smZ2H1IJn2wa0wl
-oU/CwKG5M/neWVg2wtzls0qrpqQriqAj/XbcQHFegIivaaMsLmy4fOYb2/Wyicqz
-SZ2pTyod//QOyBsl/CTFTkBiUMrfvZfLf5XjdajgWoChXULi5AvvTjy3/+yPcgx3
-eTGB1DLw3YCG+nA6JZU5QtmV2gzWvNkjgH7SEchQA4cIe8g3K/mv8AfGZfC1EPVk
-cHOG15Mnx//ca3+cx8++5GyNqamk4//tnNzy/QcIORBHaGOVafGENOX8QU4o+J8B
-iEljoJxtVNXIVd+OYtLz5jsQm5frRjjR9ZLJSz2/XjjT1QLuAb1Eifu9T1yI5uOy
-TdRmELGuWlYCvZEskt2XZ7WfC02QKtI/L558iAoliLJVzYMJxYh4r5pKGUMAQqx/
-uwbadmYtPMoJvQ/VDDhxFoWyOMmsxH0B5VTFbv/kI17ZfPd9u6PdFX0OmyUXQpQR
-1s4mBRNvlNZJSbN/hC/4
-=AQZn
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88AdQP/3Io0+B+5mkiHJEYywc8bIKz
+MIy8RyXT2eum5+OAawzme06fQUgrHlCM2AWc0dZ/5zTe0Bj5C2j+AMg+itrqFDkE
+p7gnteM4RBtWb98wGaBEZfXQdPsI7m1IO3yKi7ueWb6v7l9Sgb97zx8xlr5eU9FO
+5KvQf20H2EPoAClMFvAqbItc/1cfzCbDMKTugB7qYIKjkmg9fB5QS+b6i08lXWZ8
+N1xItmNolgEOvhVk2fMPuBImHjKHfXHyEow4+9mKbBv9UI91NRyFA42Hp56vu6MC
+V1fJcBKHqj39IALFaBQh/PazLvWGk7JylJa/RwXNHG9I35I4bPHLkGs4OeHrNhS0
+/McrVnPyGppW+DyWiZ//wezCU6zvdkpMZb+tm+aJyB+b3UridpB1gYnm+sZRddxo
++F8RyQweB0kr/JjLmA0XkqBbv5eu0JKvkmkAlJEFBVKPSWsOV9ZAwN4YkDgDDqkA
+nKSjROXTonJXo3cE9zwMRYzGRqsN9ANCiL2gmpRfhTjmYUxl/4kPFDwcbp0R4d4L
+GtAg39ei9W+9oaNhdFaGINFdXBA4LIbn16CYC60Xchgi7qmHta1z7UaevEHYnb10
+sp+qlgYmo49QOTGUt//N6MUOpkqwmMjal5GcYtiWup7hsHgQnZF5gNuTFUo+L8Ux
+G9Dr6Johzv0HyUFmWJgd
+=g404
-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..f4adb49826ec
--- /dev/null
+++ b/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch
@@ -0,0 +1,61 @@
+From e7bcf87788588c3a38ce18c9a8d69bbe156860e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C5=82awomir=20Nizio?= <slawomir.nizio@sabayon.org>
+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/ufw-frontends-0.3.2-r2.ebuild b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..5b9f7b176a1f
--- /dev/null
+++ b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r2.ebuild,v 1.1 2014/03/29 14:09:00 hwoarang Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Provides graphical frontend to ufw"
+HOMEPAGE="http://code.google.com/p/ufw-frontends/"
+SRC_URI="http://ufw-frontends.googlecode.com/files/${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
+ !policykit? (
+ kde? ( kde-base/kdesu ) )
+ policykit? ( sys-auth/polkit )
+"
+
+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
+
+ # fix crash when no ufw logs in supported locations can
+ # be found
+ epatch "${FILESDIR}/${P}-no-log-crash.patch"
+}
+
+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 "${D}usr/share/applications/ufw-gtk.desktop" || die
+ fi
+}