[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6ba5dd341b9b2304de1478fece9ed25a4b15483c (commit)
       via  d9dc3e1d28716bd0b6308404d57ce18892d3d38c (commit)
      from  3ba84717a0ac76785935efcca50ab80e1e2f5564 (commit)


- Log -----------------------------------------------------------------
commit 6ba5dd341b9b2304de1478fece9ed25a4b15483c
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 18 00:11:18 2016 +0100

    Fix spelling
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d9dc3e1d28716bd0b6308404d57ce18892d3d38c
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 18 00:07:54 2016 +0100

    Add -lresolv to the Solaris ex_libs
    
    The reason is that we use hstrerror() and other resolver functions.
    
    Reporter: Erik Forsberg <erik at efca.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e07b926..840061f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -35,11 +35,11 @@
         shared_extension => ".so",
     },
 
-#### Solaros configirations
+#### Solaros configurations
     "solaris-common" => {
         template         => 1,
         cflags           => "-DFILIO_H",
-        ex_libs          => "-lsocket -lnsl -ldl",
+        ex_libs          => "-lresolv -lsocket -lnsl -ldl",
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",