1 |
commit: 793b24acc338d0ee04959bced8ccea400f3b6cf1 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 31 22:08:50 2016 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 31 22:09:14 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793b24ac |
7 |
|
8 |
net-firewall/firewalld: version bump to 0.42, multiple fixes |
9 |
|
10 |
This commit also fixes |
11 |
|
12 |
- bug #573648: incorrect path to iptables and family |
13 |
- bug #581760: update homepage |
14 |
- bug #566772: missing dependency dev-python/PyQt4 |
15 |
|
16 |
Package-Manager: portage-2.2.28 |
17 |
|
18 |
net-firewall/firewalld/Manifest | 1 + |
19 |
net-firewall/firewalld/firewalld-0.4.2.ebuild | 106 ++++++++++++++++++++++++++ |
20 |
2 files changed, 107 insertions(+) |
21 |
|
22 |
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest |
23 |
index 3273e4a..d211a6f 100644 |
24 |
--- a/net-firewall/firewalld/Manifest |
25 |
+++ b/net-firewall/firewalld/Manifest |
26 |
@@ -1,3 +1,4 @@ |
27 |
DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159 |
28 |
DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f |
29 |
DIST firewalld-0.4.0.tar.bz2 603881 SHA256 858dca878c65853dec9044e3531a7ee4cd00a1766c268c354eb3480fe6e14914 SHA512 7ebb220e919619927c72faa04f1831ff679fdaecec3dd66ba58222a83c235f53acdaf7ec5bb6fe17d782e5e22a2525abbe27a3e6c7d4e32b16be15dd5bca2b7e WHIRLPOOL c189c26f49798f623699583a1a7470834491ca36d79a7fb5e9e6affb1f98c83edc362fcb6ecef46a25bf24b4bcd5336963e2ff4b2c643d0ed7cf876991711d8c |
30 |
+DIST firewalld-0.4.2.tar.bz2 649581 SHA256 329e44b7d8de2400222d602d6c87c368865531ffe4004c392803dbe55717068e SHA512 4e1ad32878393beaec70f91f462785c99464ce3ec610b68b20862af2bbb631b1bcffd0e68cff441944d5e272d63051dc783a7f5c0256c7a191e2340dab8f29a2 WHIRLPOOL 01b8928d9b570b70a358c68a2220712b329aace9c52905cc5420e9881575660c44b395d1b5f1ffc2550d74bcf42939db0a66fa9bdc02cb1d95959ab7a50072cd |
31 |
|
32 |
diff --git a/net-firewall/firewalld/firewalld-0.4.2.ebuild b/net-firewall/firewalld/firewalld-0.4.2.ebuild |
33 |
new file mode 100644 |
34 |
index 0000000..112ffe5 |
35 |
--- /dev/null |
36 |
+++ b/net-firewall/firewalld/firewalld-0.4.2.ebuild |
37 |
@@ -0,0 +1,106 @@ |
38 |
+# Copyright 1999-2016 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+# $Id$ |
41 |
+ |
42 |
+EAPI=5 |
43 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
44 |
+#BACKPORTS= |
45 |
+ |
46 |
+inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1 |
47 |
+ |
48 |
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall" |
49 |
+HOMEPAGE="http://www.firewalld.org/" |
50 |
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2 |
51 |
+ ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}" |
52 |
+ |
53 |
+LICENSE="GPL-2+" |
54 |
+SLOT="0" |
55 |
+KEYWORDS="~amd64 ~x86" |
56 |
+IUSE="gui" |
57 |
+ |
58 |
+RDEPEND="${PYTHON_DEPS} |
59 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
60 |
+ dev-python/decorator[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}] |
62 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
63 |
+ net-firewall/ebtables |
64 |
+ net-firewall/iptables[ipv6] |
65 |
+ || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) |
66 |
+ gui? ( |
67 |
+ x11-libs/gtk+:3 |
68 |
+ dev-python/PyQt4[${PYTHON_USEDEP}] |
69 |
+ )" |
70 |
+DEPEND="${RDEPEND} |
71 |
+ dev-libs/glib:2 |
72 |
+ >=dev-util/intltool-0.35 |
73 |
+ sys-devel/gettext" |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ [[ -n ${BACKPORTS} ]] && \ |
77 |
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
78 |
+ epatch |
79 |
+ |
80 |
+ epatch_user |
81 |
+ eautoreconf |
82 |
+} |
83 |
+ |
84 |
+src_configure() { |
85 |
+ python_setup |
86 |
+ |
87 |
+ econf \ |
88 |
+ --enable-systemd \ |
89 |
+ --with-iptables="${EROOT}/sbin/iptables" \ |
90 |
+ --with-ip6tables="${EROOT}/sbin/ip6tables" \ |
91 |
+ --with-iptables_restore="${EROOT}/sbin/iptables-restore" \ |
92 |
+ --with-ip6tables_restore="${EROOT}/sbin/ip6tables-restore" \ |
93 |
+ --with-ebtables="${EROOT}/sbin/ebtables" \ |
94 |
+ --with-ebtables_restore="${EROOT}/sbin/ebtables-restore" \ |
95 |
+ "$(systemd_with_unitdir 'systemd-unitdir')" \ |
96 |
+ --with-bashcompletiondir="$(get_bashcompdir)" |
97 |
+} |
98 |
+ |
99 |
+src_install() { |
100 |
+ # manually split up the installation to avoid "file already exists" errors |
101 |
+ emake -C config DESTDIR="${D}" install |
102 |
+ emake -C po DESTDIR="${D}" install |
103 |
+ emake -C shell-completion DESTDIR="${D}" install |
104 |
+ emake -C doc DESTDIR="${D}" install |
105 |
+ |
106 |
+ install_python() { |
107 |
+ emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install |
108 |
+ python_optimize |
109 |
+ } |
110 |
+ python_foreach_impl install_python |
111 |
+ |
112 |
+ python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config} |
113 |
+ python_replicate_script "${D}/usr/sbin/firewalld" |
114 |
+ |
115 |
+ # Get rid of junk |
116 |
+ rm -rf "${D}/etc/rc.d/" |
117 |
+ rm -rf "${D}/etc/sysconfig/" |
118 |
+ |
119 |
+ # For non-gui installs we need to remove GUI bits |
120 |
+ if ! use gui; then |
121 |
+ rm -f "${D}/usr/bin/firewall-applet" |
122 |
+ rm -f "${D}/usr/bin/firewall-config" |
123 |
+ rm -rf "${D}/usr/share/icons" |
124 |
+ rm -rf "${D}/usr/share/applications" |
125 |
+ fi |
126 |
+ |
127 |
+ newinitd "${FILESDIR}"/firewalld.init firewalld |
128 |
+} |
129 |
+ |
130 |
+pkg_preinst() { |
131 |
+ gnome2_icon_savelist |
132 |
+ gnome2_schemas_savelist |
133 |
+} |
134 |
+ |
135 |
+pkg_postinst() { |
136 |
+ gnome2_icon_cache_update |
137 |
+ gnome2_schemas_update |
138 |
+} |
139 |
+ |
140 |
+pkg_postrm() { |
141 |
+ gnome2_icon_cache_update |
142 |
+ gnome2_schemas_update |
143 |
+} |