← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/7-npapi-permission-not-defaults-to-unauthorized.patch

  • Committer: Chad Miller
  • Date: 2014-01-21 21:22:04 UTC
  • Revision ID: chad.miller@canonical.com-20140121212204-wkrfe0z1io4guv1g
* Upstream release 32.0.1700.77:  (LP: #1269387)
  - Tab indicators for sound, webcam and casting 
  - Automatically blocking malware files 
  - A number of new apps/extension APIs 
  - Lots of under the hood changes for stability and performance 
  - CVE-2013-6646: Use-after-free in web workers.
  - CVE-2013-6641: Use-after-free related to forms.
  - CVE-2013-6642: Address bar spoofing in Chrome for Android.
  - CVE-2013-6643: Unprompted sync with an attacker’s Google account.
  - CVE-2013-6645: Use-after-free related to speech input elements.
  - CVE-2013-6644: Various fixes from internal audits, fuzzing and other
    initiatives.
* Re-merged webapps patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/7-npapi-permission-not-defaults-to-unauthorized.patch
1
 
Index: trusty-working/src/chrome/browser/browser_resources.grd
2
 
===================================================================
3
 
--- trusty-working.orig/src/chrome/browser/browser_resources.grd
4
 
+++ trusty-working/src/chrome/browser/browser_resources.grd
5
 
@@ -199,6 +199,7 @@
 
1
--- a/src/chrome/browser/browser_resources.grd
 
2
+++ b/src/chrome/browser/browser_resources.grd
 
3
@@ -211,6 +211,7 @@
6
4
         </if>
7
5
         <if expr="not pp_ifdef('chromeos')">
8
6
           <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
10
8
         </if>
11
9
       </if>
12
10
       <if expr="is_android">
13
 
Index: trusty-working/src/chrome/browser/plugins/plugin_finder.cc
14
 
===================================================================
15
 
--- trusty-working.orig/src/chrome/browser/plugins/plugin_finder.cc
16
 
+++ trusty-working/src/chrome/browser/plugins/plugin_finder.cc
17
 
@@ -134,6 +134,29 @@
 
11
--- a/src/chrome/browser/plugins/plugin_finder.cc
 
12
+++ b/src/chrome/browser/plugins/plugin_finder.cc
 
13
@@ -128,6 +128,29 @@
18
14
   return plugin;
19
15
 }
20
16
 
44
40
 }  // namespace
45
41
 
46
42
 // static
47
 
@@ -141,6 +164,16 @@
 
43
@@ -135,6 +158,16 @@
48
44
   registry->RegisterBooleanPref(prefs::kDisablePluginFinder, false);
49
45
 }
50
46
 
61
57
 // static
62
58
 PluginFinder* PluginFinder::GetInstance() {
63
59
   // PluginFinder::GetInstance() is the only method that's allowed to call
64
 
@@ -162,23 +195,13 @@
 
60
@@ -156,23 +189,13 @@
65
61
 }
66
62
 
67
63
 // static
91
87
 }
92
88
 
93
89
 PluginFinder::~PluginFinder() {
94
 
@@ -244,16 +267,21 @@
 
90
@@ -238,16 +261,21 @@
95
91
   if (version <= version_)
96
92
     return;
97
93
 
115
111
       DCHECK(!identifier_plugin_[identifier]);
116
112
       identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin);
117
113
 
118
 
Index: trusty-working/src/chrome/browser/plugins/plugin_finder.h
119
 
===================================================================
120
 
--- trusty-working.orig/src/chrome/browser/plugins/plugin_finder.h
121
 
+++ trusty-working/src/chrome/browser/plugins/plugin_finder.h
 
114
--- a/src/chrome/browser/plugins/plugin_finder.h
 
115
+++ b/src/chrome/browser/plugins/plugin_finder.h
122
116
@@ -80,6 +80,15 @@
123
117
   // Returns NULL if the plug-in list couldn't be parsed.
124
118
   static base::DictionaryValue* LoadBuiltInPluginList();
135
129
 #if defined(ENABLE_PLUGIN_INSTALLATION)
136
130
   std::map<std::string, PluginInstaller*> installers_;
137
131
 #endif
138
 
Index: trusty-working/src/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json
139
 
===================================================================
140
132
--- /dev/null
141
 
+++ trusty-working/src/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json
 
133
+++ b/src/chrome/browser/resources/plugin_metadata/plugins_ubuntu_linux.json
142
134
@@ -0,0 +1,18 @@
143
135
+{
144
136
+  "libunity_npapi_plugin.so": {