File chromium-norar.patch of Package chromium.16795

Overview Repositories Revisions Requests Users Attributes Meta

File chromium-norar.patch of Package chromium.16795

Index: chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn
===================================================================
--- chromium-86.0.4240.75.orig/chrome/common/safe_browsing/BUILD.gn
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn
@@ -43,38 +43,6 @@
     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" ]
-  }

if (is_mac) {
     source_set("disk_image_type_sniffer_mac") {
@@ -138,7 +105,6 @@ source_set("safe_browsing") {
       ":archive_analyzer_results",
       ":binary_feature_extractor",
       ":download_type_util",
-      ":rar_analyzer",
       "//components/safe_browsing/core:features",
     ]
 
Index: chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS
===================================================================
--- chromium-86.0.4240.75.orig/chrome/common/safe_browsing/DEPS
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+components/safe_browsing",
   "+third_party/protobuf",
-  "+third_party/unrar",
   "+third_party/zlib",
 ]
Index: chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc
===================================================================
--- chromium-86.0.4240.75.orig/chrome/services/file_util/safe_archive_analyzer.cc
+++ chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc
@@ -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
 }
Index: chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn
===================================================================
--- chromium-86.0.4240.75.orig/chrome/services/file_util/BUILD.gn
+++ chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn
@@ -15,7 +15,6 @@ source_set("file_util") {
     deps += [
       "//chrome/common/safe_browsing",
       "//chrome/common/safe_browsing:archive_analyzer_results",
-      "//chrome/common/safe_browsing:rar_analyzer",
     ]
   }

Places

File chromium-norar.patch of Package chromium.16795

Places