Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/stunnel/patches/stunnel-4.56-32_64.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 02 Nov 2016 09:04:31 -0700
branchs11u3-sru
changeset 7236 e13b4d43a8f9
parent 2723 138732f62341
permissions -rw-r--r--
Added tag 0.175.3.14.0.5.0, S11.3SRU14.5 for changeset 11e6a3bbf713
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2723
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
# On Solaris, fix stunnel so that the linker know where both the 32 and 64 bit
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
# interposer libraries are.  If you use LD_PRELOAD with the wrong bittedness
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
# of interposer, the runtime linker hits a fatal error in trying to load
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
# mismatched ELF objects.
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
#
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
diff -r -u stunnel-4.55.orig/src/client.c stunnel-4.55/src/client.c
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
--- stunnel-4.55.orig/src/client.c	2013-02-28 00:17:58.000000000 -0800
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
+++ stunnel-4.55/src/client.c	2013-03-21 22:55:21.098479331 -0700
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
@@ -1100,9 +1100,14 @@
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
             /* just don't set these variables if getnameinfo() fails */
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
             putenv(str_printf("REMOTE_HOST=%s", host));
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
             if(c->opt->option.transparent_src) {
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
-                putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so");
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
-                /* for Tru64 _RLD_LIST is used instead */
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
+#ifdef MACH64
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
+                putenv("LD_PRELOAD_32=" LIBDIR "/libstunnel.so");
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
+                putenv("LD_PRELOAD_64=" LIBDIR "/" MACH64 "/libstunnel.so");
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
+#elif __osf /* for Tru64 _RLD_LIST is used instead */
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
                 putenv("_RLD_LIST=" LIBDIR "/libstunnel.so:DEFAULT");
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
+#else
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 
+                putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so");
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    22
 
+#endif
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    23
 
             }
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    24
 
         }
138732f62341 17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    25
upstream/oracle/userland-gate