Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest for

openssl on Mac (copy, deploy).  Revert Linux manifest work which tried
to work around 0555 permissions on .sos (and didn't work).

2 files changed, 19 insertions, 7 deletions

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 59564c2c1b..f2fbc8c775 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -206,6 +206,10 @@ elseif(DARWIN)
        )
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
+        libcrypto.dylib
+        libcrypto.1.0.0.dylib
+        libssl.dylib
+        libssl.1.0.0.dylib
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
@@ -213,15 +217,19 @@ elseif(DARWIN)
         libapr-1.dylib
         libaprutil-1.0.dylib
         libaprutil-1.dylib
+        libcollada14dom.dylib
+        libcrypto.dylib
+        libcrypto.1.0.0.dylib
+        libexception_handler.dylib
         libexpat.1.5.2.dylib
         libexpat.dylib
         libGLOD.dylib
+        libhunspell-1.3.0.dylib
         libllqtwebkit.dylib
         libminizip.a
         libndofdev.dylib
-        libhunspell-1.3.0.dylib
-        libexception_handler.dylib
-        libcollada14dom.dylib
+        libssl.dylib
+        libssl.1.0.0.dylib
        )
 
     if (FMODEX)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a9c2ab7437..f077cd466b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -768,13 +768,21 @@ class Darwin_i386_Manifest(ViewerManifest):
                 # dylibs that vary based on configuration
                 if self.args['configuration'].lower() == 'debug':
                     for libfile in (
+                                "libcrypto.1.0.0.dylib",
+                                "libcrypto.dylib",
                                 "libfmodexL.dylib",
+                                "libssl.1.0.0.dylib",
+                                "libssl.dylib",
                                 ):
                         dylibs += path_optional(os.path.join("../packages/lib/debug",
                                                              libfile), libfile)
                 else:
                     for libfile in (
+                                "libcrypto.1.0.0.dylib",
+                                "libcrypto.dylib",
                                 "libfmodex.dylib",
+                                "libssl.1.0.0.dylib",
+                                "libssl.dylib",
                                 ):
                         dylibs += path_optional(os.path.join("../packages/lib/release",
                                                              libfile), libfile)
@@ -1022,10 +1030,6 @@ class LinuxManifest(ViewerManifest):
     def package_finish(self):
         installer_name = self.installer_base_name()
 
-        # Some .so's are packaged without write permissions and fail during strip.  So this...
-        self.run_command(r"find %(dst)r/lib -type f -perm 0555 | xargs --no-run-if-empty chmod 0755; true"
-                         % {'dst' : self.get_dst_prefix()} )
-
         self.strip_binaries()
 
         # Fix access permissions