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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4503515808F for ; Fri, 18 Feb 2022 02:44:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 829452BC00C; Fri, 18 Feb 2022 02:44:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 352C42BC009 for ; Fri, 18 Feb 2022 02:44:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F83534333C for ; Fri, 18 Feb 2022 02:44:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11BC62EE for ; Fri, 18 Feb 2022 02:44:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645152019.174ce77f31336d5d8c9a4af20dfa7d31e2c55ca5.sam@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.8.7-r1.ebuild X-VCS-Directories: net-firewall/iptables/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 174ce77f31336d5d8c9a4af20dfa7d31e2c55ca5 X-VCS-Branch: master Date: Fri, 18 Feb 2022 02:44:30 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 97df8bea-11cb-4a94-a1ec-354bbad3c805 X-Archives-Hash: 816060fe41d78823c799af2a7069ced8 commit: 174ce77f31336d5d8c9a4af20dfa7d31e2c55ca5 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 12 16:17:57 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 18 02:40:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174ce77f net-firewall/iptables: Enable ipv6 unconditionally Remove USE=ipv6 and enable IPv6 unconditionally. There is really no technical reason to disable it here, and the majority of revdeps of this package require it being enabled. Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Sam James gentoo.org> net-firewall/iptables/iptables-1.8.7-r1.ebuild | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/net-firewall/iptables/iptables-1.8.7-r1.ebuild b/net-firewall/iptables/iptables-1.8.7-r1.ebuild index f748bdb9f289..886111459d9b 100644 --- a/net-firewall/iptables/iptables-1.8.7-r1.ebuild +++ b/net-firewall/iptables/iptables-1.8.7-r1.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2" # the last time. SLOT="0/1.8.3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="conntrack ipv6 netlink nftables pcap static-libs" +IUSE="conntrack netlink nftables pcap static-libs" BUILD_DEPEND=" >=app-eselect/eselect-iptables-20200508 @@ -78,12 +78,12 @@ src_configure() { --sbindir="${EPREFIX}/sbin" --libexecdir="${EPREFIX}/$(get_libdir)" --enable-devel + --enable-ipv6 --enable-shared $(use_enable nftables) $(use_enable pcap bpf-compiler) $(use_enable pcap nfsynproxy) $(use_enable static-libs static) - $(use_enable ipv6) ) econf "${myeconfargs[@]}" } @@ -104,18 +104,15 @@ src_install() { doman iptables/iptables-apply.8 insinto /usr/include - doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) + doins include/ip{,6}tables.h insinto /usr/include/iptables doins include/iptables/internal.h - keepdir /var/lib/iptables + keepdir /var/lib/ip{,6}tables newinitd "${FILESDIR}"/${PN}-r2.init iptables newconfd "${FILESDIR}"/${PN}-r1.confd iptables - if use ipv6 ; then - keepdir /var/lib/ip6tables - dosym iptables /etc/init.d/ip6tables - newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables - fi + dosym iptables /etc/init.d/ip6tables + newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables if use nftables; then # Bug 647458 @@ -125,10 +122,7 @@ src_install() { rm "${ED}"/sbin/{arptables,ebtables}{,-{save,restore}} || die fi - systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service - if use ipv6 ; then - systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service - fi + systemd_dounit "${FILESDIR}"/systemd/ip{,6}tables-{re,}store.service # Move important libs to /lib #332175 gen_usr_ldscript -a ip{4,6}tc xtables