diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2014-10-20 11:11:16 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2014-10-20 11:11:16 +0200 |
| commit | 6639fa51d24e3383c107c96e767fbcc31d69d314 (patch) | |
| tree | 6066b210dbbe805f480754eac9b57b4c2a30ebf2 /pkgs/development/libraries/tsocks | |
| parent | 5074a95c54acffd9059971287d688f413c97cd7e (diff) | |
| download | nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar.gz nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar.bz2 nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar.lz nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar.xz nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.tar.zst nixpkgs-6639fa51d24e3383c107c96e767fbcc31d69d314.zip | |
tsocks: support poll(2) applications
Diffstat (limited to 'pkgs/development/libraries/tsocks')
| -rw-r--r-- | pkgs/development/libraries/tsocks/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/tsocks/poll.patch | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index 64e2d950613..e33234304d2 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; + patches = [ ./poll.patch ]; + preConfigure = '' sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks substituteInPlace tsocks --replace /usr $out diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/development/libraries/tsocks/poll.patch new file mode 100644 index 00000000000..2bfeb9f779c --- /dev/null +++ b/pkgs/development/libraries/tsocks/poll.patch @@ -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); + + |