summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2015-06-23 09:32:33 +0000
committerMatthias Maier <tamiko@gentoo.org>2015-06-23 09:32:33 +0000
commita20de0239729e3fe5a7d7eb85e0f1375b05531df (patch)
tree4f7691ee7bdf302e5556359a0f105ef3e733bc89 /net-firewall/firewalld
parentRemove deprecated depend.php, bug #552864 (diff)
downloadhistorical-a20de0239729e3fe5a7d7eb85e0f1375b05531df.tar.gz
historical-a20de0239729e3fe5a7d7eb85e0f1375b05531df.tar.bz2
historical-a20de0239729e3fe5a7d7eb85e0f1375b05531df.zip
cleanup; version bump, thanks to Denis Schridde, bug #552832
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xBD3A97A3
Diffstat (limited to 'net-firewall/firewalld')
-rw-r--r--net-firewall/firewalld/ChangeLog8
-rw-r--r--net-firewall/firewalld/Manifest37
-rw-r--r--net-firewall/firewalld/firewalld-0.2.9-r1.ebuild90
-rw-r--r--net-firewall/firewalld/firewalld-0.3.14.2.ebuild (renamed from net-firewall/firewalld/firewalld-0.2.12.ebuild)59
4 files changed, 57 insertions, 137 deletions
diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index b434928c4496..86799ee33af0 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-firewall/firewalld
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.19 2015/05/27 11:15:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.20 2015/06/23 09:32:25 tamiko Exp $
+
+*firewalld-0.3.14.2 (23 Jun 2015)
+
+ 23 Jun 2015; Matthias Maier <tamiko@gentoo.org> +firewalld-0.3.14.2.ebuild,
+ -firewalld-0.2.12.ebuild, -firewalld-0.2.9-r1.ebuild:
+ cleanup; version bump, thanks to Denis Schridde, bug #552832
27 May 2015; Agostino Sarubbo <ago@gentoo.org> firewalld-0.3.10.ebuild:
Stable for x86, wrt bug #549270
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3fdb30f03790..16e4795d79a7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -3,31 +3,28 @@ Hash: SHA256
AUX firewalld-0.3.10-py3k-compat.patch 1060 SHA256 985ae246d2a86e9019d81804bfb33a1ce7ed443e9d6ff894fc7e8e45b58f6fc2 SHA512 62ffd0f63ea5817f9ec41830dc87f190f8c616633fb3db6ac16dc14332555c73f3416b47e21bd00aa033b0c1d6b00ecbcd9ed9c307c519c8ccb47b0b021a59de WHIRLPOOL fe45c125d08637ac5de5d3fcb0a6405cbdce8b3b373888844139b336a77dc6e21144dfbbdffaf9f7e7f3dc76a6a2a0a81f73b10a98c92b7f7b771e34bf8d4fa0
AUX firewalld.init 389 SHA256 17270614f049ad7662718720fa1c205b1859f9d5d7550b488fb6f35d070726ed SHA512 01213b8363eb25965f8432c9768cd351eed65994029734c20a0b86579c780dd734287ae5f038b73d85539ad21a38dcf5d63c26eb9d658dafa41e9891695bcb9a WHIRLPOOL 63a5cb71834064502806bb576dc629bdf5c7be2bc0bcc9ea7814f541bce8a0d8b296ce5d1077b5bb3236e2d476efa88ac6266375c08964062d5bd2ccea12b652
-DIST firewalld-0.2.12.tar.bz2 370144 SHA256 02da3b1660ba87056615f64714dcdcc13694e953d07fb415b1b23d57d94b3071 SHA512 2ebd773dbb1eb831b49c2fc402bd09fa9be0ff706ff4194bcdd44b0d16b33296f9cb015ff3db0050e5688fcb64a8acced40507d9870d13e35aa4608705f92a03 WHIRLPOOL 92c22549143aaa9c8f46ff89bfeeff41e03c3160d7af9dea08f786e0fc54e4becb4cd293268d2caaba62594bb9b11f195b2d64eb551203489ac95cdf37a9cfcc
-DIST firewalld-0.2.9-190680ba.tar.xz 3948 SHA256 610d1da880269220788aaa114879f3f6bcd463ab2cca92062a1f262277fb24fd SHA512 b053e2f504f4f318246c2b14c36fe3502a933e380333cfb82a79281e0c0f5cef89a05939b5adee18a7c26fe408b90ca24b9ab46b948696c7901da2f8e8f8db7c WHIRLPOOL 78ada112953a2385be74511ae9c1601c3d6334727dbaaec2124819a16299d2184e110cabbf719dc2bf837aa3a33ef799d77394f081f2d90ef5d57e3e4fc3dd30
-DIST firewalld-0.2.9.tar.bz2 280445 SHA256 106fd985074a74bbd84a3c866fa4023693b185d0e8b3e386d0aec9627b36bfd0 SHA512 1e1518ad2b7dd8e2c987bfa7b1efc72e7735444235a240350655801dc84a05fc1f9c524ea7ba71d5cc7d16735f2f54f3ed7d8bdd4b4770036a5756e379f7d656 WHIRLPOOL 849ccf8334f39333aa3c08e317d912528c4e69ebbb4db719ecf8428cc33c5f6e0d6a24eaef0f03ffbf912ce4619807904a3fd212cf6e63700c84dd1036291674
DIST firewalld-0.3.10.tar.bz2 548013 SHA256 0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b SHA512 3fb3363959203d90d51b2c9b7b7819a4f3521a51a10a59d73d65054018e1fe90d0fdd2e31d0b83a3d38e2b2fd6e92fccd6dd2a30ec7f1be3f98a018a5a49aeac WHIRLPOOL fc6d1ceeb4e5ba91b072526ffa2dd7a790d883176104bec6e7e547b9035757ff22743746389f50edd32d646a07e9bf311b109f89b8c59acfa350e71176d0bd3c
DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
-EBUILD firewalld-0.2.12.ebuild 2096 SHA256 2b385baef111fce428ea8cd0e280fdc661222badbefce6604833c43e07ec032b SHA512 66ad0fcc383f49625e9deb6834f6a0d43a7626da8a67e5ddbcdd2d4222c37d721f10cf4517be24702bc3bc3b11f96b44cf8771c300ac0f260afaad775cd57b25 WHIRLPOOL 675744791498c29274b64f6a49605e623cea1729411284c50eadaff783d07dbdc64d20749cdeea8c8cbc6989acf615514986c7263580a0a4d98325c2dec070ea
-EBUILD firewalld-0.2.9-r1.ebuild 2095 SHA256 8a5e4b59f4e5a971154b978ecbe84c35c8b9959f91f894b93ffca64013144ba6 SHA512 5abaf09215da761de9d3899ebf52a3104aa46594b2d1708f5d8cb35424e2bb4606539532552f95d553244b311ab5d7e35db7de3736b4237345981962cacc35b0 WHIRLPOOL 8ab7dfd789bcf3d798eb1ff407cbfc77d3993b2b9fc6044ff95b9c62546365d4ff12e3d1d9e0c5b0c247badd664cd9fba2941c956e61c03fe14ebc2adfbdcfc7
+DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f
EBUILD firewalld-0.3.10.ebuild 2581 SHA256 fe0dbdb116fc277c93a2f407083a58c3f2cff46d47664898f56dc9c1966ed8fd SHA512 9c950e9f8ae7f25e270b4a4127b1831d4d1504398b27be01772ccef7894c85824c541403666de85e0bffbfc840b8a402e06f2f4eb00652a82b4c11005a8999c5 WHIRLPOOL 9465a4f589ff8300489c9bb638d0f1e48995a560c2127e4bf43f94d8d2646699c2410642672a41bb48cef1808256b6c2a09df768a850ed0c65a9a5a912deb9fc
EBUILD firewalld-0.3.13.ebuild 2586 SHA256 5edbde95bcb771d0a80d43420ba4fc99c8c078682349f08eafc1b021328d9eae SHA512 5cd2d6314fe509f06ee311c81ddefb61187bf0beb1e80b075152b4bc0f133f8bcdf4ac13de7c61b8a7206ed644b3ac9c6233c38f07c9eccf63ea3f6359c02551 WHIRLPOOL d13a77bc93cdc7e5f031c205e11d9c890e37602b275165abf062679b0ceab08b4f8defc6c3ca830e85acef87745732eda5b28ba03d8de1ce110a857268cad5c9
-MISC ChangeLog 3137 SHA256 c6394529af95a5bdc7af547671f88ab63671e5889ede805c24d26d6b214151c1 SHA512 f0a9a78fb7f12e184b0eb07247832135a77c3291f6c6d12b340dfb0916585f3c6371d56a3df5d62b6c977897f1efdfa99f70fb11e31c0aed4ac4c8191dfd2499 WHIRLPOOL d99e95c866396efff0fe7edcd4f7652e09cb6a8b4e1bbc8247253329874c9db5780c07b0b10b9404aa578442fa33cce8ff92eeaf5bcd2fddbe9fd70db1710e6d
+EBUILD firewalld-0.3.14.2.ebuild 2535 SHA256 d5c28f3e2cb17c0663cbb12f137410b566b20c6be31ea2f8d53da928830fe7cb SHA512 fe3e9ab096647c12516efe11a13fc995ece176523e052cf61cd2de87c2c47a8f2c034cbc896345cc9c074b5e64a6fb6c02904887b66a96248ba6cbe2ffc4a2b7 WHIRLPOOL 012018808fab10456415d1db6e44f49ab1be40ff3f3e907932eb1276771054755a91a3ae8330546760e15f06d16e447e5f030d03609de01f2b383457fa3c7d5c
+MISC ChangeLog 3373 SHA256 66e4b49a2105bfbea7d334b03324eda61627e0df0b5a84105f1dc4563ebb0d49 SHA512 da0e810328038c59125bd350c8011d53fe2f584a9af329db3280adac19e6beeb18582aa9078803c43160a6c4fb5080365b527bb2b66d9fce35f5a5e0acca93f7 WHIRLPOOL 0443f724fae662742a472df0106f001ae23943c305c29664dd815c3f53a8aff462cf3e39041b8045c0b601ea2e1712b1c10f4b4e7a87866a929054b264b1b155
MISC metadata.xml 505 SHA256 999c7c22332b5d65770713881cb5a3f7f24a86e42eee59f2e0f7771a07c560c2 SHA512 3e808ab1fb859bba30e6cf0f4bdb87ff71140a292d151d8f97785329ad2fc3033362d5a82a17cb6cecc6ffe9ac4ac5a7513814336ed4e4c67d57972fbb178d09 WHIRLPOOL 878352416ebdeda1419fe944517b14c31d6a02f5fc8472d4b0c9c9995f69df5e8f2a5e67b9ccb872e2d28fe1b1f9150e321f1b8ef2e3fbd4120cdf90ce8a468b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
-iQIcBAEBCAAGBQJVZadpAAoJELp701BxlEWfiwcP/3kHDFckJ2d7+1WISZAmGAjJ
-4RD1gKZAPjnVPm0mb1+c2q1RRBbeKzQWLv8/6M2wrT02PfQHFbwv3YmbcnebW+Sx
-QFmwSPXjgrt8YtOjtbx0hmVFuMz2hqpk06jlc9xFfmXN0+OuDvsHfJdJMEAmZY8n
-swb879NsD5sIYp39kjqnhS+w4CFlw69pWenYPq1Zi48jj72hHSk9RVfhrpGXHWeG
-LVN8KRQ4q605GjZPAv8/y1MLXXUT5u5IoIWVhH64nKdglaT2nYHhfWHM+kv/Hii0
-qQMg5DtIcvUkKrpkHOlyJl4738nKN6nwoaeZabUT698kW2FJ++6Rl4mhPp7XrUym
-xZYt7HQ4udt+xzeOeXUUDywZKaAWNwWp9AUnWfDyAMCjHEFC/D+Tl2NCOK8MFa23
-zH+qTSRWFkemwHBljIUdm5J2cuO2Eli4KHYSjKNUZ3+pm+hqIRZ4Abwk4kTXGtrm
-Iefye8lPqyYE2uXiNybMZGYlj9SoSdCr/+Khj/ZX0yW4rvi7QhpCt7TPBx97rtRk
-lJXcjSrHFwpPKOKoVXiid9yV05uxuZNWN/IeSc7KCOW5NQHQcnosdfBuG5iaG5rQ
-/izAnJo0YvtsztYKxVU26Neft1sFD8vaUN6MokxvNjTf1O2fCv6Ib5nSaxKbtaIu
-6gLhOwI7RlCO9TPtgeth
-=wqUG
+iQIcBAEBCAAGBQJViSeqAAoJELhOzYlK7nn/v3UP/A3xgHFaMubTTVfiLOdgIaQH
+48gFesihMyPyFVPHCFILODW6mKikDBm7s5FBKWYYJAbT/WNN8F0DXr3TCZIcpa7k
+iCSOJTGLMeepI3UzJkqegHXC5+pAD1RZ5cYPr4KFzL1bjrn/Ge2YGeXqDp2GOybV
+vuuotQpC7Nq5OgEdvaKcL2QLqbDUKGDngl9bHu431hPgyAXlKqk4xwfUxaIK2dSm
+U/S3Hr4UIGl4JYThDMunoqlx6UJdauWYqTvr8WlYF+j4ABfDXFaC2HCL5cWZVBPD
+kHlAquCnDcW93QSz7eRawo6AuvqTsOPccr03WC+cQLJ8fDJukHzJbOfaYz1YLluR
+AaIwxTjYZj+SJoGCiPiONyRy6DEjiuw0ROJE5dBqeXFyfBZMVDKsYBkMxhN3gxib
+H1Cm3vkQUgGXq/Af5NpkQsCW3Z2qfgugeapHuurlyU0reVSn2X+Cm6/mWlHkEnJq
+Hl/lYJ+QmedTnpRz2d+JK8Q8vv+svybK4AqKS9G9Dif8XmapOKMJCzP3wkpfTHm3
+6kwC6qjeaB4U3OwEaOMU+BNjb2B+jdVBHw1M+dfHzzEDQl/e2w7a9rSnztcWTa9g
+PaDtI2USwY99mQZ83GtB5ofP+SiystNJg+9X6EOQ8ZnZ7DsvsQVyM6GXSikavhyu
+7kUe2vcKAL9KwBb/yzyc
+=1YcO
-----END PGP SIGNATURE-----
diff --git a/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild b/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild
deleted file mode 100644
index 6bd7e17772ec..000000000000
--- a/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild,v 1.5 2015/04/08 18:16:34 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-BACKPORTS=190680ba
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://fedorahosted.org/firewalld"
-SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
- ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gui"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python
- dev-python/decorator
- >=dev-python/python-slip-0.2.7[dbus]
- dev-python/pygobject:3
- net-firewall/ebtables
- net-firewall/iptables[ipv6]
- || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- dev-python/pygtk:2
- >=x11-libs/gtk+-2.6:2
- x11-libs/gtk+:3
- )"
-DEPEND="${RDEPEND}
- dev-libs/glib:2
- >=dev-util/intltool-0.35
- sys-devel/gettext"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- python_export_best
-
- econf \
- --enable-systemd
- "$(systemd_with_unitdir 'systemd-unitdir')"
-}
-
-src_install() {
- python_foreach_impl \
- emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
-
- # Get rid of junk
- rm -f "${ED}/etc/rc.d/init.d/firewalld"
- rm -f "${ED}/etc/sysconfig/firewalld"
- rm -rf "${ED}/etc/rc.d/"
- rm -rf "${ED}/etc/sysconfig/"
-
- # For non-gui installs we need to remove GUI bits
- if ! use gui; then
- rm -f "${ED}/usr/bin/firewall-applet"
- rm -f "${ED}/usr/bin/firewall-config"
- rm -rf "${ED}/usr/share/icons"
- rm -rf "${ED}/usr/share/applications"
- fi
-
- newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-0.2.12.ebuild b/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
index a6724080514f..cc78f2c221b6 100644
--- a/net-firewall/firewalld/firewalld-0.2.12.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.12.ebuild,v 1.2 2015/04/08 18:16:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.14.2.ebuild,v 1.1 2015/06/23 09:32:25 tamiko Exp $
EAPI=5
-PYTHON_COMPAT=( python2_7 )
-#BACKPORTS=190680ba
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+#BACKPORTS=
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
+inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
HOMEPAGE="http://fedorahosted.org/firewalld"
@@ -19,18 +19,14 @@ KEYWORDS="~amd64 ~x86"
IUSE="gui"
RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python
- dev-python/decorator
- >=dev-python/python-slip-0.2.7[dbus]
- dev-python/pygobject:3
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
net-firewall/ebtables
net-firewall/iptables[ipv6]
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- dev-python/pygtk:2
- >=x11-libs/gtk+-2.6:2
- x11-libs/gtk+:3
- )"
+ gui? ( x11-libs/gtk+:3 )"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35
@@ -46,29 +42,40 @@ src_prepare() {
}
src_configure() {
- python_export_best
+ python_setup
econf \
- --enable-systemd
- "$(systemd_with_unitdir 'systemd-unitdir')"
+ --enable-systemd \
+ "$(systemd_with_unitdir 'systemd-unitdir')" \
+ --with-bashcompletiondir="$(get_bashcompdir)"
}
src_install() {
- python_foreach_impl \
- emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
+ # manually split up the installation to avoid "file already exists" errors
+ emake -C config DESTDIR="${D}" install
+ emake -C po DESTDIR="${D}" install
+ emake -C shell-completion DESTDIR="${D}" install
+ emake -C doc DESTDIR="${D}" install
+
+ install_python() {
+ emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+ python_optimize
+ }
+ python_foreach_impl install_python
+
+ python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+ python_replicate_script "${D}/usr/sbin/firewalld"
# Get rid of junk
- rm -f "${ED}/etc/rc.d/init.d/firewalld"
- rm -f "${ED}/etc/sysconfig/firewalld"
- rm -rf "${ED}/etc/rc.d/"
- rm -rf "${ED}/etc/sysconfig/"
+ rm -rf "${D}/etc/rc.d/"
+ rm -rf "${D}/etc/sysconfig/"
# For non-gui installs we need to remove GUI bits
if ! use gui; then
- rm -f "${ED}/usr/bin/firewall-applet"
- rm -f "${ED}/usr/bin/firewall-config"
- rm -rf "${ED}/usr/share/icons"
- rm -rf "${ED}/usr/share/applications"
+ rm -f "${D}/usr/bin/firewall-applet"
+ rm -f "${D}/usr/bin/firewall-config"
+ rm -rf "${D}/usr/share/icons"
+ rm -rf "${D}/usr/share/applications"
fi
newinitd "${FILESDIR}"/firewalld.init firewalld