From 30eb6d13f56534695076b2f159ea93569af6d14c Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Mon, 7 Apr 2014 14:01:34 -0400
Subject: [PATCH] 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).
---
autobuild.xml | 12 ++++++------
indra/cmake/Copy3rdPartyLibs.cmake | 14 +++++++++++---
indra/newview/viewer_manifest.py | 12 ++++++++----
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 5d996d5c25a..67a1dcb66d5 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1612,9 +1612,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>dc868c770e27f1c726eec60d8262d7a9</string>
+ <string>c98c1581a1ac1db72408fcce5f7409f1</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl-update/rev/285401/arch/Darwin/installer/openssl-1.0.1e-darwin-20140116.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/288774/arch/Darwin/installer/openssl-1.0.1e-darwin-20140407.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1624,9 +1624,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>8f5c220537799f81ee3f0e6da061b6b1</string>
+ <string>4caff54a0d8ea461b6f8ff32df8e0c1a</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl-update/rev/285401/arch/Linux/installer/openssl-1.0.1e-linux-20140117.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/288774/arch/Linux/installer/openssl-1.0.1e-linux-20140407.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1636,9 +1636,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>30f73c2cddf8192de6275a0ce52a23f5</string>
+ <string>da974a34c2964abf36d2817722196dc9</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl-update/rev/285401/arch/CYGWIN/installer/openssl-1.0.1e-windows-20140117.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/288774/arch/CYGWIN/installer/openssl-1.0.1e-windows-20140407.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 59564c2c1b2..f2fbc8c7757 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 a9c2ab74370..f077cd466b9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -768,13 +768,21 @@ def path_optional(src, dst):
# 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 @@ def copy_finish(self):
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
--
GitLab