/[packages]/cauldron/chromium-browser-stable/current/SOURCES/chromium-122-norar.patch
ViewVC logotype

Diff of /cauldron/chromium-browser-stable/current/SOURCES/chromium-122-norar.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

cauldron/chromium-browser-stable/current/SOURCES/chromium-108-norar.patch revision 1913227 by squidf, Wed Nov 30 08:14:35 2022 UTC cauldron/chromium-browser-stable/current/SOURCES/chromium-113-norar.patch revision 1956665 by squidf, Fri May 12 08:45:03 2023 UTC
# Line 1  Line 1 
 --- patch108/chrome/common/safe_browsing/BUILD.gn       2022-11-02 23:38:31.928162300 +0100  
 +++ patch108/chrome/common/safe_browsing/BUILD.gn.norar 2022-11-04 19:53:23.309887947 +0100  
 @@ -58,39 +58,6 @@ if (safe_browsing_mode == 1) {  
      public_deps = [ "//components/safe_browsing/core/common/proto: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/content/common:file_type_policies",  
 -      "//components/safe_browsing/core/common",  
 -      "//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/common/proto:csd_proto" ]  
 -  }  
 -  
    if (is_linux || is_win) {  
      source_set("document_analyzer") {  
        sources = [  
 @@ -191,7 +158,6 @@ source_set("safe_browsing") {  
        ":archive_analyzer_results",  
        ":binary_feature_extractor",  
        ":download_type_util",  
 -      ":rar_analyzer",  
        "//components/safe_browsing/core/common",  
        "//third_party/lzma_sdk/google:seven_zip_reader",  
      ]  
1  --- patch108/chrome/common/safe_browsing/DEPS   2022-11-02 23:38:31.928162300 +0100  --- patch108/chrome/common/safe_browsing/DEPS   2022-11-02 23:38:31.928162300 +0100
2  +++ patch108/chrome/common/safe_browsing/DEPS.norar     2022-11-04 19:27:26.979907479 +0100  +++ patch108/chrome/common/safe_browsing/DEPS.norar     2022-11-04 19:27:26.979907479 +0100
3  @@ -3,7 +3,6 @@ include_rules = [  @@ -3,7 +3,6 @@ include_rules = [
# Line 58  Line 8 
8     "+third_party/zlib",     "+third_party/zlib",
9     "+third_party/lzma_sdk/google",     "+third_party/lzma_sdk/google",
10   ]   ]
 --- patch108/chrome/services/file_util/safe_archive_analyzer.cc 2022-11-02 23:38:32.040171900 +0100  
 +++ patch108/chrome/services/file_util/safe_archive_analyzer.cc.norar   2022-11-04 19:31:51.293544197 +0100  
 @@ -45,12 +45,16 @@ 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  
  }  
   
  void SafeArchiveAnalyzer::AnalyzeSevenZipFile(  
 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  
 @@ -60,7 +60,6 @@ source_set("file_util") {  
      deps += [  
        "//chrome/common/safe_browsing",  
        "//chrome/common/safe_browsing:archive_analyzer_results",  
 -      "//chrome/common/safe_browsing:rar_analyzer",  
      ]  
   
      if (is_linux || is_win) {  
Legend:
Removed from v.1913227  
changed lines
  Added in v.1956665
  ViewVC Help
Powered by ViewVC 1.1.30