Fix bugs 316345, 383969, 387001, 430782, 456924. Add new USE flags.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

8 files changed, 262 insertions, 19 deletions

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
index ebfcc846f1c2..58527923594c 100644
--- a/net-proxy/tsocks/ChangeLog
+++ b/net-proxy/tsocks/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-proxy/tsocks
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.42 2015/01/08 14:58:40 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.43 2015/01/09 16:59:58 bircoph Exp $
+
+*tsocks-1.8_beta5-r7 (09 Jan 2015)
+
+  09 Jan 2015; Andrew Savchenko <bircoph@gentoo.org>
+  +tsocks-1.8_beta5-r7.ebuild, +files/tsocks-1.8_beta5-flags.patch,
+  +files/tsocks-1.8_beta5-ld_preload.patch, +files/tsocks-1.8_beta5-poll.patch,
+  +files/tsocks-1.8_beta5-rename.patch, metadata.xml:
+  Fix bug 316345: patch taken from Debian bug 576301, message 15.
+  Fix bug 383969: sed tsocks.8 as proposed by Denilson Sá.
+  Fix bug 387001: segfault happend only if tordns was enabled and no
+  config file (or proper server configuration there) provided.
+  tordns requires deadpool to be initialized early, thus disable
+  tordns if server is not configured properly (new tordns patch
+  provided).
+  Fix bug 430782: respect CFLAGS during linking too.
+  Fix bug 456924: remove dirs from LD_PRELOAD as proposed by Marien Zwart.
+  Add new USE flags for built-in dns support (alternative to tordns),
+  envconf control and DNS lookups for SOCKS servers.
 
   08 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Add myself to maintainers. Update to EAPI=5.
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index 61901a6a4bca..90743e85a30e 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -2,28 +2,34 @@
 Hash: SHA256
 
 AUX tsocks-1.8_beta5-bsd.patch 932 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d SHA512 15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093 WHIRLPOOL e13fdc6fb62e8ae2b0d55f9869391a8a8127b78f26649e9c99e82b79b5f41328aa62319e738c7c3c0f4d3ee85a320d6e733f34d156ced9ebf26b61163ab0b3a2
+AUX tsocks-1.8_beta5-flags.patch 1339 SHA256 eecc072bad2d620d756b07bf4a22cb82b7afe2b8ddf1bdb691e31525ffb6b9b0 SHA512 a25acc848a7fa29479109a49147d3a1e6332fa90ed00ab5fc0c99ca546e7f7c4d9b45662ba4ece9c03cc970438d86ead79ed64c6d244d76d98d7fc8dde4060bf WHIRLPOOL ab161f58c0086ec7b22c0063f52e479f55515b959fa49578ba716b6361a8e29d508eb5bd870af773a321cec95cb5044ce081a5ff51a70e177e69661458078135
 AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca SHA512 a0cd8e282d54b1238501622f9366fd9be5d3e344e482efcb71318a066e5ba944378370436b1a3c4a1441a3005612f2889b81706ba07cc4fc6ccc26e349908212 WHIRLPOOL 044db8cc414568512772afe99104f8d88768b676d07a6677827bab1f6755fcb1578ed453c7fd5cafad42d0845f2a90888a8dd0fc96abcc3905cec967b30d1b31
+AUX tsocks-1.8_beta5-ld_preload.patch 1127 SHA256 8b6a28d3b647790464579e416694903acdcf777fbb02ac205114f73084785f15 SHA512 a202c7a2db1f0b98f6fc6bf36ab56906be7b3516726a4ae002916a91b6fc67e6630876eadfb970a91465b3526dc00249f5b9222dd90f96a1b9cdf4f2aff13e22 WHIRLPOOL 621cd32bdfb1315448ae2b021648f2ef55cbf33ba2442f8738a6533f8269587c6b8f569bd12acee352d03be9b72f650213b7ca83e6bb7f41b20a8e7bb6c12643
+AUX tsocks-1.8_beta5-poll.patch 617 SHA256 d203f3199b84749b9149f4a445cba780596c85d4f4d0452f940dd950845c147a SHA512 931a50b2c62c6fead52073dbe8287bfeda807f1c2e6ef3f9a3798cd79754e2fcd06e4d88c49bc0d748ee7a42eca3727503b2c1f261bd994b1a63e5eefac73956 WHIRLPOOL 12b2b4b5f0a2ae81bd1722168a6e589a1f868f919cb9611cdb951988a24a2ff8104e067539b7a765f2df917f9b157573ddcd94598ca85455dc0276d8a962c67b
+AUX tsocks-1.8_beta5-rename.patch 3104 SHA256 27f01ad46bb28831b3f1ba9020e61c43da175596b1bc86e7f6de40d82717dc70 SHA512 d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758 WHIRLPOOL 06cabf563446871f3e10ca4e36e71f2a15c7902dbe007bbf53dd8aaf067debac4493ee23ed738e12ca5733c0b0a0809e09388c6936664593dec90ece69a38f46
 DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
 DIST tsocks-1.8b5-tordns1-gentoo-r2.patch.gz 20043 SHA256 0f7b7d916475529c975b1bee08b848c237664089d0c453d438f32eb2708ecd9a SHA512 d141ae2405de7d3f4620fca57cb6d968eb526b96022cf8ed6e715697643e9a39ef7cd17e8f31cfa832ffe74b78cecbddc51de9d8018d4446ae6ed9e5c5844b6a WHIRLPOOL d608a9a92772458de3478f019bacb6b789fe9f02255ade84e16f1e395fb0d721389c99a30556583b7e6fa9009bf06334dd1686f9722d2b2261680628bbe05845
