Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the correct name for the setuid sandbox #4223

Merged
merged 1 commit into from
Dec 18, 2019
Merged

Use the correct name for the setuid sandbox #4223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions patches/chrome-installer-linux-common-installer.include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() (
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down