* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/, net-firewall/firewalld/files/
@ 2018-03-17 0:27 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-03-17 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 2c4507f1549150876d1474de52df40e553bef446
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 23:02:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:26:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c4507f1
net-firewall/firewalld: Fix build failure
Closes: https://bugs.gentoo.org/649518
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/firewalld-0.5.1-errorcodes1.patch | 48 ++++++++++++++++++++++
.../files/firewalld-0.5.1-errorcodes2.patch | 40 ++++++++++++++++++
net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 2 +
3 files changed, 90 insertions(+)
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
new file mode 100644
index 00000000000..0bf8aacc839
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
@@ -0,0 +1,48 @@
+From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001
+From: Eric Garver <e@erig.me>
+Date: Mon, 5 Feb 2018 10:20:54 -0500
+Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that
+ don't use it
+
+---
+ doc/xml/firewall-applet.xml | 1 -
+ doc/xml/firewall-config.xml | 1 -
+ doc/xml/firewall-offline-cmd.xml | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml
+index 831ec320..b86a62ad 100644
+--- a/doc/xml/firewall-applet.xml
++++ b/doc/xml/firewall-applet.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+
+ <!--
+diff --git a/doc/xml/firewall-config.xml b/doc/xml/firewall-config.xml
+index ae0fb549..2e7627cc 100644
+--- a/doc/xml/firewall-config.xml
++++ b/doc/xml/firewall-config.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+
+ <!--
+diff --git a/doc/xml/firewall-offline-cmd.xml b/doc/xml/firewall-offline-cmd.xml
+index e157f675..85757b4e 100644
+--- a/doc/xml/firewall-offline-cmd.xml
++++ b/doc/xml/firewall-offline-cmd.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+
+ <!--
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
new file mode 100644
index 00000000000..e2b31e3936f
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
@@ -0,0 +1,40 @@
+From 61286b73e21a75492abc8672e3812da9f85bfc35 Mon Sep 17 00:00:00 2001
+From: Eric Garver <e@erig.me>
+Date: Mon, 5 Feb 2018 10:25:21 -0500
+Subject: [PATCH] doc/xml/Makefile: firewallctl docs depend on errorcodes
+
+Fixes the below build error:
+
+$ make -C doc/xml ../html/firewallctl.html
+...
+xsltproc -o ../html/firewallctl.html --nonet --xinclude transform-html.xsl firewallctl.xml
+warning: failed to load external entity "errorcodes.xml"
+firewallctl.xml:1937: parser error : Failure to process entity errorcodes
+ &errorcodes;
+ ^
+firewallctl.xml:1937: parser error : Entity 'errorcodes' not defined
+ &errorcodes;
+ ^
+unable to parse firewallctl.xml
+---
+ doc/xml/Makefile.am | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
+index be89d803..129ec501 100644
+--- a/doc/xml/Makefile.am
++++ b/doc/xml/Makefile.am
+@@ -46,9 +46,11 @@ all: $(man_MANS) $(HTMLS)
+ clean:
+ -test -z "$(CLEAN_FILES)" || rm -f $(CLEAN_FILES)
+
+-../man/man1/firewall-cmd.1: errorcodes.xml firewall-cmd.xml
++../man/man1/firewallctl.1: errorcodes.xml
++../html/firewallctl.html: errorcodes.xml
+
+-../html/firewall-cmd.html: errorcodes.xml firewall-cmd.xml
++../man/man1/firewall-cmd.1: errorcodes.xml
++../html/firewall-cmd.html: errorcodes.xml
+
+ ../man/man1/%.1: %.xml authors.xml notes.xml seealso.xml transform-man.xsl
+ $(XSLTPROC) -o $@ $(XSLTPROC_MAN_FLAGS) $<
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index e5156d9770f..d4c0320ae0b 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
sys-devel/gettext"
+PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/, net-firewall/firewalld/files/
@ 2018-10-18 5:20 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2018-10-18 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 9475fd2b16b650273ca215b4b88b08f7f3856d96
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 04:50:47 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 05:19:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9475fd2b
net-firewall/firewalld: Version bump to 0.6.3
Handle a bunch of overdue changes at the same time:
- Depend on net-firewall/nftables (see upstream commit 7fc4b6cfb52c)
- Switch to python-single-r1 (see upstream commit 6d5c0c61fe04)
- Check for required kernel options (bug 540110)
- Update OpenRC init file (bug 654706)
Closes: https://github.com/gentoo/gentoo/pull/10033
Closes: https://bugs.gentoo.org/540110
Closes: https://bugs.gentoo.org/654706
Closes: https://bugs.gentoo.org/662314
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-firewall/firewalld/Manifest | 1 +
net-firewall/firewalld/files/firewalld.init | 4 +-
net-firewall/firewalld/firewalld-0.6.3.ebuild | 100 ++++++++++++++++++++++++++
3 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 867d62e1570..ab80ac82657 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
+DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
diff --git a/net-firewall/firewalld/files/firewalld.init b/net-firewall/firewalld/files/firewalld.init
index 2618338e9f8..3bd3623de86 100644
--- a/net-firewall/firewalld/files/firewalld.init
+++ b/net-firewall/firewalld/files/firewalld.init
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="FirewallD"
@@ -8,5 +8,5 @@ pidfile=/var/run/firewalld.pid
depend() {
need dbus
- provide iptables ip6tables ebtables
+ provide firewall
}
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
new file mode 100644
index 00000000000..fc1c2cde788
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !!net-firewall/gshield
+ 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]
+ net-firewall/ipset
+ net-firewall/nftables
+ || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ dev-libs/glib:2
+ >=dev-util/intltool-0.35
+ sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+pkg_setup() {
+ local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ python_setup
+
+ econf \
+ --enable-systemd \
+ --with-iptables="${EPREFIX}/sbin/iptables" \
+ --with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+ --with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+ --with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+ --with-ebtables="${EPREFIX}/sbin/ebtables" \
+ --with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+ --with-nft="${EPREFIX}/sbin/nft" \
+ --with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+ --with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+ default
+ python_optimize
+
+ # Get rid of junk
+ rm -rf "${D}/etc/rc.d/" || die
+ rm -rf "${D}/etc/sysconfig/" || die
+
+ # For non-gui installs we need to remove GUI bits
+ if ! use gui; then
+ rm -rf "${D}/etc/xdg/autostart" || die
+ rm -f "${D}/usr/bin/firewall-applet" || die
+ rm -f "${D}/usr/bin/firewall-config" || die
+ rm -rf "${D}/usr/share/applications" || die
+ rm -rf "${D}/usr/share/icons" || die
+ 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/, net-firewall/firewalld/files/
@ 2024-03-21 4:10 Dennis Lamm
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Lamm @ 2024-03-21 4:10 UTC (permalink / raw
To: gentoo-commits
commit: 2ee17b4a82ccad13f49f3dcdde94740e53564b3f
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 08:58:04 2024 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 04:10:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee17b4a
net-firewall/firewalld: improved systemd service
removed environment variable reference from ExecStart
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35562
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
.../firewalld/files/firewalld-systemd-service.patch | 19 +++++++++++++++++++
...alld-2.1.1-r1.ebuild => firewalld-2.1.1-r2.ebuild} | 11 ++++-------
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/net-firewall/firewalld/files/firewalld-systemd-service.patch b/net-firewall/firewalld/files/firewalld-systemd-service.patch
new file mode 100644
index 000000000000..66f4c730b66f
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-systemd-service.patch
@@ -0,0 +1,19 @@
+Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
+Removes EnvironmentFile and FIREWALLD_ARGS variable
+===================================================================
+--- a/config/firewalld.service.in
++++ b/config/firewalld.service.in
+@@ -4,12 +4,10 @@
+ Wants=network-pre.target
+ After=dbus.service
+ After=polkit.service
+-Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service
+ Documentation=man:firewalld(1)
+
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/firewalld
+-ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
++ExecStart=@sbindir@/firewalld --nofork --nopid
+ ExecReload=/bin/kill -HUP $MAINPID
+ # supress to log debug and error output also to /var/log/messages
+ StandardOutput=null
diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
similarity index 94%
rename from net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
rename to net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index aac81d88bbee..fbe62a47db37 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -55,6 +55,10 @@ QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+PATCHES=(
+ "${FILESDIR}"/${PN}-systemd-service.patch
+)
+
pkg_setup() {
# See bug #830132 for the huge list
# We can probably narrow it down a bit but it's rather fragile
@@ -165,13 +169,6 @@ src_prepare() {
plocale_find_changes "po" "" ".po" || die
plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-
- # Our version drops the/an obsolete 'conflicts' line with old iptables services
- # bug #833506
- sed -i \
- -e "/Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service/d" \
- -e "/EnvironmentFile=-\/etc\/sysconfig\/firewalld/d" \
- config/firewalld.service.in || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-21 4:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-21 4:10 [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/, net-firewall/firewalld/files/ Dennis Lamm
-- strict thread matches above, loose matches on Subject: below --
2018-10-18 5:20 Matt Turner
2018-03-17 0:27 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox