From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5C688138A1A for ; Fri, 9 Jan 2015 03:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16A0AE07FC; Fri, 9 Jan 2015 03:27:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2ACC4E07FC for ; Fri, 9 Jan 2015 03:27:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8F4E340776 for ; Fri, 9 Jan 2015 03:27:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EAC4F2D0 for ; Fri, 9 Jan 2015 03:27:39 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1420773403.2dfef62156839f0e9bb959ae441ddf090d5fc980.bircoph@gentoo> Subject: [gentoo-commits] dev/bircoph:master commit in: net-proxy/tsocks/, net-proxy/tsocks/files/ X-VCS-Repository: dev/bircoph X-VCS-Files: net-proxy/tsocks/files/tsocks-1.8_beta5-poll.patch net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild X-VCS-Directories: net-proxy/tsocks/files/ net-proxy/tsocks/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 2dfef62156839f0e9bb959ae441ddf090d5fc980 X-VCS-Branch: master Date: Fri, 9 Jan 2015 03:27:39 +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: 6dd65a46-3476-4450-97d1-972256652ade X-Archives-Hash: 2d41d3f2357f72f276364d3ddbef20b1 commit: 2dfef62156839f0e9bb959ae441ddf090d5fc980 Author: Andrew Savchenko gmail com> AuthorDate: Fri Jan 9 03:16:43 2015 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Fri Jan 9 03:16:43 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=2dfef621 tsocks: fix bug 316345 Fix support for applications usin poll() --- net-proxy/tsocks/files/tsocks-1.8_beta5-poll.patch | 16 ++++++++++++++++ net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-poll.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-poll.patch new file mode 100644 index 0000000..2335395 --- /dev/null +++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-poll.patch @@ -0,0 +1,16 @@ +--- a/tsocks.c ++++ b/tsocks.c +@@ -659,10 +659,11 @@ + * be ready for writing), otherwise we'll just let the select loop + * come around again (since we can't flag it for read, we don't know + * if there is any data to be read and can't be bothered checking) */ +- if (conn->selectevents & WRITE) { +- setevents |= POLLOUT; ++ if (conn->selectevents & POLLOUT) { ++ ufds[i].revents |= POLLOUT; + nevents++; + } ++ ufds[i].events = conn->selectevents; + } + } + } while (nevents == 0); diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild index 8b2c2c1..949c1a0 100644 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild +++ b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild @@ -23,7 +23,8 @@ src_prepare() { "${FILESDIR}/${P}-flags.patch" \ "${FILESDIR}/${P}-ld_preload.patch" \ "${FILESDIR}/${P}-rename.patch" \ - "${FILESDIR}/${P}-bsd.patch" + "${FILESDIR}/${P}-bsd.patch" \ + "${FILESDIR}/${P}-poll.patch" use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch" eautoreconf }