MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4565 from edwtjo/tsocks-fix

Browse source 
tsocks: fixes
This commit is contained in:
Aristid Breitkreuz 2014-10-22 20:41:13 +02:00
commit 68ea5c3178
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/tsocks/default.nix
View file

@ -2,14 +2,18 @@
stdenv.mkDerivation rec {
name = "tsocks-${version}";
version = "1.8beta5";
src = fetchurl {
url = "mirror://sourceforge/tsocks/${name}.tar.gz";
sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4";
};
patches = [ ./poll.patch ];
preConfigure = ''
export configureFlags="$configureFlags --libdir=$out/lib"
sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks
substituteInPlace tsocks --replace /usr $out
export configureFlags="$configureFlags --libdir=$out/lib"
'';
meta = with stdenv.lib; {

26
pkgs/development/libraries/tsocks/poll.patch Normal file
View file

@ -0,0 +1,26 @@
From Ingo Hadan <ingo.hadan@sdm.de> Fri, 02 Apr 2010 21:08:50 +0200
From: Julien Moutinho <julm+tsocks@autogeree.net>
Date: Fri, 26 Apr 2013 01:57:26 +0200
Subject: tsocks fails if socksified application uses poll(2) (e.g. subversion-1.5)
---
diff --git a/tsocks.c b/tsocks.c
index 9cfdfff..470babd 100644
--- a/tsocks.c
+++ b/tsocks.c
@@ -657,10 +657,11 @@ int poll(POLL_SIGNATURE) {
* 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);