commit: 1d3fe2586db6eaa2566b4ebb94cd4b5e340dfff9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 20 20:55:19 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 21 07:09:06 2020 +0000 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 <asturm <AT> 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..00000000000 --- 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..00000000000 --- 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" - -RDEPEND=" - !<net-firewall/iptables-1.6.2-r2[nftables(-)] - !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 - epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" - - 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 - make DESTDIR="${D}" install - keepdir /var/lib/ebtables/ - newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables - newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables - else - into / - newsbin static ebtables - insinto /etc - doins ethertypes - fi - dodoc ChangeLog THANKS -} diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff b/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff deleted file mode 100644 index cdfd823447e..00000000000 --- a/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- ./ebtables-save.orig 2007-09-28 22:50:35.000000000 +0400 -+++ ./ebtables-save 2007-09-28 22:51:22.000000000 +0400 -@@ -12,6 +12,7 @@ - my $cnt = ""; - my $version = "1.0"; - my $table_name; -+my @table_names; - - # ======================================================== - # Process filter table -@@ -49,12 +50,19 @@ - } - # ======================================================== - -+if ($#ARGV + 1 == 0) { -+ @table_names =split("\n", `grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//`); -+} -+else { -+ @table_names = @ARGV; -+} -+# ======================================================== - unless (-x $ebtables) { exit -1 }; - print "# Generated by ebtables-save v$version on " . `date`; - if (defined($ENV{'EBTABLES_SAVE_COUNTER'}) && $ENV{'EBTABLES_SAVE_COUNTER'} eq "yes") { - $cnt = "--Lc"; - } --foreach $table_name (split("\n", `grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//`)) { -+foreach $table_name (@table_names) { - $table =`$ebtables -t $table_name -L $cnt`; - unless ($? == 0) { print $table; exit -1 }; - &process_table($table);
