From 9dfd686d575c9be5a83a24d3063248f4874c9166 Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Thu, 12 Dec 2019 14:38:57 -0800 Subject: [PATCH] Use the correct name for the setuid sandbox (fixes brave/brave-browser#6247) --- ...aller-linux-common-installer.include.patch | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index 00e3f6cf2955..67a9983fff7e 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 27393586fe37f441faa712c3b1388adab51891cf..0a6d8c54dfea80d56b29391041e374b76b30f2e3 100644 +index 27393586fe37f441faa712c3b1388adab51891cf..cdf66268f1a83ad9202235a62b1c2fe66d4a42a7 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -36,6 +36,15 @@ index 27393586fe37f441faa712c3b1388adab51891cf..0a6d8c54dfea80d56b29391041e374b7 # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" +@@ -185,7 +205,7 @@ stage_install_common() { + strippedfile="${buildfile}.stripped" + debugfile="${buildfile}.debug" + "${BUILDDIR}/installer/common/eu-strip" -o "${strippedfile}" -f "${debugfile}" "${buildfile}" +- install -m 4755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" ++ install -m 4755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/chrome-sandbox" + + # l10n paks + install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/locales/" @@ -286,11 +306,13 @@ stage_install_common() { # app icons @@ -52,14 +61,7 @@ index 27393586fe37f441faa712c3b1388adab51891cf..0a6d8c54dfea80d56b29391041e374b7 fi fi LOGO_RESOURCES_PNG=$(find "${BUILDDIR}/installer/theme/" \ -@@ -392,12 +414,14 @@ stage_install_common() { - exit 1 - fi - local expected_perms=777 -- elif [ "${base_name}" = "chrome-sandbox" ]; then -+ elif [ "${base_name}" = "brave-sandbox" ]; then - local expected_perms=4755 - elif [[ "${base_name}" = "nacl_irt_"*".nexe" ]]; then +@@ -398,6 +420,8 @@ stage_install_common() { local expected_perms=644 elif [[ "${file_type}" = *"shell script"* ]]; then local expected_perms=755