author | David Marx <David.M.Marx@Oracle.Com> |
Mon, 22 Apr 2013 15:08:53 -0700 | |
changeset 1279 | ff655280d936 |
parent 1252 | 86b53be32d7c |
permissions | -rw-r--r-- |
1252
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
1 |
# On Solaris, fix stunnel so that the linker know where both the 32 and 64 bit |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
2 |
# interposer libraries are. If you use LD_PRELOAD with the wrong bittedness |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
3 |
# of interposer, the runtime linker hits a fatal error in trying to load |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
4 |
# mismatched ELF objects. |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
5 |
# |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
diff -r -u stunnel-4.55.orig/src/client.c stunnel-4.55/src/client.c |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
--- stunnel-4.55.orig/src/client.c 2013-02-28 00:17:58.000000000 -0800 |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ stunnel-4.55/src/client.c 2013-03-21 22:55:21.098479331 -0700 |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -1100,9 +1100,14 @@ |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
10 |
/* just don't set these variables if getnameinfo() fails */ |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
11 |
putenv(str_printf("REMOTE_HOST=%s", host)); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
12 |
if(c->opt->option.transparent_src) { |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
13 |
- putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so"); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
14 |
- /* for Tru64 _RLD_LIST is used instead */ |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
15 |
+#ifdef MACH64 |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
16 |
+ putenv("LD_PRELOAD_32=" LIBDIR "/libstunnel.so"); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
17 |
+ putenv("LD_PRELOAD_64=" LIBDIR "/" MACH64 "/libstunnel.so"); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
18 |
+#elif __osf /* for Tru64 _RLD_LIST is used instead */ |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
19 |
putenv("_RLD_LIST=" LIBDIR "/libstunnel.so:DEFAULT"); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
20 |
+#else |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
21 |
+ putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so"); |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
22 |
+#endif |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
23 |
} |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
24 |
} |
86b53be32d7c
16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
25 |