commit: 6fd85eaae9e4af4c6f4da0bcc14051616abadcd4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Mar 7 18:08:53 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Mar 7 19:26:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd85eaa
net-firewall/iptables: drop /etc/ethertypes Bug: https://bugs.gentoo.org/647458 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 net-firewall/iptables/iptables-1.6.1-r3.ebuild | 10 ++++++++-- net-firewall/iptables/iptables-1.6.2-r1.ebuild | 10 ++++++++-- .../{iptables-1.6.2-r1.ebuild => iptables-1.6.2-r2.ebuild} | 12 ++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild index 67f06ce7ac0..f76df06504e 100644 --- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild +++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild @@ -19,7 +19,7 @@ SLOT="0/12" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="conntrack ipv6 netlink nftables pcap static-libs" -RDEPEND=" +COMMON_DEPEND=" conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( @@ -28,7 +28,7 @@ RDEPEND=" ) pcap? ( net-libs/libpcap ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} virtual/os-headers virtual/pkgconfig nftables? ( @@ -36,6 +36,12 @@ DEPEND="${RDEPEND} virtual/yacc ) " +RDEPEND="${COMMON_DEPEND} + nftables? ( + !<net-firewall/ebtables-2.0.10.4-r2 + !net-misc/ethertypes + ) +" src_prepare() { # use the saner headers from the kernel diff --git a/net-firewall/iptables/iptables-1.6.2-r1.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild index b6c9ab99f6b..3ed3f6a11a0 100644 --- a/net-firewall/iptables/iptables-1.6.2-r1.ebuild +++ b/net-firewall/iptables/iptables-1.6.2-r1.ebuild @@ -19,7 +19,7 @@ SLOT="0/12" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="conntrack ipv6 netlink nftables pcap static-libs" -RDEPEND=" +COMMON_DEPEND=" conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( @@ -28,7 +28,7 @@ RDEPEND=" ) pcap? ( net-libs/libpcap ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} virtual/os-headers virtual/pkgconfig nftables? ( @@ -36,6 +36,12 @@ DEPEND="${RDEPEND} virtual/yacc ) " +RDEPEND="${COMMON_DEPEND} + nftables? ( + !<net-firewall/ebtables-2.0.10.4-r2 + !net-misc/ethertypes + ) +" src_prepare() { # use the saner headers from the kernel diff --git a/net-firewall/iptables/iptables-1.6.2-r1.ebuild b/net-firewall/iptables/iptables-1.6.2-r2.ebuild similarity index 94% copy from net-firewall/iptables/iptables-1.6.2-r1.ebuild copy to net-firewall/iptables/iptables-1.6.2-r2.ebuild index b6c9ab99f6b..91954bd4d27 100644 --- a/net-firewall/iptables/iptables-1.6.2-r1.ebuild +++ b/net-firewall/iptables/iptables-1.6.2-r2.ebuild @@ -19,7 +19,7 @@ SLOT="0/12" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="conntrack ipv6 netlink nftables pcap static-libs" -RDEPEND=" +COMMON_DEPEND=" conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( @@ -28,7 +28,7 @@ RDEPEND=" ) pcap? ( net-libs/libpcap ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} virtual/os-headers virtual/pkgconfig nftables? ( @@ -36,6 +36,9 @@ DEPEND="${RDEPEND} virtual/yacc ) " +RDEPEND="${COMMON_DEPEND} + nftables? ( net-misc/ethertypes ) +" src_prepare() { # use the saner headers from the kernel @@ -102,6 +105,11 @@ src_install() { newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables fi + if use nftables; then + # Bug 647458 + rm "${ED%/}"/etc/ethertypes || die + fi + systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service if use ipv6 ; then systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
