blob: 2063327b42c55706139a9de983241c0e0ebb23e9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/bin/socksify.in dante-1.4.0/bin/socksify.in
--- dante-1.4.0.orig/bin/socksify.in 2013-10-27 08:24:41.000000000 -0700
+++ dante-1.4.0/bin/socksify.in 2014-01-05 15:04:32.495670262 -0800
@@ -53,7 +53,7 @@
exit 1
fi
-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
+#SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}"
#platform that requires full path to libdsocks?
@@ -82,8 +82,12 @@
@PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
export @PRELOAD_VARIABLE@
-LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH
+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
+# LD_PRELOAD can contain a full path to the library. Setting the
+# following breaks socksify on Linux/Alpha at least with
+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
+#LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+#export LD_LIBRARY_PATH
#SunOS 64-bit library path
if test x"@ISA64DIR@" != x; then
|
GitWeb
