From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F1371382C5 for ; Wed, 7 Mar 2018 19:26:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B534BE0999; Wed, 7 Mar 2018 19:26:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8621AE0995 for ; Wed, 7 Mar 2018 19:26:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE791335C31 for ; Wed, 7 Mar 2018 19:26:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA686243 for ; Wed, 7 Mar 2018 19:26:47 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1520450795.6fd85eaae9e4af4c6f4da0bcc14051616abadcd4.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/iptables/iptables-1.6.1-r3.ebuild net-firewall/iptables/iptables-1.6.2-r1.ebuild net-firewall/iptables/iptables-1.6.2-r2.ebuild X-VCS-Directories: net-firewall/iptables/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6fd85eaae9e4af4c6f4da0bcc14051616abadcd4 X-VCS-Branch: master Date: Wed, 7 Mar 2018 19:26:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f775a0da-f92e-49c2-8207-b308913bc90a X-Archives-Hash: 54615f6a07e8bc9c62f14edb78549248 commit: 6fd85eaae9e4af4c6f4da0bcc14051616abadcd4 Author: Mike Gilbert gentoo org> AuthorDate: Wed Mar 7 18:08:53 2018 +0000 Commit: Mike Gilbert gentoo 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-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-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