diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-12-05 22:26:44 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-12-06 05:00:26 -0600 |
commit | 1ef6470f15fa16c8f72467d54605096806476859 (patch) | |
tree | 25e60845d63c9ad699e442cd085e6b7fd57f6505 /pkgs/development/libraries/tsocks | |
parent | 1b26faeb6994151b8f8842f340fe4c1b820f09fb (diff) |
nixpkgs: remove tsocks
tsocks is old, and users should be using torsocks these days instead. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/development/libraries/tsocks')
-rw-r--r-- | pkgs/development/libraries/tsocks/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/tsocks/poll.patch | 26 |
2 files changed, 0 insertions, 52 deletions
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix deleted file mode 100644 index e33234304d2fa..0000000000000 --- a/pkgs/development/libraries/tsocks/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "tsocks-${version}"; - version = "1.8beta5"; - - src = fetchurl { - url = "mirror://sourceforge/tsocks/${name}.tar.gz"; - sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; - }; - - patches = [ ./poll.patch ]; - - preConfigure = '' - 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; { - description = "Transparent SOCKS v4 proxying library"; - homepage = http://tsocks.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/development/libraries/tsocks/poll.patch deleted file mode 100644 index 2bfeb9f779cad..0000000000000 --- a/pkgs/development/libraries/tsocks/poll.patch +++ /dev/null @@ -1,26 +0,0 @@ -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); - - |