commit: e2138e6cca1a91117dfb824a5bfc4d2e4d4d457e
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan 9 02:21:13 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan 9 02:21:13 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=e2138e6c
Split gentoo patch to logically separate segments. Cosmetics
---
net-proxy/tsocks/Manifest | 20 ++---
.../tsocks/files/tsocks-1.8_beta5-flags.patch | 31 ++++++++
.../tsocks/files/tsocks-1.8_beta5-ld_preload.patch | 35 +++++++++
...ntoo-r3.patch => tsocks-1.8_beta5-rename.patch} | 89 +++-------------------
net-proxy/tsocks/metadata.xml | 4 +-
net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild | 21 ++---
6 files changed, 95 insertions(+), 105 deletions(-)
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index 36d44d6..d151a1a 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX tsocks-1.8_beta5-bsd.patch 932 SHA256
c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d SHA512
15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093
WHIRLPOOL
e13fdc6fb62e8ae2b0d55f9869391a8a8127b78f26649e9c99e82b79b5f41328aa62319e738c7c3c0f4d3ee85a320d6e733f34d156ced9ebf26b61163ab0b3a2
-AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 SHA256
5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca SHA512
a0cd8e282d54b1238501622f9366fd9be5d3e344e482efcb71318a066e5ba944378370436b1a3c4a1441a3005612f2889b81706ba07cc4fc6ccc26e349908212
WHIRLPOOL
044db8cc414568512772afe99104f8d88768b676d07a6677827bab1f6755fcb1578ed453c7fd5cafad42d0845f2a90888a8dd0fc96abcc3905cec967b30d1b31
-DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 SHA256
d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
+AUX tsocks-1.8_beta5-flags.patch 1299 SHA256
d39976b2f0d4e7209b787f433ec19ee1d25a3624f79cc3156e925204171eda59 SHA512
2b270a2163e9e5a7ab3939b7cdb71418bef8368f51e94d95995db7716a3924b10f379ef8cbdaaff1aed09fd53f5cd292f73fba15c7201327339d9d09b7a29089
WHIRLPOOL
e071b320047c31e02872ed1df247d9a70968f6cc3f9f8d2ed1974791c8b64e7531b30a1525076dbd62bd8f0301fff5276ae6b4b6a908ede83ec0ca667b6a3836
+AUX tsocks-1.8_beta5-ld_preload.patch 1164 SHA256
69a06e8034ab97eb7f81de3eb0799be552342464a155b156c2d3cd5dbe76d24d SHA512
bace98302a9ac920040806771a5cea6786103ca9eab4ae0f6a316e4611d79ce1a9b9fa1b815bf1ab1ce268aa780ec295f95c7913d184b6baaa40c935cc3d374b
WHIRLPOOL
5656cc3f18ad80e144af4ec2cc21807cf79c50079e1520e08d41f27ec895c54deeed48629b5a463c19a5c6721b977ad7bd0a3dc6862a23eae80e6c1ea2b4e2e8
+AUX tsocks-1.8_beta5-rename.patch 3104 SHA256
27f01ad46bb28831b3f1ba9020e61c43da175596b1bc86e7f6de40d82717dc70 SHA512
d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758
WHIRLPOOL
06cabf563446871f3e10ca4e36e71f2a15c7902dbe007bbf53dd8aaf067debac4493ee23ed738e12ca5733c0b0a0809e09388c6936664593dec90ece69a38f46
DIST tsocks-1.8b5-tordns1-gentoo-r2.patch.gz 20043 SHA256
0f7b7d916475529c975b1bee08b848c237664089d0c453d438f32eb2708ecd9a SHA512
d141ae2405de7d3f4620fca57cb6d968eb526b96022cf8ed6e715697643e9a39ef7cd17e8f31cfa832ffe74b78cecbddc51de9d8018d4446ae6ed9e5c5844b6a
WHIRLPOOL
d608a9a92772458de3478f019bacb6b789fe9f02255ade84e16f1e395fb0d721389c99a30556583b7e6fa9009bf06334dd1686f9722d2b2261680628bbe05845
DIST tsocks-1.8beta5.tar.gz 83928 SHA256
849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 SHA512
b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9
WHIRLPOOL
9b50f66d63c870a37111450d76ea027fab79ecc4f62be8d6fab380f9fbfa6d1573f8bad5afe284571de3ee557460454826967449518d7665a80f563a2cfe5151
-EBUILD tsocks-1.8_beta5-r5.ebuild 1831 SHA256
afde50f512ce37d403a83a82fd9dcbb46b0fb99e07291fdb66e4363833c3163a SHA512
c22d2bd78d7d0a10ee5eb8734183e69120a10d71ec0ead934d1630482e385809a68b5e5aaa7d0d1934644bbaf05f6e87ee64a0b558ae6f2728ecdfd2db799db1
WHIRLPOOL
53bf9b946e976c326124f0eaa325aaeb5b37b109c1833fceb2ec02be8ab44525d03157070a006a267b7a7e0cf51e395e08e19bd27db69b7312f11e83544bd214
-EBUILD tsocks-1.8_beta5-r6.ebuild 1855 SHA256
6991aea50dba89122ecb6265062b1a3d7bdd6674bb6bb689c61d7a2be274037f SHA512
a4af87487100c0c6178f4fa7c2d535c51598d1b53f2648cdd7232a6a4703328cc499155c601b427dfc6d0e10d05a112b169b902eb3dc28b69df72d98a775ce8c
WHIRLPOOL
69473b8c3cf60459c3bada3b381fe5c1e84379ea5e5f6eda17ec7a8d80efd93dd4236f7d87ea5aac937aadea64749fab4a898a1078fe62c9561ccf9f92cc179f
+EBUILD tsocks-1.8_beta5-r7.ebuild 1848 SHA256
0a8c5a6dfc2b9f1c5c7bc0143de085d256bbe4231bc32cda7a84894b48861ae6 SHA512
4b8fc2b4fb0443ac70ea065aa0c1be83636e5f4fbb9039d3f832a304e5f20fd6da3722abb6aa00beeed1071e55bf9a28d15ba7fda18fe2934077a955d3a24923
WHIRLPOOL
9299b0e885b5b47e5700f995add3128cd99320f1cbd78b8521568f7fb6ebc7ff3b7aa0d3e26d582ef95d45a31d9a4f14dff2b5fff7764f65913268567de86395
MISC ChangeLog 6979 SHA256
34a98843c578bf3491e74aee2d629354bae71ca00dec888c433614847b828e6e SHA512
4f1e8ac15b41d977374905264d524d596415ee4d214cd128c0dd5cbc081636171bcb1a525bf7e1fd85942ad56ad646c0da622dd3e7b33d5761781f851991f097
WHIRLPOOL
2a978b823bcc7cfb390729fa63a68c0b4b010d6a1424d9cf21e4e20293885a7ce8bb714d41a567803d13aad71379868d7af27a5e67085bbee4cc9fed27e9b058
-MISC metadata.xml 639 SHA256
f169d4d868162eb3e8c7f729b9cf3f705f316370f0074465a2f2431cb9910b30 SHA512
bb842e83602820694ec8648a3ad2591fa9f90ffa88d9be972cfcc1118172ce36dd9ea98090f126938390f6f9666142994c82f845c1eea1b75cbaeeb211b23fed
WHIRLPOOL
06c8e41728064c058a6985ccf48fc2f47fb02da74a5989779656565cff43e81d2bcca1127d89a3cdd973700c0e1828e6488e568f50f5c13930bf1e5aa3a9e4b2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlStPQIACgkQCaWpQKGI+9SB1ACfbEfcquLn8zTXDRTB9+VZJOpk
-z/wAnjJjASyFXcEwX+iuLztofLmOZRFa
-=TLT9
------END PGP SIGNATURE-----
+MISC metadata.xml 635 SHA256
fcb49f9f267904541760cde154b7c9047d643b1dfb408de88958d225e8e29dec SHA512
24e98a1890a8ca8b89097f6f394ac063d387c7bc1dabbbc426a46adf554264318b599b150e40fb14d26bbf50f3ca8c21f1c8d21a9b8411613832c7aea8db6656
WHIRLPOOL
40685a5d835d1938ca2cf3f712b8c2cf5ec4a2d6643ccf7fd947630966e25e781d48fb528d45d04b25ff4e5b9badcb8e5cf1de3e7060c86d7f278d1b94a4f9e5
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 0000000..2eafcf5
--- /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} ${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} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o
${LIBS}
+
+ ${SAVE}: ${SAVE}.c
+- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
++ ${SHCC} ${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} ${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 0000000..b87a838
--- /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="/lib/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 "/lib/libtsocks\.so"
|| \
++ export LD_PRELOAD="/lib/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/\/lib\/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="/lib/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 "/lib/libtsocks\.so" || \
++ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
+ fi
+
+ if [ $# = 0 ]
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
b/net-proxy/tsocks/files/tsocks-1.8_beta5-rename.patch
similarity index 52%
rename from net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
rename to net-proxy/tsocks/files/tsocks-1.8_beta5-rename.patch
index 1c9dd18..4962aac 100644
--- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-rename.patch
@@ -1,72 +1,14 @@
-diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
---- 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} ${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} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o
${LIBS}
-
- ${SAVE}: ${SAVE}.c
-- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
-+ ${SHCC} ${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} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS}
${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
- ln -sf ${SHLIB} ${LIB_NAME}.so
+--- 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 @@
+ */
- %.so: %.c
-diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
---- 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="/lib/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 "/lib/libtsocks\.so"
|| \
-+ export LD_PRELOAD="/lib/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/\/lib\/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="/lib/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 "/lib/libtsocks\.so" || \
-+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
- fi
+ /* Global configuration variables */
+-char *progname = "validateconf"; /* Name for error msgs */
++char *progname = "tsocks-validateconf"; /* Name for error msgs
*/
- if [ $# = 0 ]
-diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
+ /* 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 @@
@@ -80,7 +22,6 @@ diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
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.
-diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
--- 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 @@
@@ -119,15 +60,3 @@ diff -Nru tsocks-1.8.orig/tsocks.conf.5
tsocks-1.8/tsocks.conf.5
.SH SEE ALSO
tsocks(8)
-diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
---- 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>
diff --git a/net-proxy/tsocks/metadata.xml b/net-proxy/tsocks/metadata.xml
index 5b428c0..0865cab 100644
--- a/net-proxy/tsocks/metadata.xml
+++ b/net-proxy/tsocks/metadata.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<maintainer><email>maintainer-nee...@gentoo.org</email></maintainer>
+<maintainer>
+ <email>birc...@gentoo.org</email>
+</maintainer>
<longdescription>tsocks' role is to allow non SOCKS aware applications (e.g
telnet, ssh, ftp etc) to use SOCKS
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>
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
index 9c926e8..8b2c2c1 100644
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r6.ebuild,v 1.1
2011/11/19 16:24:03 naota Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild,v 1.2
2015/01/08 14:58:40 bircoph Exp $
-EAPI="2"
+EAPI="5"
-inherit multilib eutils autotools toolchain-funcs
+inherit autotools eutils multilib toolchain-funcs
DESCRIPTION="Transparent SOCKS v4 proxying library"
HOMEPAGE="http://tsocks.sourceforge.net/";
@@ -19,8 +19,11 @@ IUSE="tordns"
S="${WORKDIR}/${P%%_*}"
src_prepare() {
- epatch "${FILESDIR}/${P}-gentoo-r3.patch"
- epatch "${FILESDIR}/${P}-bsd.patch"
+ epatch \
+ "${FILESDIR}/${P}-flags.patch" \
+ "${FILESDIR}/${P}-ld_preload.patch" \
+ "${FILESDIR}/${P}-rename.patch" \
+ "${FILESDIR}/${P}-bsd.patch"
use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch"
eautoreconf
}
@@ -33,16 +36,16 @@ src_configure() {
# mounted in time :-( (Ben Lutgens) <la...@gentoo.org>
econf \
--with-conf=/etc/socks/tsocks.conf \
- --libdir=/$(get_libdir) || die "configure failed"
+ --libdir=/$(get_libdir)
}
src_compile() {
# Fix QA notice lack of SONAME
- emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} || die "emake
failed"
+ emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*}
}
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
newbin validateconf tsocks-validateconf
newbin saveme tsocks-saveme
dobin inspectsocks
