From c7721b86c6df55cbfcdb51970944b79ed8674f4e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 19 Apr 2011 21:43:13 -0400
Subject: New openssl package solves permissions problems with Linux build. The
 original Linux openssl tarball includes libcrypto.so and libssl.so files with
 r-xr-xr-x permissions: not even the owning user can modify them. This causes
 problems when the Release build tries to 'strip' the viewer and all
 associated libraries. Newer openssl tarball fixes permission problems. The
 newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix
 version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P
 Presumably the only reason this hasn't been causing trouble with TC builds is
 that the link has been picking up system libraries instead of the ones from
 the openssl package.

---
 autobuild.xml                      | 4 ++--
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 indra/newview/viewer_manifest.py   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 057ffa5b7d..d04166f72c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1242,9 +1242,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>cc159598ef3fcd34fd33a8a0ef846165</string>
+              <string>3d40be8566fa4b9df9a38e2a0f9ea467</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/223711/arch/Linux/installer/openssl-0.9.8q-linux-20110314.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/226882/arch/Linux/installer/openssl-1.0.0d-linux-20110418.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 4698116022..1c43c4ce12 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -243,7 +243,7 @@ elseif(LINUX)
         libaprutil-1.so.0
         libatk-1.0.so
         libbreakpad_client.so.0
-        libcrypto.so.0.9.8
+        libcrypto.so.1.0.0
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
@@ -259,7 +259,7 @@ elseif(LINUX)
         libtcmalloc.so
         libuuid.so.16
         libuuid.so.16.0.22
-        libssl.so.0.9.8
+        libssl.so.1.0.0
         libfontconfig.so.1.4.4
        )
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f0b1973fdf..f671c770ea 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -939,9 +939,9 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libdb-5.1.so")
             self.path("libdb-5.so")
             self.path("libdb.so")
-            self.path("libcrypto.so.0.9.8")
+            self.path("libcrypto.so.1.0.0")
             self.path("libexpat.so.1.5.2")
-            self.path("libssl.so.0.9.8")
+            self.path("libssl.so.1.0.0")
             self.path("libuuid.so")
             self.path("libuuid.so.16")
             self.path("libuuid.so.16.0.22")
-- 
cgit v1.2.3