+DIST tsocks-1.8b5-tordns1-gentoo-r3.patch.xz 18472 SHA256 d63a3cc0c8352d466d2d31314ecfbb30d87bb3c4d27e253e7e98d03bdbd043cf SHA512 641cd859bf208f53cd63e78a60ba1123e0b5b4e1c91a3ccacef6d6707e0c4de82a9aacac0001b4b7e69c904c7776384168e0510b706834257467b936db87821d WHIRLPOOL c962ad7a026223ee63e32b3f8e406a0c861dff3222fcdefdbe88ec90bcbf984b9a34b4d6b60e1a0596b9f4f3e53369baa81c129a3bd7aa085083908adef74b6b
 DIST tsocks-1.8beta5.tar.gz 83928 SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9 WHIRLPOOL 9b50f66d63c870a37111450d76ea027fab79ecc4f62be8d6fab380f9fbfa6d1573f8bad5afe284571de3ee557460454826967449518d7665a80f563a2cfe5151
 EBUILD tsocks-1.8_beta5-r5.ebuild 1754 SHA256 3a2b570858887b864100e9c802210a6740b528c62af77303b6f6010c94b5a0d4 SHA512 9781369a8380313db5dedd119c9d8de3c07a9fc02c7cb9544d17737c227667cd30d4d26046d978d74e3752c3babd2eb39d63a20ff7702fc22124a8670135e511 WHIRLPOOL 519f13bc6a41bb5cf56af295d66c53225ac12c74cf46264ab8d05f7b744cb7f415010dd970cac50e9bc3f412ea5758899f5233ad275fdd35e67de6609d2b00ee
 EBUILD tsocks-1.8_beta5-r6.ebuild 1780 SHA256 f2b24c7bef695589653c94be25ef284c1b010acd0c4fab76bf14a57e3d416eed SHA512 8823852da2e2aa1e4a2976cc9b32621fbfba5ac25a920a63603fecea2a5b8e80af5aece7d5995fa372a5f1c2628849f750e69cf5de6b168bc5b874780789b76f WHIRLPOOL f00c6a98355c5954a5622037e034b8774d31b773895acc5f5e2fe5a5b17119152905adf70137c43935ac0e4c26955316c1b575a801d3891e1296371bf30ce467
