add missing norar patch

4 years ago · cce6fca747
parent f92ce96a8a
commit cce6fca747
1 changed files with 90 additions and 0 deletions
--- a/chromium-86.0.4240.75-norar.patch
+++ b/chromium-86.0.4240.75-norar.patch
@ -0,0 +1,90 @@
+diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn
+--- chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn.nounrar	2020-10-14 17:14:37.804975091 -0400
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn	2020-10-14 17:14:37.800975059 -0400
+@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core:csd_proto" ]
+   }
+ 
+-  source_set("rar_analyzer") {
+-    sources = [
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+-    ]
+-
+-    deps = [
+-      ":archive_analyzer_results",
+-      ":download_type_util",
+-      "//base",
+-      "//base:i18n",
+-      "//components/safe_browsing/core:features",
+-      "//components/safe_browsing/core:file_type_policies",
+-      "//third_party/unrar:unrar",
+-    ]
+-
+-    defines = [
+-      "_FILE_OFFSET_BITS=64",
+-      "LARGEFILE_SOURCE",
+-      "RAR_SMP",
+-      "SILENT",
+-
+-      # The following is set to disable certain macro definitions in the unrar
+-      # source code.
+-      "CHROMIUM_UNRAR",
+-
+-      # Disables exceptions in unrar, replaces them with process termination.
+-      "UNRAR_NO_EXCEPTIONS",
+-    ]
+-
+-    public_deps = [ "//components/safe_browsing/core:csd_proto" ]
+-  }
+-
+   source_set("disk_image_type_sniffer_mac") {
+     sources = [
+       "disk_image_type_sniffer_mac.cc",
+@@ -138,7 +105,6 @@ source_set("safe_browsing") {
+       ":archive_analyzer_results",
+       ":binary_feature_extractor",
+       ":download_type_util",
+-      ":rar_analyzer",
+       "//components/safe_browsing/core:features",
+     ]
+ 
+diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS
+--- chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar	2020-10-14 17:14:37.800975059 -0400
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS	2020-10-14 17:14:37.806975106 -0400
+@@ -1,6 +1,5 @@
+ include_rules = [
+   "+components/safe_browsing",
+   "+third_party/protobuf",
+-  "+third_party/unrar",
+   "+third_party/zlib",
+ ]
+diff -up chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn
+--- chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar	2020-10-14 17:30:58.473704551 -0400
+++ chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn	2020-10-14 17:31:25.511917656 -0400
+@@ -15,7 +15,6 @@ source_set("file_util") {
+     "//base",
+     "//chrome/common/safe_browsing",
+     "//chrome/common/safe_browsing:archive_analyzer_results",
+-    "//chrome/common/safe_browsing:rar_analyzer",
+     "//components/safe_browsing:buildflags",
+     "//mojo/public/cpp/bindings",
+   ]
+diff -up chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar	2020-10-14 17:14:37.255970763 -0400
+++ chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc	2020-10-14 17:14:37.259970795 -0400
+@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
+ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+                                          base::File temporary_file,
+                                          AnalyzeRarFileCallback callback) {
+#if 0
+   DCHECK(rar_file.IsValid());
+ 
+   safe_browsing::ArchiveAnalyzerResults results;
+   safe_browsing::rar_analyzer::AnalyzeRarFile(
+       std::move(rar_file), std::move(temporary_file), &results);
+   std::move(callback).Run(results);
+#else
+  NOTREACHED();
+#endif
+ }