From 91743a9dfaf5d1e578ceaf5dd28e7735168f05a4 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 31 Jan 2022 18:07:42 -0500 Subject: SL-13792: Use new Python 3 SLVersionChecker. On Mac, execute the packaged SLVersionChecker directly rather than invoking system Python on our manually-bundled scripts. --- autobuild.xml | 10 ++--- indra/newview/llappviewer.cpp | 86 +++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 49 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bb7cc27233..c63af06197 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a3c8357a2f5a62cd7de43181b02553bc + 3e2575f21d79326020756dbc5911a97f url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/91396/829032/viewer_manager-2.0.566227-darwin64-566227.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93900/844736/viewer_manager-3.0.567953-darwin64-567953.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0654b449d9bdf3507664cf5caa67336f + a8652b97e25bce215daf10c7465af5f7 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/91397/829041/viewer_manager-2.0.566227-windows-566227.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93901/844743/viewer_manager-3.0.567953-windows-567953.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.566227 + 3.0.567953 vlc-bin diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c9d852686e..b36012e221 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1177,43 +1177,41 @@ bool LLAppViewer::init() #if LL_RELEASE_FOR_DOWNLOAD if (!gSavedSettings.getBOOL("CmdLineSkipUpdater")) { - LLProcess::Params updater; - updater.desc = "updater process"; - // Because it's the updater, it MUST persist beyond the lifespan of the - // viewer itself. - updater.autokill = false; - std::string updater_file; + LLProcess::Params updater; + updater.desc = "updater process"; + // Because it's the updater, it MUST persist beyond the lifespan of the + // viewer itself. + updater.autokill = false; + std::string updater_file; #if LL_WINDOWS - updater_file = "SLVersionChecker.exe"; - updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, updater_file); + updater_file = "SLVersionChecker.exe"; + updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, updater_file); #elif LL_DARWIN - // explicitly run the system Python interpreter on SLVersionChecker.py - updater.executable = "python"; - updater_file = "SLVersionChecker.py"; - updater.args.add(gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", updater_file)); + updater_file = "SLVersionChecker"; + updater.executable = gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", updater_file); #else - updater_file = "SLVersionChecker"; - updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, updater_file); + updater_file = "SLVersionChecker"; + updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, updater_file); #endif - // add LEAP mode command-line argument to whichever of these we selected - updater.args.add("leap"); - // UpdaterServiceSettings - if (gSavedSettings.getBOOL("FirstLoginThisInstall")) - { - // Befor first login, treat this as 'manual' updates, - // updater won't install anything, but required updates - updater.args.add("0"); - } - else - { - updater.args.add(stringize(gSavedSettings.getU32("UpdaterServiceSetting"))); - } - // channel - updater.args.add(LLVersionInfo::instance().getChannel()); - // testok - updater.args.add(stringize(gSavedSettings.getBOOL("UpdaterWillingToTest"))); - // ForceAddressSize - updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize"))); + // add LEAP mode command-line argument to whichever of these we selected + updater.args.add("leap"); + // UpdaterServiceSettings + if (gSavedSettings.getBOOL("FirstLoginThisInstall")) + { + // Befor first login, treat this as 'manual' updates, + // updater won't install anything, but required updates + updater.args.add("0"); + } + else + { + updater.args.add(stringize(gSavedSettings.getU32("UpdaterServiceSetting"))); + } + // channel + updater.args.add(LLVersionInfo::instance().getChannel()); + // testok + updater.args.add(stringize(gSavedSettings.getBOOL("UpdaterWillingToTest"))); + // ForceAddressSize + updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize"))); try { @@ -1231,11 +1229,11 @@ bool LLAppViewer::init() OSMB_OK); mUpdaterNotFound = true; } - } - else - { - LL_WARNS("InitInfo") << "Skipping updater check." << LL_ENDL; - } + } + else + { + LL_WARNS("InitInfo") << "Skipping updater check." << LL_ENDL; + } if (mUpdaterNotFound) { @@ -1268,12 +1266,12 @@ bool LLAppViewer::init() } } - if (gSavedSettings.getBOOL("QAMode") && gSavedSettings.getS32("QAModeEventHostPort") > 0) - { - LL_WARNS("InitInfo") << "QAModeEventHostPort DEPRECATED: " - << "lleventhost no longer supported as a dynamic library" - << LL_ENDL; - } + if (gSavedSettings.getBOOL("QAMode") && gSavedSettings.getS32("QAModeEventHostPort") > 0) + { + LL_WARNS("InitInfo") << "QAModeEventHostPort DEPRECATED: " + << "lleventhost no longer supported as a dynamic library" + << LL_ENDL; + } #endif //LL_RELEASE_FOR_DOWNLOAD LLTextUtil::TextHelpers::iconCallbackCreationFunction = create_text_segment_icon_from_url_match; -- cgit v1.2.3 From b7c4e27d5b973c02318559aaa6c5f029806794f2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 1 Feb 2022 10:34:25 -0500 Subject: SL-13792: _greenlet.so is no longer exposed in Mac viewer app bundle. Instead we have a new bundled executable SLVersionChecker, so that must be signed instead of _greenlet.so. --- indra/newview/viewer_manifest.py | 99 +++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 31 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a814bd2849..55f168d9a3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -26,7 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA $/LicenseInfo$ """ +from __future__ import print_function + import errno +import glob +import itertools import json import os import os.path @@ -1273,47 +1277,80 @@ class DarwinManifest(ViewerManifest): keychain_pwd_path = os.path.join(build_secrets_checkout,'code-signing-osx','password.txt') keychain_pwd = open(keychain_pwd_path).read().rstrip() - # Note: As of macOS Sierra, keychains are created with names postfixed with '-db' so for example, the - # SL Viewer keychain would by default be found in ~/Library/Keychains/viewer.keychain-db instead of - # just ~/Library/Keychains/viewer.keychain in earlier versions. + # Note: As of macOS Sierra, keychains are created with + # names postfixed with '-db' so for example, the SL + # Viewer keychain would by default be found in + # ~/Library/Keychains/viewer.keychain-db instead of + # just ~/Library/Keychains/viewer.keychain in + # earlier versions. # - # Because we have old OS files from previous versions of macOS on the build hosts, the configurations - # are different on each host. Some have viewer.keychain, some have viewer.keychain-db and some have both. - # As you can see in the line below, this script expects the Linden Developer cert/keys to be in viewer.keychain. + # Because we have old OS files from previous + # versions of macOS on the build hosts, the + # configurations are different on each host. Some + # have viewer.keychain, some have viewer.keychain-db + # and some have both. As you can see in the line + # below, this script expects the Linden Developer + # cert/keys to be in viewer.keychain. # - # To correctly sign builds you need to make sure ~/Library/Keychains/viewer.keychain exists on the host - # and that it contains the correct cert/key. If a build host is set up with a clean version of macOS Sierra (or later) - # then you will need to change this line (and the one for 'codesign' command below) to point to right place or else - # pull in the cert/key into the default viewer keychain 'viewer.keychain-db' and export it to 'viewer.keychain' + # To correctly sign builds you need to make sure + # ~/Library/Keychains/viewer.keychain exists on the + # host and that it contains the correct cert/key. If + # a build host is set up with a clean version of + # macOS Sierra (or later) then you will need to + # change this line (and the one for 'codesign' + # command below) to point to right place or else + # pull in the cert/key into the default viewer + # keychain 'viewer.keychain-db' and export it to + # 'viewer.keychain' viewer_keychain = os.path.join(home_path, 'Library', 'Keychains', 'viewer.keychain') self.run_command(['security', 'unlock-keychain', '-p', keychain_pwd, viewer_keychain]) - signed=False - sign_attempts=3 sign_retry_wait=15 - libvlc_path = app_in_dmg + "/Contents/Resources/llplugin/media_plugin_libvlc.dylib" - cef_path = app_in_dmg + "/Contents/Resources/llplugin/media_plugin_cef.dylib" - slplugin_path = app_in_dmg + "/Contents/Resources/SLPlugin.app/Contents/MacOS/SLPlugin" - greenlet_path = app_in_dmg + "/Contents/Resources/updater/greenlet/_greenlet.so" - while (not signed) and (sign_attempts > 0): + resources = app_in_dmg + "/Contents/Resources/" + plain_sign = list(itertools.chain( + glob.glob(resources + "llplugin/*.dylib"), + [resources + "updater/SLVersionChecker"])) + deep_sign = [ + resources + "SLPlugin.app/Contents/MacOS/SLPlugin", + app_in_dmg, + ] + for attempt in range(3): + if attempt: # second or subsequent iteration + print("codesign failed, waiting %d seconds before retrying" % + sign_retry_wait, + file=sys.stderr) + time.sleep(sign_retry_wait) + sign_retry_wait*=2 + try: - sign_attempts-=1 # Note: See blurb above about names of keychains - self.run_command(['codesign', '--force', '--timestamp','--keychain', viewer_keychain, '--sign', identity, libvlc_path]) - self.run_command(['codesign', '--force', '--timestamp', '--keychain', viewer_keychain, '--sign', identity, cef_path]) - self.run_command(['codesign', '--force', '--timestamp', '--keychain', viewer_keychain, '--sign', identity, greenlet_path]) - self.run_command(['codesign', '--verbose', '--deep', '--force', '--entitlements', self.src_path_of("slplugin.entitlements"), '--options', 'runtime', '--keychain', viewer_keychain, '--sign', identity, slplugin_path]) - self.run_command(['codesign', '--verbose', '--deep', '--force', '--entitlements', self.src_path_of("slplugin.entitlements"), '--options', 'runtime', '--keychain', viewer_keychain, '--sign', identity, app_in_dmg]) - signed=True # if no exception was raised, the codesign worked + for signee in plain_sign: + self.run_command( + ['codesign', + '--force', + '--timestamp', + '--keychain', viewer_keychain, + '--sign', identity, + signee]) + for signee in deep_sign: + self.run_command( + ['codesign', + '--verbose', + '--deep', + '--force', + '--entitlements', self.src_path_of("slplugin.entitlements"), + '--options', 'runtime', + '--keychain', viewer_keychain, + '--sign', identity, + signee]) + break # if no exception was raised, the codesign worked except ManifestError as err: - if sign_attempts: - print >> sys.stderr, "codesign failed, waiting %d seconds before retrying" % sign_retry_wait - time.sleep(sign_retry_wait) - sign_retry_wait*=2 - else: - print >> sys.stderr, "Maximum codesign attempts exceeded; giving up" - raise + # 'err' goes out of scope + sign_failed = err + else: + print("Maximum codesign attempts exceeded; giving up", file=sys.stderr) + raise sign_failed self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg]) self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg]) -- cgit v1.2.3 From e23d86ca4dbc0e481ddb183149dfcdd1dd6ddc0c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 1 Feb 2022 11:19:22 -0500 Subject: SL-13792: Cannot mix print statement and print function. 'from __future__ import print_function' not only makes the print() function available, it also makes the Python 2 print statement invalid syntax. Until we merge with the Python 3 branch (soon!), don't import print_function: instead revert to 'print >> sys.stderr' statements. --- indra/newview/viewer_manifest.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 55f168d9a3..a7a6a01d28 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -26,8 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA $/LicenseInfo$ """ -from __future__ import print_function - import errno import glob import itertools @@ -1317,9 +1315,9 @@ class DarwinManifest(ViewerManifest): ] for attempt in range(3): if attempt: # second or subsequent iteration - print("codesign failed, waiting %d seconds before retrying" % - sign_retry_wait, - file=sys.stderr) + print >> sys.stderr, \ + ("codesign failed, waiting %d seconds before retrying" % + sign_retry_wait) time.sleep(sign_retry_wait) sign_retry_wait*=2 @@ -1349,7 +1347,7 @@ class DarwinManifest(ViewerManifest): # 'err' goes out of scope sign_failed = err else: - print("Maximum codesign attempts exceeded; giving up", file=sys.stderr) + print >> sys.stderr, "Maximum codesign attempts exceeded; giving up" raise sign_failed self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg]) self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg]) -- cgit v1.2.3 From 7b6269fd10727f385ad5b193e3fb951477a7cb26 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 1 Feb 2022 14:43:57 -0500 Subject: SL-13792: Update to viewer-manager build 567997 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c63af06197..513f05a96b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 3e2575f21d79326020756dbc5911a97f + bfabe8bfd07f686dc2284082d28b2425 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93900/844736/viewer_manager-3.0.567953-darwin64-567953.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93974/845133/viewer_manager-3.0.567997-darwin64-567997.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a8652b97e25bce215daf10c7465af5f7 + 10e4f7907e954d7ede4a2a04eaa094e8 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93901/844743/viewer_manager-3.0.567953-windows-567953.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93975/845140/viewer_manager-3.0.567997-windows-567997.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.567953 + 3.0.567997 vlc-bin -- cgit v1.2.3 From a0dcfeb10ee49f0e5bfebf8bd7b53b08e1255da6 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 1 Feb 2022 16:34:51 -0500 Subject: SL-13792: Update to viewer-manager build 568005 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 513f05a96b..4f0f61a071 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - bfabe8bfd07f686dc2284082d28b2425 + c897a21f8983de53f391202c6e96b3e0 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93974/845133/viewer_manager-3.0.567997-darwin64-567997.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93985/845210/viewer_manager-3.0.568005-darwin64-568005.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 10e4f7907e954d7ede4a2a04eaa094e8 + 59fa2d48577947877cad511eaf4ca24b url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93975/845140/viewer_manager-3.0.567997-windows-567997.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93986/845219/viewer_manager-3.0.568005-windows-568005.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.567997 + 3.0.568005 vlc-bin -- cgit v1.2.3 From 1de684a8ea9ac93fd5054f86769b21c48b52c60d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 2 Feb 2022 11:33:03 -0500 Subject: SL-13792: Update to viewer-manager build 568036 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4f0f61a071..3c25d6b7fb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - c897a21f8983de53f391202c6e96b3e0 + a5f049e47d922fe9d469ac33a04febef url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93985/845210/viewer_manager-3.0.568005-darwin64-568005.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94037/845588/viewer_manager-3.0.568036-darwin64-568036.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 59fa2d48577947877cad511eaf4ca24b + f4cd6ad439b10214782d5479f3ff4eef url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93986/845219/viewer_manager-3.0.568005-windows-568005.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94040/845601/viewer_manager-3.0.568036-windows-568036.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.568005 + 3.0.568036 vlc-bin -- cgit v1.2.3 From ae1f6fb1ab03bb9ace0f4e0ed87d5160e2cee1fb Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 18 Jan 2022 22:01:05 +0200 Subject: SL-16630 Notarization script update (cherry picked from commit 5fcb811aa2b455cebf18830cf0cdef14025dacdb) --- indra/newview/installers/darwin/apple-notarize.sh | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh index e019437924..d90772ec0e 100755 --- a/indra/newview/installers/darwin/apple-notarize.sh +++ b/indra/newview/installers/darwin/apple-notarize.sh @@ -5,12 +5,12 @@ if [[ $SKIP_NOTARIZATION == "true" ]]; then fi CONFIG_FILE="$build_secrets_checkout/code-signing-osx/notarize_creds.sh" -if [ -f "$CONFIG_FILE" ]; then - source $CONFIG_FILE +if [[ -f "$CONFIG_FILE" ]]; then + source "$CONFIG_FILE" app_file="$1" zip_file=${app_file/app/zip} ditto -c -k --keepParent "$app_file" "$zip_file" - if [ -f "$zip_file" ]; then + if [[ -f "$zip_file" ]]; then res=$(xcrun altool --notarize-app --primary-bundle-id "com.secondlife.viewer" \ --username $USERNAME \ --password $PASSWORD \ @@ -19,37 +19,39 @@ if [ -f "$CONFIG_FILE" ]; then echo $res requestUUID=$(echo $res | awk '/RequestUUID/ { print $NF; }') - echo "Apple Notarization RequestUUID: $requestUUID" - if [[ -n $requestUUID ]]; then - status="in progress" - while [[ "$status" == "in progress" ]]; do + in_progress=1 + while [[ $in_progress -eq 1 ]]; do sleep 30 - status=$(xcrun altool --notarization-info "$requestUUID" \ + res=$(xcrun altool --notarization-info "$requestUUID" \ --username $USERNAME \ - --password $PASSWORD 2>&1 \ - | awk -F ': ' '/Status:/ { print $2; }' ) - echo "$status" + --password $PASSWORD 2>&1) + if [[ $res != *"in progress"* ]]; then + in_progress=0 + fi + echo "." done # log results - xcrun altool --notarization-info "$requestUUID" \ - --username $USERNAME \ - --password $PASSWORD + echo $res #remove temporary file rm "$zip_file" - if [["$status" == "success"]]; then + if [[ $res == *"success"* ]]; then xcrun stapler staple "$app_file" - elif [["$status" == "invalid"]]; then + exit 0 + elif [[ $res == *"invalid"* ]]; then echo "Notarization error: failed to process the app file" exit 1 + else + echo "Notarization error: unknown response status" fi else echo "Notarization error: couldn't get request UUID" - echo $res exit 1 fi + else + echo "Notarization error: ditto failed" + exit 1 fi fi - -- cgit v1.2.3 From 832e62f440587690019d8ed9fc096a6e80ba43a6 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 3 Feb 2022 00:37:29 +0000 Subject: DRTVWR-555 Sign SLVersionChecker with the hardened runtime --- indra/newview/viewer_manifest.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a7a6a01d28..53c1c8a537 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1306,10 +1306,9 @@ class DarwinManifest(ViewerManifest): '-p', keychain_pwd, viewer_keychain]) sign_retry_wait=15 resources = app_in_dmg + "/Contents/Resources/" - plain_sign = list(itertools.chain( - glob.glob(resources + "llplugin/*.dylib"), - [resources + "updater/SLVersionChecker"])) + plain_sign = glob.glob(resources + "llplugin/*.dylib") deep_sign = [ + resources + "updater/SLVersionChecker", resources + "SLPlugin.app/Contents/MacOS/SLPlugin", app_in_dmg, ] -- cgit v1.2.3 From ca26bb40cedb839fb12c319ea1cb7e97eb94c6e5 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 4 Feb 2022 01:36:47 +0200 Subject: SL-16787 Updater launch issues. --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3c25d6b7fb..2af4ce04fe 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a5f049e47d922fe9d469ac33a04febef + 7e436c0543e565cfa8ef143d6751a86e url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94037/845588/viewer_manager-3.0.568036-darwin64-568036.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94190/846731/viewer_manager-3.0.568122-darwin64-568122.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f4cd6ad439b10214782d5479f3ff4eef + af511e398aa09d7c0e873e44c3cd79fe url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94040/845601/viewer_manager-3.0.568036-windows-568036.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94154/846597/viewer_manager-3.0.568122-windows-568122.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.568036 + 3.0.568122 vlc-bin -- cgit v1.2.3 From e37f8c6020a7af9d107fa30cadaf62477f9922ba Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 4 Feb 2022 11:58:53 -0500 Subject: SL-16788: Update to viewer-manager build 568156 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 2af4ce04fe..85269a987b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3272,9 +3272,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7e436c0543e565cfa8ef143d6751a86e + b322e2edf9b16ef4e2910cd2aa70fb7e url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94190/846731/viewer_manager-3.0.568122-darwin64-568122.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94215/846892/viewer_manager-3.0.568156-darwin64-568156.tar.bz2 name darwin64 @@ -3296,9 +3296,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - af511e398aa09d7c0e873e44c3cd79fe + 359c215211436fcc4bab8d8f355405b0 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94154/846597/viewer_manager-3.0.568122-windows-568122.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94218/846913/viewer_manager-3.0.568156-windows-568156.tar.bz2 name windows @@ -3309,7 +3309,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.568122 + 3.0.568156 vlc-bin -- cgit v1.2.3