← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/configuration-directory.patch

  • Committer: Chad MILLER
  • Date: 2015-04-17 00:17:26 UTC
  • Revision ID: chad.miller@canonical.com-20150417001726-dszj422xuq86ob42
* Upstream release 42.0.2311.90:
  - CVE-2015-1235: Cross-origin-bypass in HTML parser.
  - CVE-2015-1236: Cross-origin-bypass in Blink.
  - CVE-2015-1237: Use-after-free in IPC.
  - CVE-2015-1238: Out-of-bounds write in Skia.
  - CVE-2015-1240: Out-of-bounds read in WebGL.
  - CVE-2015-1241: Tap-Jacking.
  - CVE-2015-1242: Type confusion in V8.
  - CVE-2015-1244: HSTS bypass in WebSockets.
  - CVE-2015-1245: Use-after-free in PDFium.
  - CVE-2015-1247: Scheme issues in OpenSearch.
  - CVE-2015-1248: SafeBrowsing bypass.
* Upstream release 41.0.2272.118:
  - CVE-2015-1233: A special thanks to Anonymous for a combination of V8,
    Gamepad and IPC bugs that can lead to remote code execution outside of
    the sandbox. 
  - CVE-2015-1234: Buffer overflow via race condition in GPU.
* debian/chromium-browser-etc-customizations-flash-staleness: Ask sudo users
  to update flash player.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/configuration-directory.patch
4
4
 
5
5
--- a/chrome/common/chrome_paths.cc
6
6
+++ b/chrome/common/chrome_paths.cc
7
 
@@ -91,6 +91,8 @@ const base::FilePath::CharType kFilepath
 
7
@@ -81,6 +81,8 @@ const base::FilePath::CharType kFilepath
8
8
 #else
9
9
     FILE_PATH_LITERAL("/usr/share/chromium/extensions");
10
10
 #endif  // defined(GOOGLE_CHROME_BUILD)
13
13
 #endif  // defined(OS_LINUX)
14
14
 
15
15
 static base::LazyInstance<base::FilePath>
16
 
@@ -467,6 +469,9 @@ bool PathProvider(int key, base::FilePat
 
16
@@ -466,6 +468,9 @@ bool PathProvider(int key, base::FilePat
17
17
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
18
18
 #else
19
19
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
23
23
 #endif
24
24
       break;
25
25
     }
26
 
@@ -509,6 +514,10 @@ bool PathProvider(int key, base::FilePat
 
26
@@ -496,6 +501,10 @@ bool PathProvider(int key, base::FilePat
27
27
 #endif
28
28
 #if defined(OS_LINUX)
29
29
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
34
34
       cur = base::FilePath(kFilepathSinglePrefExtensions);
35
35
       break;
36
36
     }
37
 
@@ -559,6 +568,10 @@ bool PathProvider(int key, base::FilePat
 
37
@@ -546,6 +555,10 @@ bool PathProvider(int key, base::FilePat
38
38
 #else
39
39
       cur = base::FilePath(FILE_PATH_LITERAL(
40
40
           "/etc/chromium/native-messaging-hosts"));