Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/, net-firewall/firewalld/
Date: Thu, 29 Sep 2016 13:53:49
Message-Id: 1475157188.19e332c3aca10d0c1693f50a4811bc07cef9fab6.tamiko@gentoo
1 commit: 19e332c3aca10d0c1693f50a4811bc07cef9fab6
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 13:53:08 2016 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 13:53:08 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e332c3
7
8 net-firewall/firewalld: drop vulnerable, bug #591458
9
10 Package-Manager: portage-2.3.0
11
12 net-firewall/firewalld/Manifest | 1 -
13 .../files/firewalld-0.3.10-py3k-compat.patch | 24 ------
14 net-firewall/firewalld/firewalld-0.3.13.ebuild | 99 ----------------------
15 3 files changed, 124 deletions(-)
16
17 diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
18 index 9e5426e..9778ea5 100644
19 --- a/net-firewall/firewalld/Manifest
20 +++ b/net-firewall/firewalld/Manifest
21 @@ -1,2 +1 @@
22 -DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
23 DIST firewalld-0.4.3.3.tar.bz2 679617 SHA256 e57d851e4f1aa65927e055d3e73b7a29a5ae37de51671ce1885e030fe6e0b6d4 SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a WHIRLPOOL 89077aefa28752e51472510bc5080c61e1f6051062efd4aaac08c8a60879b1c3d00db9d9ad7c33d8a49d8868fb9796c0bf945c869a470380f9e2ab017c45ab41
24
25 diff --git a/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch b/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
26 deleted file mode 100644
27 index e91590f..00000000
28 --- a/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
29 +++ /dev/null
30 @@ -1,24 +0,0 @@
31 -diff --git a/src/firewall/core/io/direct.py b/src/firewall/core/io/direct.py
32 -index b698e4c..6b80201 100644
33 ---- a/src/firewall/core/io/direct.py
34 -+++ b/src/firewall/core/io/direct.py
35 -@@ -295,8 +295,8 @@ class Direct(IO_Object):
36 - if len(self.passthroughs[ipv]) == 0:
37 - del self.passthroughs[ipv]
38 - else:
39 -- raise ValueError, "Passthrough '%s' for ipv '%s'" % \
40 -- ("',".join(args), ipv) + "not in list"
41 -+ raise ValueError("Passthrough '%s' for ipv '%s'" % \
42 -+ ("',".join(args), ipv) + "not in list")
43 -
44 - def query_passthrough(self, ipv, args):
45 - return (ipv in self.passthroughs and args in self.passthroughs[ipv])
46 -@@ -305,7 +305,7 @@ class Direct(IO_Object):
47 - if ipv in self.passthroughs:
48 - return self.passthroughs[ipv]
49 - else:
50 -- raise ValueError, "No passthroughs for ipv '%s'" % (ipv)
51 -+ raise ValueError("No passthroughs for ipv '%s'" % (ipv))
52 -
53 - def get_all_passthroughs(self):
54 - return self.passthroughs
55
56 diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
57 deleted file mode 100644
58 index 091ee2c..00000000
59 --- a/net-firewall/firewalld/firewalld-0.3.13.ebuild
60 +++ /dev/null
61 @@ -1,99 +0,0 @@
62 -# Copyright 1999-2015 Gentoo Foundation
63 -# Distributed under the terms of the GNU General Public License v2
64 -# $Id$
65 -
66 -EAPI=5
67 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
68 -#BACKPORTS=
69 -
70 -inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
71 -
72 -DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
73 -HOMEPAGE="http://fedorahosted.org/firewalld"
74 -SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
75 - ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
76 -
77 -LICENSE="GPL-2+"
78 -SLOT="0"
79 -KEYWORDS="amd64 x86"
80 -IUSE="gui"
81 -
82 -RDEPEND="${PYTHON_DEPS}
83 - dev-python/dbus-python[${PYTHON_USEDEP}]
84 - dev-python/decorator[${PYTHON_USEDEP}]
85 - >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
86 - dev-python/pygobject:3[${PYTHON_USEDEP}]
87 - net-firewall/ebtables
88 - net-firewall/iptables[ipv6]
89 - || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
90 - gui? ( x11-libs/gtk+:3 )"
91 -DEPEND="${RDEPEND}
92 - dev-libs/glib:2
93 - >=dev-util/intltool-0.35
94 - sys-devel/gettext"
95 -
96 -src_prepare() {
97 - [[ -n ${BACKPORTS} ]] && \
98 - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
99 - epatch
100 -
101 - epatch "${FILESDIR}/${PN}-0.3.10-py3k-compat.patch"
102 - epatch_user
103 - eautoreconf
104 -}
105 -
106 -src_configure() {
107 - python_setup
108 -
109 - econf \
110 - --enable-systemd \
111 - "$(systemd_with_unitdir 'systemd-unitdir')" \
112 - --with-bashcompletiondir="$(get_bashcompdir)"
113 -}
114 -
115 -src_install() {
116 - # manually split up the installation to avoid "file already exists" errors
117 - emake -C config DESTDIR="${D}" install
118 - emake -C po DESTDIR="${D}" install
119 - emake -C shell-completion DESTDIR="${D}" install
120 - emake -C doc DESTDIR="${D}" install
121 -
122 - install_python() {
123 - emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
124 - python_optimize
125 - }
126 - python_foreach_impl install_python
127 -
128 - python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
129 - python_replicate_script "${D}/usr/sbin/firewalld"
130 -
131 - # Get rid of junk
132 - rm -rf "${D}/etc/rc.d/"
133 - rm -rf "${D}/etc/sysconfig/"
134 -
135 - # For non-gui installs we need to remove GUI bits
136 - if ! use gui; then
137 - rm -rf "${D}/etc/xdg/autostart"
138 - rm -f "${D}/usr/bin/firewall-applet"
139 - rm -f "${D}/usr/bin/firewall-config"
140 - rm -rf "${D}/usr/share/icons"
141 - rm -rf "${D}/usr/share/applications"
142 - fi
143 -
144 - newinitd "${FILESDIR}"/firewalld.init firewalld
145 -}
146 -
147 -pkg_preinst() {
148 - gnome2_icon_savelist
149 - gnome2_schemas_savelist
150 -}
151 -
152 -pkg_postinst() {
153 - gnome2_icon_cache_update
154 - gnome2_schemas_update
155 -}
156 -
157 -pkg_postrm() {
158 - gnome2_icon_cache_update
159 - gnome2_schemas_update
160 -}