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 91043138334 for ; Sat, 1 Sep 2018 12:33:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F959E07EA; Sat, 1 Sep 2018 12:33:00 +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 253ECE07EA for ; Sat, 1 Sep 2018 12:32:58 +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 D8E4D335C9A for ; Sat, 1 Sep 2018 12:32:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36267398 for ; Sat, 1 Sep 2018 12:32:55 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1535805131.0bf6e057a254ef89f7372c7fb8ebaa0a2dceb47c.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/iperf/files/iperf-2.0.12-ipv6.patch net-misc/iperf/iperf-2.0.12.ebuild X-VCS-Directories: net-misc/iperf/files/ net-misc/iperf/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 0bf6e057a254ef89f7372c7fb8ebaa0a2dceb47c X-VCS-Branch: master Date: Sat, 1 Sep 2018 12:32:55 +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: 23b29d4e-aa75-4fe5-8f5a-f351e3bb9875 X-Archives-Hash: f32d406825f50036d3a46f6333154978 commit: 0bf6e057a254ef89f7372c7fb8ebaa0a2dceb47c Author: Jeroen Roovers gentoo org> AuthorDate: Sat Sep 1 12:32:05 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Sep 1 12:32:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf6e057 net-misc/iperf: Fix USE=-ipv6 Fixes: https://bugs.gentoo.org/659324 Package-Manager: Portage-2.3.48, Repoman-2.3.10 net-misc/iperf/files/iperf-2.0.12-ipv6.patch | 23 +++++++++++++++++++++++ net-misc/iperf/iperf-2.0.12.ebuild | 3 +++ 2 files changed, 26 insertions(+) diff --git a/net-misc/iperf/files/iperf-2.0.12-ipv6.patch b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch new file mode 100644 index 00000000000..cd189f62108 --- /dev/null +++ b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch @@ -0,0 +1,23 @@ +--- a/src/Listener.cpp ++++ b/src/Listener.cpp +@@ -670,6 +670,7 @@ + + // Now optimize packet flow up the raw socket + // Establish the flow BPF to forward up only "connected" packets to this raw socket ++#ifdef HAVE_IPV6 + if (l->sa_family == AF_INET6) { + struct in6_addr *v6peer = SockAddr_get_in6_addr(&server->peer); + struct in6_addr *v6local = SockAddr_get_in6_addr(&server->local); +@@ -682,9 +683,12 @@ + WARN_errno( rc == SOCKET_ERROR, "l2 v4in6 connect ip bpf"); + } + } else { ++#endif + rc = SockAddr_v4_Connect_BPF(server->mSock, ((struct sockaddr_in *)(l))->sin_addr.s_addr, ((struct sockaddr_in *)(p))->sin_addr.s_addr, ((struct sockaddr_in *)(l))->sin_port, ((struct sockaddr_in *)(p))->sin_port); + WARN_errno( rc == SOCKET_ERROR, "l2 connect ip bpf"); ++#ifdef HAVE_IPV6 + } ++#endif + if (rc < 0) + return -1; + else diff --git a/net-misc/iperf/iperf-2.0.12.ebuild b/net-misc/iperf/iperf-2.0.12.ebuild index 3eab1882277..95f3d7dca14 100644 --- a/net-misc/iperf/iperf-2.0.12.ebuild +++ b/net-misc/iperf/iperf-2.0.12.ebuild @@ -13,6 +13,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86- IUSE="ipv6 threads debug" DOCS="INSTALL README" +PATCHES=( + "${FILESDIR}"/${PN}-2.0.12-ipv6.patch +) src_configure() { econf \