-MISC ChangeLog 7096 SHA256 156ec92b89638072bfd576fd24e842007a278e0f43b27c5445870b7d03adfa07 SHA512 6a0911f33f25f71ba38d59a64927f7270718226b9461ef472f9a11608a4a550042066e193e8c806507edb6ef2fedbbe1c00b89c826a1c57494043a1a0cdf9198 WHIRLPOOL 13193d5894e1db3ab2d369e18ad334c3bd4a74aadde6fc8c51d3cd5020aaa49ad902532e60aa2c8f24981f787e0f2ac6adf37cccc6c024bd5a56243a7831dc05
-MISC metadata.xml 635 SHA256 fcb49f9f267904541760cde154b7c9047d643b1dfb408de88958d225e8e29dec SHA512 24e98a1890a8ca8b89097f6f394ac063d387c7bc1dabbbc426a46adf554264318b599b150e40fb14d26bbf50f3ca8c21f1c8d21a9b8411613832c7aea8db6656 WHIRLPOOL 40685a5d835d1938ca2cf3f712b8c2cf5ec4a2d6643ccf7fd947630966e25e781d48fb528d45d04b25ff4e5b9badcb8e5cf1de3e7060c86d7f278d1b94a4f9e5
+EBUILD tsocks-1.8_beta5-r7.ebuild 2183 SHA256 f593ddc0487226f796e5b67c2db334827e03e69d4ffd9e412e1bfcfa4ce714e0 SHA512 0e385c9e8245b34f0f848d490f075447221527ae0110f6af1ca862fc43f2bd390ef96d7fb521521f19c5358607f680cc89117219917f5100665cf83869560fb7 WHIRLPOOL 1868b22d66c9af481206a68235a5a2151beb97626448ef92179525b85ec7f0507ebf8c8f70e181b323bcd6c9670baa1a9f6f5cd7dd5dd490e826b03c2811a705
+MISC ChangeLog 8039 SHA256 d0dad67be378288cd55033485c58211e7f6e90a6a8fdead97d41e6cc8f63791c SHA512 00062baf93662b55fb91ba7e2fcd998a72cf74e76a59fc20071229fc063d40dff4ded909737d903f992257e85ec5144da1e57c1d9ae5201658e9d4ed6bb97134 WHIRLPOOL a298043e4575f08226df9de5e95e29028304beec828ceb8d301e1766067469f12101259914811640f2436d681c8aa6fcb3b4cc0dc5f0c6a78c33c082071b78f7
+MISC metadata.xml 865 SHA256 6c92cc38661380dd6c6861e9e2f184139979ed89c2fb769b4323a4fa7e389a14 SHA512 94122928259a21a0d34fc26bd255a194fa06a4f57ffb8ddd51bf2d8f4c705c7561cfcd66ba4ad79b3da85a29be2bce8027806379b25ec2e2f4e1ac298a29e2a7 WHIRLPOOL ecc51b18b98bfb02abf526c6ec97dd0d29380433cb10ab9679a77511287a6452eeea4685137282ef947d0230a004379571d970c283df99dedac6278b9ea42531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUrpshAAoJEFZZU7lTcnVs9v8P+wfBP56Lgy1mqQVC0b8YH1X0
-2qDUbS/MIHzmoWpfI2IaOcuErRrWFkinQhOmuVkbXGIPhyvhO8dc7F6fdMAs+v/U
-UIfAEhckBuHcuNYtk59mGR28eMQDmNNb59fX2TvrlmolrtmbP47ElHkt5Lj9+XEO
-3umXqkGUxhrmDy3A4u4luN9iYmyrrObkTklcuYB8W1rFYlnT50h8o88SHiHmU5ZR
-pEcxpNjXqdSBGxApcGwoZcMf1+Jvcfs84StqKeUe86XF5B7qRt03LZ8suzmJgI/a
-fFm8wPul9DL6EdKLEMcvIq1LZ1/66xLip3lja18G7JQigY7CRFLGDduH59NnkKCh
-LEpYBuO35TyT1Zmq3nMcOfrJ+tBwcNUqObQaLHKSnHql5S6cEUiP2XIkljiFY1aI
-VHcCzcCy5FyPxmfaqLNtWPHW7mRSyBy3FvkySfYwKiKfI6/BHsod3mVyoACqZm1h
-Xm1Ex9+YuBcxWV/ugWCCglRuPeB121GmUzomCMVQ3mrFBCjEQVqw8DD4LFpOK/DH
-7SabwWZnxTrwdddYIeSBE/9MktyziCSANSl6cDMqJNqAEOxim236Bjo8MdW2XLnN
-PH8cgui+iR599SFBXe66O96/j3bzrNGoCRNC5+fKGTV6ZQwobBRGZA6Kl2NFNLNB
-jL4UGPziOKetE1J317OX
-=Ss9n
+iQIcBAEBCAAGBQJUsAkPAAoJEFZZU7lTcnVs9UMP/iaAlkE0M3r6IzBr89YvFZqs
+6kbW4C4nKrsQ9DRu5rfp3YX1wH2DiEHzYAdFhpWyLPpKu4+KpHeayuim9FMYp9OB
+4md8OQq1w66dMTEcOqzFCw3c5Jy146WqexOBmgA0NezLYnxJYcyUfWQCdnwNQJ4Q
+MFE+CYGlI+w8DhhOlrv3SpDca+VjCI24WgJM+ugzgmgV+xzvQfK65ZIO5QsFth0l
+CYYixBeUzEZnFFusq9zreSLqOiEf/vBiW7K87ugG66Dcqf5GH6aVbzebW5yoNcs7
+P1BKeEvWqxUHpBjp6CmBkGesoCQL6Z9xOJuAp/IQyXVueKNC2SJiViNrgqyRN0w5
+TI+zDVO+tZvhqzXwKAzqn/EUAHPOIGWwCpxAjjy/QTWrVwb3lSifr0UlcbP5QNmG
+ysdnZuGfVXlt3Nyutgh8YSq6WesiNsWyER1Zvc+RLKO/VBsEm/i+maXSaWtBMjEt
+M55xk1GChjavXBz2DUweokMyHVrmYFlc8NIAc8mDm3f8tAwhQ7EBSRTJ1gbajvhK
+saehYGH66Z8BWZnJ0IqXC7IzSVB08IPhz+yDKw5m+nGLTP5arHqg8zssBpsD6mX3
+vwHpiMiGfvO1zgHFWqWVYL2VviywbTcx+Za0FxIqcUtsnO/Y7ZS4u30ejjqSF6TA
+RYEfuJ0R19YRhf/B82gd
+=6RUh
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-flags.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-flags.patch
new file mode 100644
index 000000000000..70d8786c196b
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-flags.patch
@@ -0,0 +1,31 @@
+--- tsocks-1.8.orig/Makefile.in	2002-03-16 11:12:40.000000000 +0100
++++ tsocks-1.8/Makefile.in	2009-06-20 13:56:56.000000000 +0200
+@@ -28,6 +28,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ INCLUDES = -I.
+ LIBS = @LIBS@
+ SPECIALLIBS = @SPECIALLIBS@
+@@ -41,16 +42,16 @@
+ all: ${TARGETS}
+ 
+ ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
++	${SHCC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
+ 
+ ${INSPECT}: ${INSPECT}.c ${COMMON}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
++	${SHCC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
+ 
+ ${SAVE}: ${SAVE}.c
+-	${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
++	${SHCC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c
+ 
+ ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
++	${SHCC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
+ 	ln -sf ${SHLIB} ${LIB_NAME}.so
+ 
+ %.so: %.c
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch
new file mode 100644
index 000000000000..360e5b297fb6
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch
@@ -0,0 +1,35 @@
+--- tsocks-1.8.orig/tsocks	2002-03-16 11:27:18.000000000 +0100
++++ tsocks-1.8/tsocks	2009-06-20 13:56:38.000000000 +0200
+@@ -46,14 +46,14 @@
+ 	on)
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+-				export LD_PRELOAD="/usr/lib/libtsocks.so"
++				export LD_PRELOAD="libtsocks.so"
+ 			else
+-				echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-				export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++				echo $LD_PRELOAD | grep -q "libtsocks\.so" || \
++				export LD_PRELOAD="libtsocks.so $LD_PRELOAD"
+ 		fi
+ 	;;
+ 	off)
+-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
++		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/libtsocks.so \?//'`
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+ 				unset LD_PRELOAD
+@@ -68,10 +68,10 @@
+ 	*)
+ 		if [ -z "$LD_PRELOAD" ]
+ 		then
+-			export LD_PRELOAD="/usr/lib/libtsocks.so"
++			export LD_PRELOAD="libtsocks.so"
+ 		else
+-			echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-			export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++			echo $LD_PRELOAD | grep -q "libtsocks\.so" || \
++			export LD_PRELOAD="libtsocks.so $LD_PRELOAD"
+ 		fi
+ 
+ 		if [ $# = 0 ]
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 000000000000..233539564c61
--- /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/files/tsocks-1.8_beta5-rename.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-rename.patch
new file mode 100644
index 000000000000..4962aacd6801
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-rename.patch
@@ -0,0 +1,62 @@
+--- tsocks-1.8.orig/validateconf.c	2002-02-07 11:49:59.000000000 +0100
++++ tsocks-1.8/validateconf.c	2009-06-20 13:56:38.000000000 +0200
+@@ -23,7 +23,7 @@
+ */
+ 
+ /* Global configuration variables */ 
+-char *progname = "validateconf";	      /* Name for error msgs      */
++char *progname = "tsocks-validateconf";	      /* Name for error msgs      */
+ 
+ /* Header Files */
+ #include <config.h>
+--- tsocks-1.8.orig/tsocks.8	2002-03-16 11:20:51.000000000 +0100
++++ tsocks-1.8/tsocks.8	2009-06-20 13:56:38.000000000 +0200
+@@ -127,8 +127,8 @@
+ libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the
+ full path to the library in this file if you do this. If you get it wrong,
+ you will be UNABLE TO DO ANYTHING with the machine and will have to boot
+-it with a rescue disk and remove the file (or try the saveme program, see
+-the INSTALL file for more info).  THIS IS A ***WARNING***, please be
++it with a rescue disk and remove the file (or try the tsocks-saveme program,
++simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be
+ careful. Also be sure the library is in the root filesystem as all hell
+ will break loose if the directory it is in is not available at boot time.
+ 
+--- tsocks-1.8.orig/tsocks.conf.5	2002-05-18 04:13:08.000000000 +0200
++++ tsocks-1.8/tsocks.conf.5	2009-06-20 13:56:38.000000000 +0200
+@@ -139,21 +139,20 @@
+ the version that server supports. 
+ 
+ .TP
+-validateconf
+-validateconf can be used to verify the configuration file. It checks the format
+-of the file and also the contents for errors. Having read the file it dumps 
+-the configuration to the screen in a formatted, readable manner. This can be 
+-extremely useful in debugging problems.
+-
+-validateconf can read a configuration file from a location other than the 
+-location specified at compile time with the -f <filename> command line 
+-option.
+-
+-Normally validateconf simply dumps the configuration read to the screen (in
+-a nicely readable format), however it also has a useful 'test' mode. When
+-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf 
+-determines which of the SOCKS servers specified in the configuration file 
+-would be used by tsocks to access the specified host. 
++tsocks-validateconf
++tsocks-validateconf can be used to verify the configuration file. It checks
++the format of the file and also the contents for errors. Having read the file 
++it dumps the configuration to the screen in a formatted, readable manner.
++This can be extremely useful in debugging problems.
++
++tsocks-validateconf can read a configuration file from a location other than the 
++location specified at compile time with the -f <filename> command line option.
++
++Normally tsocks-validateconf simply dumps the configuration read to the screen 
++(in a nicely readable format), however it also has a useful 'test' mode. When
++passed a hostname/ip on the command line like -t <hostname/ip>, 
++tsocks-validateconf determines which of the SOCKS servers specified in the 
++configuration file would be used by tsocks to access the specified host. 
+ 
+ .SH SEE ALSO
+ tsocks(8)
diff --git a/net-proxy/tsocks/metadata.xml b/net-proxy/tsocks/metadata.xml
index 0865cab7f424..ff7c93760d69 100644
--- a/net-proxy/tsocks/metadata.xml
+++ b/net-proxy/tsocks/metadata.xml
@@ -8,8 +8,9 @@
 without any modification. It does this by intercepting the calls that applications make to establish network connections 
 and negotating them through a SOCKS server as necessary.</longdescription>
 <use>
-	<flag name='tordns'>
-		Apply tordns patch which allows transparent TORification of the DNS queries
-	</flag>
+	<flag name='dns'>Force DNS queries to use SOCKS server via tcp</flag>
+	<flag name='envconf'>Allow TSOCKS_CONF_FILE to specify configuration file</flag>
+	<flag name='server-lookups'>Allow hostname resolution _for_ SOCKS servers</flag>
+	<flag name='tordns'>Apply tordns patch which allows transparent TORification of the DNS queries</flag>
 </use>
 </pkgmetadata>
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
new file mode 100644
index 000000000000..898c0c8f9711
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild,v 1.1 2015/01/09 16:59:58 bircoph Exp $
+
+EAPI="5"
+
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( http://dev.gentoo.org/~bircoph/patches/${PN}-${PV/_beta/b}-tordns1-gentoo-r3.patch.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dns envconf tordns server-lookups"
+
+REQUIRED_USE="
+	dns? ( !tordns !server-lookups )
+	tordns? ( !dns !server-lookups )
+"
+
+S="${WORKDIR}/${P%%_*}"
+
+src_prepare() {
+	epatch \
+	"${FILESDIR}/${P}-flags.patch" \
+	"${FILESDIR}/${P}-ld_preload.patch" \
+	"${FILESDIR}/${P}-rename.patch" \
+	"${FILESDIR}/${P}-bsd.patch" \
+	"${FILESDIR}/${P}-poll.patch"
+	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r3.patch"
+
+	sed -i 's/TSOCKS_CONFFILE/TSOCKS_CONF_FILE/' tsocks.8 || die "sed tsocks.8 failed"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
+	econf \
+		$(use_enable dns socksdns) \
+		$(use_enable envconf) \
+		$(use_enable server-lookups hostnames) \
+		--with-conf=/etc/socks/tsocks.conf \
+		--libdir=/$(get_libdir)
+}
+
+src_compile() {
+	# Fix QA notice lack of SONAME
+	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbin validateconf tsocks-validateconf
+	newbin saveme tsocks-saveme
+	dobin inspectsocks
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	dodoc FAQ
+	use tordns && dodoc README*
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+	einfo "The following executables have been renamed:"
+	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
+	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
+}