From f523e0c542206be9e3268f1775f9847493cdd0d6 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 8 Aug 2020 19:02:17 -0400
Subject: [PATCH] Fix ca-bundle location on linux
---
indra/llvfs/lldir_linux.cpp | 2 +-
indra/newview/viewer_manifest.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
index 80ad05345a3..528af3964c5 100644
--- a/indra/llvfs/lldir_linux.cpp
+++ b/indra/llvfs/lldir_linux.cpp
@@ -205,7 +205,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name,
LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
}
- mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
+ mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
}
U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c0170fc38c1..9d36dcfad64 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1381,7 +1381,7 @@ def construct(self):
self.path("featuretable_linux.txt")
- with self.prefix(src=pkgdir):
+ with self.prefix(src=pkgdir, dst="app_settings"):
self.path("ca-bundle.crt")
def package_finish(self):
--
GitLab