Title: [186762] trunk/Source/WebKit2
- Revision
- 186762
- Author
- mcatanz...@igalia.com
- Date
- 2015-07-13 08:42:11 -0700 (Mon, 13 Jul 2015)
Log Message
[Linux] SeccompFilters: handle alternate install prefixes
https://bugs.webkit.org/show_bug.cgi?id=140065
Reviewed by Žan Doberšek.
If the install prefix is something other than /usr, e.g. /usr/local or
~/jhbuild/install, then we want to make sure to allow libraries and data
from that prefix.
* PlatformEfl.cmake:
* Shared/linux/SeccompFilters/SyscallPolicy.cpp:
(WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186761 => 186762)
--- trunk/Source/WebKit2/ChangeLog 2015-07-13 07:44:18 UTC (rev 186761)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-13 15:42:11 UTC (rev 186762)
@@ -1,3 +1,18 @@
+2015-07-13 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [Linux] SeccompFilters: handle alternate install prefixes
+ https://bugs.webkit.org/show_bug.cgi?id=140065
+
+ Reviewed by Žan Doberšek.
+
+ If the install prefix is something other than /usr, e.g. /usr/local or
+ ~/jhbuild/install, then we want to make sure to allow libraries and data
+ from that prefix.
+
+ * PlatformEfl.cmake:
+ * Shared/linux/SeccompFilters/SyscallPolicy.cpp:
+ (WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
+
2015-07-13 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Contents not correctly laid out when the web view is not realized
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (186761 => 186762)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-07-13 07:44:18 UTC (rev 186761)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-07-13 15:42:11 UTC (rev 186762)
@@ -476,7 +476,9 @@
add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
-DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
-DGTEST_LINKED_AS_SHARED_LIBRARY=1
+ -DLIBDIR=\"${LIB_INSTALL_DIR}\"
-DLIBEXECDIR=\"${EXEC_INSTALL_DIR}\"
+ -DDATADIR=\"${CMAKE_INSTALL_PREFIX}/share\"
-DEXTENSIONMANAGERDIR=\"${CMAKE_INSTALL_PREFIX}/${EWEBKIT_EXTENSION_MANAGER_INSTALL_DIR}\"
-DWEBPROCESSNAME=\"WebProcess\"
-DPLUGINPROCESSNAME=\"PluginProcess\"
Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp (186761 => 186762)
--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp 2015-07-13 07:44:18 UTC (rev 186761)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp 2015-07-13 15:42:11 UTC (rev 186762)
@@ -142,6 +142,10 @@
addDirectoryPermission(ASCIILiteral("/usr/lib64"), Read);
addDirectoryPermission(ASCIILiteral("/usr/share"), Read);
+ // Support for alternative install prefixes, e.g. /usr/local.
+ addDirectoryPermission(ASCIILiteral(DATADIR), Read);
+ addDirectoryPermission(ASCIILiteral(LIBDIR), Read);
+
// SSL Certificates.
addDirectoryPermission(ASCIILiteral("/etc/ssl/certs"), Read);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
