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

2022-03-12 Thread Arthur Zamarin
commit: 61a955d75ec82531f269a001a601e88bea62f783
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 12:31:44 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 12:31:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a955d7

net-firewall/ebtables: Stabilize 2.0.11-r3 arm, #834933

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index e60e49e80806..8567d785e8e3 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2022-02-04 Thread Sam James
commit: e14258a23988e6efed2cd5a1de65c75c52297e5b
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  4 18:47:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  4 18:47:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14258a2

net-firewall/ebtables: Stabilize 2.0.11-r3 ppc64, #831835

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index 3701ea171e82..e60e49e80806 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-08-23 Thread Marek Szuba
commit: d164cb8ba69e35e5c251b754d56cfafa081ffaa5
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 23 11:33:31 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 23 11:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d164cb8b

net-firewall/ebtables: keyword 2.0.11-r3 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index c8736d46935..3701ea171e8 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-05-08 Thread David Seifert
commit: 9f057138d1061d8d85d4b219b3cc342d913de8b2
Author: David Seifert  gentoo  org>
AuthorDate: Sat May  8 19:11:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May  8 19:11:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f057138

net-firewall/ebtables: Remove old 2.0.11-r2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 106 
 1 file changed, 106 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
deleted file mode 100644
index 2e2c4a00070..000
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs 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 -e '/sbin_SCRIPTS/ d' -i 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} \
-   --sysconfdir="/usr/share/doc/${PF}" \
-   $(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
-   else
-   into /
-   newsbin static ebtables
-   fi
-
-   newman ebtables-legacy.8 ebtables.8
-   einstalldocs
-   docompress -x /usr/share/doc/${PF}/ethertypes #724138
-}
-
-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
-}



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

2021-05-08 Thread Sam James
commit: 7d5e191473535dbb448056ae315a2357c0811a7b
Author: Sam James  gentoo  org>
AuthorDate: Sat May  8 18:55:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  8 18:55:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5e1914

net-firewall/ebtables: Stabilize 2.0.11-r3 ppc, #788931

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index e6f4b742942..c8736d46935 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-05-08 Thread Sam James
commit: 498744daab8d53844d48e6a8b20a3fc7886a02c0
Author: Sam James  gentoo  org>
AuthorDate: Sat May  8 18:49:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  8 18:49:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498744da

net-firewall/ebtables: Stabilize 2.0.11-r3 arm64, #788931

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index aa9c7716e98..e6f4b742942 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-05-08 Thread Sam James
commit: 49acef6f1e4f89a42236d73e2351c47084707c3d
Author: Sam James  gentoo  org>
AuthorDate: Sat May  8 18:44:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  8 18:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49acef6f

net-firewall/ebtables: Stabilize 2.0.11-r3 x86, #788931

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index b8338539038..aa9c7716e98 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-05-08 Thread Sam James
commit: 2fae7f9e28dd2448f06ff18da862c76e6c9ac87e
Author: Sam James  gentoo  org>
AuthorDate: Fri May  7 15:07:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  7 15:07:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fae7f9e

