diff options
| -rw-r--r-- | autobuild.xml | 6 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 | 
3 files changed, 7 insertions, 7 deletions
| diff --git a/autobuild.xml b/autobuild.xml index cdc724f571..02da077faa 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1258,7 +1258,7 @@          <key>license</key>          <string>openSSL</string>          <key>license_file</key> -        <string>LICENSES/openSSL.txt</string> +        <string>LICENSES/openssl.txt</string>          <key>name</key>          <string>openSSL</string>          <key>platforms</key> @@ -1280,9 +1280,9 @@              <key>archive</key>              <map>                <key>hash</key> -              <string>511cf1c200efe587552b8225dd361dbb</string> +              <string>cc159598ef3fcd34fd33a8a0ef846165</string>                <key>url</key> -              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20100930.tar.bz2</string> +              <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>              </map>              <key>name</key>              <string>linux</string> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c942fafabd..f1584ff0c4 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -244,7 +244,7 @@ elseif(LINUX)          libaprutil-1.so.0          libatk-1.0.so          libbreakpad_client.so.0 -        libcrypto.so.0.9.7 +        libcrypto.so.0.9.8          libdb-5.1.so          libexpat.so          libexpat.so.1 @@ -260,7 +260,7 @@ elseif(LINUX)          libstacktrace.so          libtcmalloc.so          libuuid.so.1 -        libssl.so.0.9.7 +        libssl.so.0.9.8          libfontconfig.so.1.4.4         ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 229055fdb7..addaafa494 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -935,9 +935,9 @@ class Linux_i686Manifest(LinuxManifest):              self.path("libaprutil-1.so.0.3.10")              self.path("libbreakpad_client.so.0.0.0")              self.path("libdb-5.1.so") -            self.path("libcrypto.so.0.9.7") +            self.path("libcrypto.so.0.9.8")              self.path("libexpat.so.1.5.2") -            self.path("libssl.so.0.9.7") +            self.path("libssl.so.0.9.8")              self.path("libuuid.so.1")              self.path("libSDL-1.2.so.0.11.3")              self.path("libdirectfb-1.4.so.5.0.4") | 
