diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-21 17:14:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-21 17:14:07 -0400 |
| commit | 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 (patch) | |
| tree | f837807b536834f0a1df97d84309a7d5d0f7cb90 /indra/newview/viewer_manifest.py | |
| parent | 9260fbe0bd4db438632e9f174112b4ed853fa2a0 (diff) | |
SL-429: Use a new certificate authority bundle based on data from Mozilla
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1c77cf805e..7625f977e3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -63,7 +63,6 @@ class ViewerManifest(LLManifest): if self.prefix(src="app_settings"): self.exclude("logcontrol.xml") self.exclude("logcontrol-dev.xml") - self.path("*.pem") self.path("*.ini") self.path("*.xml") self.path("*.db2") @@ -85,11 +84,11 @@ class ViewerManifest(LLManifest): pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') if self.prefix(src=pkgdir,dst=""): self.path("dictionaries") + self.path("ca-bundle.crt") self.end_prefix(pkgdir) # include the extracted packages information (see BuildPackagesInfo.cmake) self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt") - # CHOP-955: If we have "sourceid" or "viewer_channel" in the # build process environment, generate it into # settings_install.xml. @@ -402,7 +401,6 @@ class Windows_i686_Manifest(ViewerManifest): self.path("ortp.dll") self.path("libsndfile-1.dll") self.path("vivoxoal.dll") - self.path("ca-bundle.crt") # Security self.path("ssleay32.dll") @@ -787,7 +785,6 @@ class Darwin_i386_Manifest(ViewerManifest): 'libvivoxoal.dylib', 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', - 'ca-bundle.crt', 'SLVoice', ): self.path2basename(relpkgdir, libfile) |