[gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/files/

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/files/

[Lars Wendler]

commit:     2be4c027eafbbbad9615ae4c16ff4d9f06a54d2e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 06:49:05 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 06:51:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be4c027

net-firewall/ebtables: Replaced "echo -n" with "printf" in init script

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-firewall/ebtables/files/ebtables.initd-r1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1
index 9c78e9b78df..6608760110b 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="save panic"
@@ -16,7 +16,7 @@ depend() {
 ebtables_tables() {
 	for table in filter nat broute; do
 		if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then
-			echo -n "${table} "
+			printf '%s' "${table} "
 		fi
 	done
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/files/

[Mike Frysinger]

commit:     13ebe1e91aa41530b5c241dc52b411dbae8f66c8
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Feb  9 15:40:13 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 15:58:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ebe1e9

net-firewall/ebtables: make logger usage optional #514970

Use the same pattern adopted in iptables init scripts to make the
use of the logger init service optional.  This avoids circular deps
if the logger service requires the network, and shouldn't be a big
deal as most people probably aren't logging packets.

Fixes: https://bugs.gentoo.org/514970
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 net-firewall/ebtables/files/ebtables.confd-r1 | 8 ++++++++
 net-firewall/ebtables/files/ebtables.initd-r1 | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ebtables/files/ebtables.confd-r1 b/net-firewall/ebtables/files/ebtables.confd-r1
index 645b26edae9..8e83c81b9f8 100644
--- a/net-firewall/ebtables/files/ebtables.confd-r1
+++ b/net-firewall/ebtables/files/ebtables.confd-r1
@@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS=""
 
 # Save state on stopping ebtables
 SAVE_ON_STOP="yes"
+
+# If you need to log iptables messages as soon as iptables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"

diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1
index 6608760110b..1860187b7de 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="save panic"
@@ -10,7 +10,6 @@ ebtables_save=${EBTABLES_SAVE}
 
 depend() {
 	before net
-	use logger
 }
 
 ebtables_tables() {