commit:     2da88cead278fa530e9306e6fa1eaa0e3ee33892
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan  9 02:50:34 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan  9 02:50:34 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=2da88cea

Fix bug 456924: remove dirs from LD_PRELOAD

---
 net-proxy/tsocks/Manifest                                |  2 +-
 net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index d151a1a..a4d9de5 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -1,6 +1,6 @@
 AUX tsocks-1.8_beta5-bsd.patch 932 SHA256 
c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d SHA512 
15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093
 WHIRLPOOL 
e13fdc6fb62e8ae2b0d55f9869391a8a8127b78f26649e9c99e82b79b5f41328aa62319e738c7c3c0f4d3ee85a320d6e733f34d156ced9ebf26b61163ab0b3a2
 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-ld_preload.patch 1127 SHA256 
8b6a28d3b647790464579e416694903acdcf777fbb02ac205114f73084785f15 SHA512 
a202c7a2db1f0b98f6fc6bf36ab56906be7b3516726a4ae002916a91b6fc67e6630876eadfb970a91465b3526dc00249f5b9222dd90f96a1b9cdf4f2aff13e22
 WHIRLPOOL 
621cd32bdfb1315448ae2b021648f2ef55cbf33ba2442f8738a6533f8269587c6b8f569bd12acee352d03be9b72f650213b7ca83e6bb7f41b20a8e7bb6c12643
 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

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
index b87a838..360e5b2 100644
--- a/net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-ld_preload.patch
@@ -5,17 +5,17 @@
                if [ -z "$LD_PRELOAD" ]
                        then
 -                              export LD_PRELOAD="/usr/lib/libtsocks.so"
-+                              export LD_PRELOAD="/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 "/lib/libtsocks\.so" 
|| \
-+                              export LD_PRELOAD="/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/\/lib\/libtsocks.so \?//'`
++              export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/libtsocks.so 
\?//'`
                if [ -z "$LD_PRELOAD" ]
                        then
                                unset LD_PRELOAD
@@ -24,12 +24,12 @@
                if [ -z "$LD_PRELOAD" ]
                then
 -                      export LD_PRELOAD="/usr/lib/libtsocks.so"
-+                      export LD_PRELOAD="/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 "/lib/libtsocks\.so" || \
-+                      export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
++                      echo $LD_PRELOAD | grep -q "libtsocks\.so" || \
++                      export LD_PRELOAD="libtsocks.so $LD_PRELOAD"
                fi
  
                if [ $# = 0 ]

Reply via email to