Modified: trunk/Source/WebKit/ChangeLog (274416 => 274417)
--- trunk/Source/WebKit/ChangeLog 2021-03-15 13:00:36 UTC (rev 274416)
+++ trunk/Source/WebKit/ChangeLog 2021-03-15 13:15:05 UTC (rev 274417)
@@ -1,3 +1,18 @@
+2021-03-15 Daniel Kolesa <dkol...@igalia.com>
+
+ [GLIB] Be more selective about bublewrapping libdirs
+ https://bugs.webkit.org/show_bug.cgi?id=221709
+
+ Reviewed by Carlos Garcia Campos.
+
+ On 32-bit systems, bubblewrap lib32 instead of lib64. This unbreaks
+ sandbox on some distributions that have lib32 (which glibc defaults
+ its ld cache lookups to) but configure default libdir to lib rather
+ than lib32.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bubblewrapSpawn):
+
2021-03-15 Kimmo Kinnunen <kkinnu...@apple.com>
Move vertex array functionality from ExtensionsGL to GraphicsContextGL
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (274416 => 274417)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-03-15 13:00:36 UTC (rev 274416)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-03-15 13:15:05 UTC (rev 274417)
@@ -783,9 +783,15 @@
"--ro-bind-try", "/usr/lib", "/usr/lib",
"--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
"--ro-bind-try", LIBDIR, LIBDIR,
+#if CPU(ADDRESS64)
"--ro-bind-try", "/lib64", "/lib64",
"--ro-bind-try", "/usr/lib64", "/usr/lib64",
"--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
+#else
+ "--ro-bind-try", "/lib32", "/lib32",
+ "--ro-bind-try", "/usr/lib32", "/usr/lib32",
+ "--ro-bind-try", "/usr/local/lib32", "/usr/local/lib32",
+#endif
"--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
};