net-firewall/ebtables: Stabilize 2.0.11-r3 amd64, #788931

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index 467b9d7f3fd..b8338539038 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2021-02-09 Thread Mike Frysinger
commit: 13ebe1e91aa41530b5c241dc52b411dbae8f66c8
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Feb  9 15:40:13 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb  9 15:58:04 2021 +
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  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() {



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

2021-02-09 Thread Mike Frysinger
commit: 183aaaf64658625cb006b7cadb33e3a27e8fa496
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Feb  9 15:48:43 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb  9 15:58:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183aaaf6

net-firewall/ebtables: switch init to checkpath #603268

This makes the code a little simpler & more robust, and avoids
creating /var paths at install time.

Fixes: https://bugs.gentoo.org/603268
Signed-off-by: Mike Frysinger  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r3.ebuild | 1 -
 net-firewall/ebtables/files/ebtables.initd-r1   | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index 798135864de..467b9d7f3fd 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -70,7 +70,6 @@ src_install() {
 
if ! use static; then
emake DESTDIR="${D}" install
-   keepdir /var/lib/ebtables/
newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
 

diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 
b/net-firewall/ebtables/files/ebtables.initd-r1
index 1860187b7de..bdc0987b1b2 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -13,6 +13,7 @@ depend() {
 }
 
 ebtables_tables() {
+   local table
for table in filter nat broute; do
if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then
printf '%s' "${table} "
@@ -79,8 +80,8 @@ reload() {
 
 save() {
ebegin "Saving ebtables state"
-   touch "${ebtables_save}"
-   chmod 0600 "${ebtables_save}"
+   checkpath -d -m 0755 "${ebtables_save%/*}"
+   checkpath -f -m 0600 "${ebtables_save}"
${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > 
"${ebtables_save}"
eend $?
 }



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

2021-02-09 Thread Mike Frysinger
commit: 48b6b55aefb25bfe50d9f09e04f2ae52c492ecba
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Feb  9 15:37:30 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb  9 15:58:03 2021 +
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  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 000..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
+}



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

2021-02-09 Thread Mike Frysinger
commit: 72c4e71447d5b43071f1a16feca1776d7a3e9510
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Feb  9 15:20:22 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb  9 15:58:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c4e714

net-firewall/ebtables: update HOMEPAGE

And improve the comments a bit.

Signed-off-by: Mike Frysinger  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index b4d908e63cc..826555bb3ba 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PV="$(ver_rs 3 '-' )"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/;
+HOMEPAGE="https://ebtables.netfilter.org/;
 SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz;
 S="${WORKDIR}/${MY_P}"
 
@@ -44,11 +44,12 @@ pkg_setup() {
 src_prepare() {
default
 
-   # don't install perl scripts if USE=perl is disabled
+   # Don't install perl scripts if USE=perl is disabled.
if ! use perl; then
sed -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
fi
 
+   # The bundled autotools are borked, so force a rebuild.
eautoreconf
 }
 



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

2021-02-09 Thread Mike Frysinger
commit: ec63ecd11227071dd59a2ff8fd398c3d57010408
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Feb  9 15:28:59 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb  9 15:58:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec63ecd1

net-firewall/ebtables: stop installing /etc/ethertypes when USE=static

We stopped installing this in USE=-static already in favor of the
ethertypes package, so fix the USE=static codepath too.

Signed-off-by: Mike Frysinger  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 826555bb3ba..2e2c4a00070 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -79,8 +79,6 @@ src_install() {
else
into /
newsbin static ebtables
-   insinto /etc
-   doins ethertypes
fi
 
newman ebtables-legacy.8 ebtables.8



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

2020-12-29 Thread Mike Gilbert
commit: a5c55eb4b86f51367dd03d28523b8aa76afc2898
Author: Brian Mego  gmail  com>
AuthorDate: Tue Dec 29 02:54:22 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Dec 29 17:02:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c55eb4

net-firewall/ebtables: Update SRC_URI from ftp to http

Closes: https://bugs.gentoo.org/761990
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Brian Mego  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18844

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 722542153e9..b4d908e63cc 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
 HOMEPAGE="http://ebtables.sourceforge.net/;
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz;
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz;
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"



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

2020-08-20 Thread Sam James
commit: 2dd4e787435c82db8983ff05484c60d26d4b26fd
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 20 13:16:45 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 20 13:20:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd4e787

net-firewall/ebtables: Stabilize 2.0.11-r2 arm64, #738076

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 01a0294781f..722542153e9 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2020-07-21 Thread Andreas Sturmlechner
commit: 1d3fe2586db6eaa2566b4ebb94cd4b5e340dfff9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 20 20:55:19 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 21 07:09:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3fe258

net-firewall/ebtables: Drop 2.0.10.4 and 2.0.10.4-r2

Closes: https://bugs.gentoo.org/724138
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-firewall/ebtables/Manifest |  1 -
 net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild  | 72 --
 net-firewall/ebtables/ebtables-2.0.10.4.ebuild | 68 
 .../ebtables/files/ebtables-2.0.8.1-ebt-save.diff  | 31 --
 4 files changed, 172 deletions(-)

diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index e88c251f736..61a62a595d8 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,2 +1 @@
 DIST ebtables-2.0.11.tar.gz 428411 BLAKE2B 
62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
 SHA512 
43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f
-DIST ebtables-v2.0.10-4.tar.gz 103764 BLAKE2B 
01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6
 SHA512 
a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild
deleted file mode 100644
index 4fe72ef2909..000
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator toolchain-funcs flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+perl static"
-
-# The ebtables-save script is written in perl.
-RDEPEND="perl? ( dev-lang/perl )
-   net-misc/ethertypes"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-   # Enhance ebtables-save to take table names as parameters bug #189315
-   local PATCHES=( "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" )
-
-   default
-
-   sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-   -e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-   -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-   -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-   -e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-}
-
-src_compile() {
-   # This package uses _init functions to initialise extensions. With
-   # --as-needed this will not work.
-   append-ldflags $(no-as-needed)
-   emake \
-   CC="$(tc-getCC)" \
-   CFLAGS="${CFLAGS}" \
-   $(use static && echo static)
-}
-
-src_install() {
-   if ! use static; then
-   emake DESTDIR="${D}" install
-   keepdir /var/lib/ebtables/
-   newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-   newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-   if ! use perl; then
-   rm "${ED}"/sbin/ebtables-save || die
-   fi
-   # Bug 647458
-   rm "${ED%/}"/etc/ethertypes || die
-   else
-   into /
-   newsbin static ebtables
-   fi
-   dodoc ChangeLog THANKS
-}

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
deleted file mode 100644
index 10bbd3d6985..000
--- a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-IUSE="static"
-LICENSE="GPL-2"
-SLOT="0"
-

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

2020-07-19 Thread Sam James
commit: 44a479a88a53e72cd7891160a879c2459ed0e296
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 19 23:31:30 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 19 23:31:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a479a8

net-firewall/ebtables: amd64 stable (bug #724138)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 7b9807b9874..01a0294781f 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2020-07-18 Thread Sam James
commit: f856f8926d4c303d1b9a736c99bbac2c9b4dc7af
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 18 16:54:51 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 18 17:05:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f856f892

net-firewall/ebtables: x86 stable (bug #724138)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index b6d6f2f115d..7b9807b9874 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2020-07-17 Thread Agostino Sarubbo
commit: fd90097df503fee32bc51d7e338d23d44369acc2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 15:21:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 15:21:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd90097d

net-firewall/ebtables: ppc stable wrt bug #724138

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index d455e69db67..b6d6f2f115d 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+perl static"
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"



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

2020-06-19 Thread Lars Wendler
commit: 342b22ecf68b5520e297e79758905f0a10d3057e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun 19 06:50:49 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun 19 06:51:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342b22ec

net-firewall/ebtables: Removed old

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

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 72 --
 net-firewall/ebtables/ebtables-2.0.11.ebuild  | 92 ---
 2 files changed, 164 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
deleted file mode 100644
index c506fa3d0bf..000
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+perl static"
-
-# The ebtables-save script is written in perl.
-RDEPEND="perl? ( dev-lang/perl )
-   !http://ebtables.sourceforge.net/;
-SRC_URI="ftp://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"
-
-# The ebtables-save script is written in perl.
-RDEPEND="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 -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --bindir="/bin" \
-   --sbindir="/sbin" \
-   --libdir=/$(get_libdir)/${PN} \
-   --sysconfdir="/usr/share/doc/${PF}" \
-   $(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
-
-   # symlink -legacy binaries to original names
-   local ext
-   for ext in '' -{save,restore}; do
-   local prog="${PN}-legacy${ext}"
-   [[ -f ${ED}/sbin/${prog} ]] && dosym ${prog} 
/sbin/${PN}${ext}
-   done
-
-   find "${D}" -name '*.la' -type f -delete || die
-   else
-   into /
-   newsbin static ebtables
-   insinto /etc
-   doins ethertypes
-   fi
-
-   newman ebtables-legacy.8 ebtables.8
-   einstalldocs
-}



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

2020-06-19 Thread Lars Wendler
commit: 154631a73c9a5113baf279dfbd44b9058a15eb7b
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun 19 06:46:53 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun 19 06:51:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154631a7

net-firewall/ebtables: Don't compress the "ethertypes" file

Bug: https://bugs.gentoo.org/724138
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 .../ebtables/{ebtables-2.0.11-r1.ebuild => ebtables-2.0.11-r2.ebuild}| 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
similarity index 97%
rename from net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
rename to net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 038a8e1204c..d455e69db67 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -84,6 +84,7 @@ src_install() {
 
newman ebtables-legacy.8 ebtables.8
einstalldocs
+   docompress -x /usr/share/doc/${PF}/ethertypes #724138
 }
 
 pkg_postinst() {



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

2020-06-19 Thread Lars Wendler
commit: 2be4c027eafbbbad9615ae4c16ff4d9f06a54d2e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun 19 06:49:05 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun 19 06:51:01 2020 +
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  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/

2020-05-10 Thread Patrick McLean
commit: 3e9bba7a60b57bb7e0ad0c8308828b322597a75e
Author: Patrick McLean  gentoo  org>
AuthorDate: Sun May 10 20:48:54 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sun May 10 20:49:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9bba7a

net-firewall/ebtables-2.0.11-r1: Don't change provder on upgrades

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
index 4090f230c80..038a8e1204c 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
@@ -96,7 +96,7 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
-   if has_version 'net-firewall/iptables[nftables]'; then
+   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



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

2020-05-08 Thread Patrick McLean
commit: 6958be66cd5dd6d8f6c26ba94ecc48ef40299e16
Author: Patrick McLean  sony  com>
AuthorDate: Sat May  9 02:51:30 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sat May  9 02:54:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6958be66

net-firewall/ebtables-2.0.11-r1: Revbump, support eselect-arptables

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

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

diff --git a/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
new file mode 100644
index 000..4090f230c80
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.11-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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="http://ebtables.sourceforge.net/;
+SRC_URI="ftp://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 -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --bindir="/bin" \
+   --sbindir="/sbin" \
+   --libdir=/$(get_libdir)/${PN} \
+   --sysconfdir="/usr/share/doc/${PF}" \
+   $(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
+   else
+   into /
+   newsbin static ebtables
+   insinto /etc
+   doins ethertypes
+   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 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
+}



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

2020-05-04 Thread Thomas Deutschmann
commit: c256688eacc30adc834c4f04995d0057e25c28a4
Author: Roy Yang  google  com>
AuthorDate: Sat May  2 22:16:44 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May  4 17:35:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c256688e

Fixed CPE tag for net-firewall/ebtables

Signed-off-by: Roy Yang  google.com>
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ebtables/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-firewall/ebtables/metadata.xml 
b/net-firewall/ebtables/metadata.xml
index 16ad142c152..3386c21e014 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -10,5 +10,6 @@


ebtables
+   cpe:/a:netfilter:ebtables

 



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

2019-12-28 Thread Georgy Yakovlev
commit: c12d77456def9741a16f7354ac86a94f46831b3b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Dec 28 20:41:12 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Dec 28 21:32:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12d7745

net-firewall/ebtables: keyword 2.0.11 on ~ppc64

Bug: https://bugs.gentoo.org/679888
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-firewall/ebtables/ebtables-2.0.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.11.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11.ebuild
index fc30080735c..c9be4be12cc 100644
--- a/net-firewall/ebtables/ebtables-2.0.11.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+perl static"
 
 # The ebtables-save script is written in perl.



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

2019-12-10 Thread Patrick McLean
commit: c9fbfa0047ff1fd1a1f40a6621bd5e8beada3432
Author: Patrick McLean  gentoo  org>
AuthorDate: Tue Dec 10 22:17:06 2019 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue Dec 10 22:18:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fbfa00

net-firewall/ebtables-2.0.11: Version bump

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/ebtables/Manifest |  1 +
 net-firewall/ebtables/ebtables-2.0.11.ebuild   | 92 ++
 .../ebtables/files/ebtables-2.0.11-ebt-save.patch  | 26 ++
 .../ebtables/files/ebtables-2.0.11-makefile.patch  | 13 +++
 .../ebtables-2.0.11-remove-stray-atsign.patch  | 32 
 5 files changed, 164 insertions(+)

diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 73219a00e79..e88c251f736 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1 +1,2 @@
+DIST ebtables-2.0.11.tar.gz 428411 BLAKE2B 
62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
 SHA512 
43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f
 DIST ebtables-v2.0.10-4.tar.gz 103764 BLAKE2B 
01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6
 SHA512 
a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a

diff --git a/net-firewall/ebtables/ebtables-2.0.11.ebuild 
b/net-firewall/ebtables/ebtables-2.0.11.ebuild
new file mode 100644
index 000..fc30080735c
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.11.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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="http://ebtables.sourceforge.net/;
+SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+perl static"
+
+# The ebtables-save script is written in perl.
+RDEPEND="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 -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --bindir="/bin" \
+   --sbindir="/sbin" \
+   --libdir=/$(get_libdir)/${PN} \
+   --sysconfdir="/usr/share/doc/${PF}" \
+   $(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
+
+   # symlink -legacy binaries to original names
+   local ext
+   for ext in '' -{save,restore}; do
+   local prog="${PN}-legacy${ext}"
+   [[ -f ${ED}/sbin/${prog} ]] && dosym ${prog} 
/sbin/${PN}${ext}
+   done
+
+   find "${D}" -name '*.la' -type f -delete || die
+   else
+   into /
+   newsbin static ebtables
+   insinto /etc
+   doins ethertypes
+   fi
+
+   newman ebtables-legacy.8 ebtables.8
+   einstalldocs
+}

diff --git a/net-firewall/ebtables/files/ebtables-2.0.11-ebt-save.patch 
b/net-firewall/ebtables/files/ebtables-2.0.11-ebt-save.patch
new file mode 100644
index 000..7cfe128babf
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-2.0.11-ebt-save.patch
@@ -0,0 +1,26 @@
+diff --git a/ebtables-save.in b/ebtables-save.in
+index 17924a2..c7a64c3 100644
+--- a/ebtables-save.in
 b/ebtables-save.in
+@@ -12,6 +12,7 @@ my $ebtables = "@sbindir@/ebtables";
+ my $cnt = "";
+ my $version = "1.0";
+ my 

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

2018-03-07 Thread Mike Gilbert
commit: ca9ad0c216ce9301b176b362168aac8926922452
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Mar  7 17:43:52 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Mar  7 19:26:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9ad0c2

net-firewall/ebtables: drop /etc/ethertypes

Bug: https://bugs.gentoo.org/647458
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild |  5 -
 ...les-2.0.10.4-r1.ebuild => ebtables-2.0.10.4-r2.ebuild} | 15 +--
 net-firewall/ebtables/ebtables-2.0.10.4.ebuild|  5 +
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index 83e49e5a63c..c506fa3d0bf 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -18,7 +18,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+perl static"
 
 # The ebtables-save script is written in perl.
-RDEPEND="perl? ( dev-lang/perl )"
+RDEPEND="perl? ( dev-lang/perl )
+   !

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

2018-03-07 Thread Mike Gilbert
commit: f3b3146caddc0a31e9c7f4b5abbeb820328ca583
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Mar  7 17:46:03 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Mar  7 19:26:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b3146c

net-firewall/ebtables: shorten DESCRIPTION

Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 4 ++--
 net-firewall/ebtables/ebtables-2.0.10.4.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index e115a16fdbd..83e49e5a63c 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -8,7 +8,7 @@ inherit versionator eutils toolchain-funcs multilib flag-o-matic
 MY_PV=$(replace_version_separator 3 '-' )
 MY_P=${PN}-v${MY_PV}
 
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux 
bridge, MAC NAT and brouting"
+DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
 HOMEPAGE="http://ebtables.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
index 7aeb41c564a..d4f1785a01f 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -8,7 +8,7 @@ inherit versionator eutils toolchain-funcs multilib flag-o-matic
 MY_PV=$(replace_version_separator 3 '-' )
 MY_P=${PN}-v${MY_PV}
 
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux 
bridge, MAC NAT and brouting"
+DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and 
brouting"
 HOMEPAGE="http://ebtables.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 



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

2015-09-29 Thread Mike Frysinger
commit: bc4edfef3fc8ab8ec8b7f63cef5ba4f6a7cbc5be
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Sep 29 19:52:00 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Sep 29 19:53:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4edfef

net-firewall/ebtables: add USE=perl to control perl dep

The ebtables-save script is written in perl, so make sure we RDEPEND
on it.  Since that's a big dep for little gain, make it optional.
Some systems (like Chromium OS) have no use for it.

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 10 --
 net-firewall/ebtables/metadata.xml|  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index 9913e2c..10a58f5 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="static"
+IUSE="+perl static"
+
+# The ebtables-save script is written in perl.
+RDEPEND="perl? ( dev-lang/perl )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -54,6 +57,9 @@ src_install() {
keepdir /var/lib/ebtables/
newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
+   if ! use perl; then
+   rm "${ED}"/sbin/ebtables-save || die
+   fi
else
into /
newsbin static ebtables

diff --git a/net-firewall/ebtables/metadata.xml 
b/net-firewall/ebtables/metadata.xml
index 23b2d79..0464212 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -2,6 +2,9 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
base-system
+   
+   Install the ebtables-save script which uses 
perl
+   

ebtables




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

2015-09-22 Thread Mike Frysinger
commit: 070682e1ea1528d6e2ceda8eee67fe4e70591f31
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Sep 22 21:38:26 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Sep 22 21:38:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070682e1

net-firewall/ebtables: add arm/arm64 love to 2.0.10.4-r1

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index 5bd1278..e298706 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utility that enables basic Ethernet frame 
filtering on a Linux brid
 HOMEPAGE="http://ebtables.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="static"
 LICENSE="GPL-2"
 SLOT="0"



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

2015-09-22 Thread Mike Frysinger
commit: 612b2a7612a112b50137943b7efc1136989f7447
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Sep 22 23:03:29 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Sep 23 02:33:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612b2a76

net-firewall/ebtables: delete redundant `|| die`

Since `dodoc` automatically calls `die` w/EAPI=4, drop it from the ebuild.

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 2 +-
 net-firewall/ebtables/ebtables-2.0.10.4.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index a382ad6..afd8c53 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -60,5 +60,5 @@ src_install() {
insinto /etc
doins ethertypes
fi
-   dodoc ChangeLog THANKS || die
+   dodoc ChangeLog THANKS
 }

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
index b63cf5a..d88ff64 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -60,5 +60,5 @@ src_install() {
insinto /etc
doins ethertypes
fi
-   dodoc ChangeLog THANKS || die
+   dodoc ChangeLog THANKS
 }



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

2015-09-22 Thread Mike Frysinger
commit: 77535b459c4486b896d3fcadff77d29184107204
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Sep 23 02:31:13 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Sep 23 02:33:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77535b45

net-firewall/ebtables: use emake in install

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index afd8c53..9614a39 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -50,7 +50,7 @@ src_compile() {
 
 src_install() {
if ! use static; then
-   make DESTDIR="${D}" install
+   emake DESTDIR="${D}" install
keepdir /var/lib/ebtables/
newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables



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

2015-09-22 Thread Mike Frysinger
commit: 993596b06405bd4d7a2d7f2636359e14db8978d0
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Sep 23 02:31:42 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Sep 23 02:33:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=993596b0

net-firewall/ebtables: fix sorting of LICENSE/SLOT/KEYWORDS/IUSE

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

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index 9614a39..9913e2c 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -13,10 +13,10 @@ DESCRIPTION="Utility that enables basic Ethernet frame 
filtering on a Linux brid
 HOMEPAGE="http://ebtables.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="static"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="static"
 
 S=${WORKDIR}/${MY_P}
 



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

2015-09-22 Thread Mike Frysinger
commit: 244fec074ecb3fa9f3a9fc6cb50dab40acef59d1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Sep 22 23:02:16 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Sep 23 02:33:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244fec07

net-firewall/ebtables: delete incorrect/misleading comment

The quoted code is not safe at all, so delete the incorrect comment in
the hopes no one notices it and (incorrectly) copies it into a different
ebuild.

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 4 
 net-firewall/ebtables/ebtables-2.0.10.4.ebuild| 4 
 2 files changed, 8 deletions(-)

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
index e298706..a382ad6 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
@@ -42,10 +42,6 @@ src_compile() {
# This package uses _init functions to initialise extensions. With
# --as-needed this will not work.
append-ldflags $(no-as-needed)
-   # This package correctly aliases pointers, but gcc is unable to know 
that:
-   # unsigned char ip[4];
-   # if (*((uint32_t*)ip) == 0) {
-   #append-cflags -Wno-strict-aliasing
emake \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \

diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild 
b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
index 75eec73..b63cf5a 100644
--- a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -42,10 +42,6 @@ src_compile() {
# This package uses _init functions to initialise extensions. With
# --as-needed this will not work.
append-ldflags $(no-as-needed)
-   # This package correctly aliases pointers, but gcc is unable to know 
that:
-   # unsigned char ip[4];
-   # if (*((uint32_t*)ip) == 0) {
-   #append-cflags -Wno-strict-aliasing
emake \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \