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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/
Date: Tue,  9 Feb 2021 15:59:27 +0000 (UTC)	[thread overview]
Message-ID: <1612886283.48b6b55aefb25bfe50d9f09e04f2ae52c492ecba.vapier@gentoo> (raw)

commit:     48b6b55aefb25bfe50d9f09e04f2ae52c492ecba
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Feb  9 15:37:30 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 15:58:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b6b55a

net-firewall/ebtables: fix path to /etc/ethertypes #765679

The --sysconfdir setting controls where ebtables looks for ethertypes,
so don't use /usr/share/doc/ which is not guaranteed to exist, and is
not where the ethertypes package installs its config.  Switch back to
the standard /etc path instead.

This path logic was prob a mistake as part of the upgrade from the old
2.0.10.4 ebuild that had a similar named setting (SYSCONFIGDIR) but a
different meaning which we wanted to install into /usr/share/doc/.

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

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 107 ++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
new file mode 100644
index 00000000000..798135864de
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+MY_PV="$(ver_rs 3 '-' )"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
+HOMEPAGE="https://ebtables.netfilter.org/"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+perl static"
+
+BDEPEND=">=app-eselect/eselect-iptables-20200508"
+# The ebtables-save script is written in perl.
+RDEPEND="${BDEPEND}
+	perl? ( dev-lang/perl )
+	net-misc/ethertypes"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.11-makefile.patch"
+
+	# Enhance ebtables-save to take table names as parameters bug #189315
+	"${FILESDIR}/${PN}-2.0.11-ebt-save.patch"
+
+	# from upstream git
+	"${FILESDIR}/ebtables-2.0.11-remove-stray-atsign.patch"
+)
+
+pkg_setup() {
+	if use static; then
+		ewarn "You've chosen static build which is useful for embedded devices."
+		ewarn "It has no init script. Make sure that's really what you want."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't install perl scripts if USE=perl is disabled.
+	if ! use perl; then
+		sed -i -e '/^sbin_SCRIPTS/ d' Makefile.am || die
+	fi
+
+	# The bundled autotools are borked, so force a rebuild.
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--bindir="/bin" \
+		--sbindir="/sbin" \
+		--libdir="/$(get_libdir)/${PN}" \
+		$(use_enable static)
+}
+
+src_compile() {
+	emake $(usex static 'static ebtables-legacy.8' '')
+}
+
+src_install() {
+	local -a DOCS=( ChangeLog THANKS )
+
+	if ! use static; then
+		emake DESTDIR="${D}" install
+		keepdir /var/lib/ebtables/
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
+
+		find "${D}" -name '*.la' -type f -delete || die
+
+		# The ethertypes package installs this for us.
+		rm "${ED}"/etc/ethertypes || die
+	else
+		into /
+		newsbin static ebtables
+	fi
+
+	newman ebtables-legacy.8 ebtables.8
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! eselect ebtables show &>/dev/null; then
+		elog "Current ebtables implementation is unset, setting to ebtables-legacy"
+		eselect ebtables set ebtables-legacy
+	fi
+
+	eselect ebtables show
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] && has_version 'net-firewall/iptables[nftables]'; then
+		elog "Resetting ebtables symlinks to xtables-nft-multi before removal"
+		eselect ebtables set xtables-nft-multi
+	else
+		elog "Unsetting ebtables symlinks before removal"
+		eselect ebtables unset
+	fi
+}

next             reply	other threads:[~2021-02-09 15:59 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-09 15:59 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-03-12 12:31 [gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/ Arthur Zamarin
2022-02-04 18:48 Sam James
2021-08-23 11:41 Marek Szuba
2021-05-08 19:11 David Seifert
2021-05-08 18:55 Sam James
2021-05-08 18:49 Sam James
2021-05-08 18:44 Sam James
2021-05-08 18:41 Sam James
2021-02-09 15:59 Mike Frysinger
2021-02-09 15:59 Mike Frysinger
2020-12-29 17:02 Mike Gilbert
2020-08-20 13:20 Sam James
2020-07-19 23:31 Sam James
2020-07-18 17:06 Sam James
2020-07-17 15:21 Agostino Sarubbo
2020-06-19  6:51 Lars Wendler
2020-06-19  6:51 Lars Wendler
2020-05-10 20:49 Patrick McLean
2020-05-09  2:55 Patrick McLean
2020-05-04 17:36 Thomas Deutschmann
2019-12-28 21:32 Georgy Yakovlev
2018-03-07 19:26 Mike Gilbert
2018-03-07 19:26 Mike Gilbert
2015-09-29 19:53 Mike Frysinger
2015-09-23  2:33 Mike Frysinger
2015-09-23  2:33 Mike Frysinger
2015-09-23  2:33 Mike Frysinger
2015-09-23  2:33 Mike Frysinger
2015-09-22 21:39 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:798135864d )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1612886283.48b6b55aefb25bfe50d9f09e04f2ae52c492ecba.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox