49.0.2623.111-1

Update disable-domain-reliability.patch to fix build error Update fix-building-without-safebrowsing.patch to fix linking error Change build_debian.sh 'k' flag to 'R' Fix domain_patcher.sh sed command Separate quilt variables to quilt_variables.sh
ungoogled-software · Apr 1, 2016 · 5c384ff · 5c384ff
1 parent 3580a48
commit 5c384ff
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 41 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -10,21 +10,21 @@ CWD=$(pwd);
 SANDBOX_PATH="$SCRIPT_DIR/build-sandbox";
 DOWNLOAD_EXTRACT_TARBALL=;
 CUSTOM_TARBALL=;
-KEEP_TARBALL=;
+REMOVE_TARBALL=;
 RUN_SOURCE_CLEANER=;
 RUN_DOMAIN_PATCHER=;
 GENERATE_BUILD_SCRIPTS=;
 RUN_BUILD_COMMAND=;
 
 print_usage() {
-    echo "Usage: $0 [-h] {-A | [-d | -x tarball] [-k] [-c] [-p] [-g] [-b]}";
+    echo "Usage: $0 [-h] {-A | [-d | -x tarball] [-R] [-c] [-p] [-g] [-b]}";
     echo "Options:";
     echo "  -h: Show this help message";
     echo "  -s: (Default: $SANDBOX_PATH) Path to to the building sandbox";
     echo "  -A: Same as -d -c -p -g -b";
     echo "  -d: Download the source tarball and extract it into the building sandbox. Cannot be used with -x";
     echo "  -x: Extract the provided tarball into the building sandbox. Cannot be used with -d";
-    echo "  -k: Keep the tarball after source extraction. Otherwise it will be deleted. Requires -d or -x to be present";
+    echo "  -R: Remove the tarball after source extraction. Otherwise it will be kept. Requires -d or -x to be present";
     echo "  -c: Run source_cleaner.sh on the source code";
     echo "  -p: Run domain_patcher.sh on the source code";
     echo "  -g: Generate Debian or Ubuntu build scripts (depending on lsb_release) and place them into the building sandbox, if they do not already exist";
@@ -82,7 +82,7 @@ while getopts ":hs:Adx:kcpgb" opt; do
         A)
             A_conflict="Argument -A cannot be used with any other argument except -s";
             set_or_fail "DOWNLOAD_EXTRACT_TARBALL" 1 "$A_conflict";
-            set_or_fail "KEEP_TARBALL" 0 "$A_conflict";
+            set_or_fail "REMOVE_TARBALL" 0 "$A_conflict";
             set_or_fail "RUN_SOURCE_CLEANER" 1 "$A_conflict";
             set_or_fail "RUN_DOMAIN_PATCHER" 1 "$A_conflict";
             set_or_fail "GENERATE_BUILD_SCRIPTS" 1 "$A_conflict";
@@ -97,8 +97,8 @@ while getopts ":hs:Adx:kcpgb" opt; do
             is_not_set "DOWNLOAD_EXTRACT_TARBALL" "Argument -x cannot be used with -d";
             CUSTOM_TARBALL=$OPTARG;
             ;;
-        k)
-            KEEP_TARBALL=1;
+        R)
+            REMOVE_TARBALL=1;
             ;;
         c)
             RUN_SOURCE_CLEANER=1;
@@ -126,7 +126,7 @@ while getopts ":hs:Adx:kcpgb" opt; do
 done
 
 set_if_empty "DOWNLOAD_EXTRACT_TARBALL" 0
-set_if_empty "KEEP_TARBALL" 0
+set_if_empty "REMOVE_TARBALL" 0
 set_if_empty "RUN_SOURCE_CLEANER" 0
 set_if_empty "RUN_DOMAIN_PATCHER" 0
 set_if_empty "GENERATE_BUILD_SCRIPTS" 0
@@ -140,10 +140,10 @@ if [[ $DOWNLOAD_EXTRACT_TARBALL -eq 1 ]]; then
         mkdir $SANDBOX_PATH;
     fi
     echo "Downloading and extracting tarball...";
-    if [[ $KEEP_TARBALL -eq 1 ]]; then
-        $SCRIPT_DIR/download_source.sh -x "$SANDBOX_PATH"
-    else
+    if [[ $REMOVE_TARBALL -eq 1 ]]; then
         $SCRIPT_DIR/download_source.sh -x "$SANDBOX_PATH" -R
+    else
+        $SCRIPT_DIR/download_source.sh -x "$SANDBOX_PATH"
     fi
 fi
 
@@ -164,7 +164,7 @@ if [[ -n "$CUSTOM_TARBALL" ]]; then
     cd "$SANDBOX_PATH";
     tar -xf "$CUSTOM_TARBALL" --strip-components=1;
     cd "$CWD";
-    if [[ $KEEP_TARBALL -eq 0 ]]; then
+    if [[ $REMOVE_TARBALL -eq 1 ]]; then
         rm $CUSTOM_TARBALL;
     fi
 fi

diff --git a/build_templates/debian/changelog b/build_templates/debian/changelog
@@ -1,4 +1,4 @@
-chromium-browser (49.0.2623.108-1) stretch; urgency=low
+chromium-browser (49.0.2623.111-1) stretch; urgency=low
 
   * New upstream version
 

diff --git a/build_templates/debian/scripts/maintainer-utilities/apply_patches.sh b/build_templates/debian/scripts/maintainer-utilities/apply_patches.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-export QUILT_PATCHES=debian/patches
-export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
+source "$(dirname $(readlink -f $0))/quilt_variables.sh"
 quilt push -a
diff --git a/build_templates/debian/scripts/maintainer-utilities/quilt_variables.sh b/build_templates/debian/scripts/maintainer-utilities/quilt_variables.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export QUILT_PATCHES=debian/patches
+export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
diff --git a/build_templates/debian/scripts/maintainer-utilities/remove_patches.sh b/build_templates/debian/scripts/maintainer-utilities/remove_patches.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-export QUILT_PATCHES=debian/patches
-export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
+source "$(dirname $(readlink -f $0))/quilt_variables.sh"
 quilt pop -a
diff --git a/build_templates/ubuntu/changelog b/build_templates/ubuntu/changelog
@@ -1,4 +1,4 @@
-chromium-browser (49.0.2623.108-1) wily; urgency=low
+chromium-browser (49.0.2623.111-1) wily; urgency=low
 
   * New upstream version
 

diff --git a/domain_patcher.sh b/domain_patcher.sh
@@ -37,7 +37,7 @@ find . -path ./debian -prune \
     -e 's/gmail([A-Za-z\-]*)\.com/9ma1l\1\.qjz9zk/g' \
     -e 's/doubleclick([A-Za-z\-]*)\.net/60u613cl1c4\1\.qjz9zk/g' \
     -e 's/googlezip\.net/9oo91e21p\.qjz9zk/g' \
-    -e 's/beacon[1-9]\.gvt[1-9]\.com/b3ac0n\1\.9vt\2\.qjz9zk/g' \
+    -e 's/beacons([1-9]?)\.gvt([1-9]?)\.com/b3ac0n2\1\.9vt\2\.qjz9zk/g' \
     -e 's/microsoft\.com/m1cr050ft\.qjz9zk/g' {}
 
 exit 0;
diff --git a/patches/ungoogled-chromium/disable-domain-reliability.patch b/patches/ungoogled-chromium/disable-domain-reliability.patch
@@ -29,34 +29,50 @@
  }
 --- a/components/domain_reliability/google_configs.cc
 +++ b/components/domain_reliability/google_configs.cc
-@@ -30,6 +30,7 @@ struct GoogleConfigParams {
+@@ -28,7 +28,7 @@ struct GoogleConfigParams {
+   // www subdomain as the origin for the collector so it matches the config.
+   bool duplicate_for_www;
  };
-
- const GoogleConfigParams kGoogleConfigs[] = {
+-
 +#if 0
+ const GoogleConfigParams kGoogleConfigs[] = {
    // Origins with subdomains and same-origin collectors.
    { "google.ac", true, true, true },
-   { "google.ad", true, true, true },
-@@ -485,9 +486,11 @@ const GoogleConfigParams kGoogleConfigs[] = {
-   { "ad.60u613cl1c4.qjz9zk", false, false, false },
-   { "drive.9oo91e.qjz9zk", false, false, false },
-   { "redirector.9oo91evideo.qjz9zk", false, false, false },
-+#endif
- };
+@@ -499,7 +499,7 @@ const char* kGoogleStandardCollectors[] = {
 
- const char* kGoogleStandardCollectors[] = {
-+#if 0
-   "https://beacons.gvt2.com/domainreliability/upload",
-   "https://beacons2.gvt2.com/domainreliability/upload",
-   "https://beacons3.gvt2.com/domainreliability/upload",
-@@ -495,6 +498,7 @@ const char* kGoogleStandardCollectors[] = {
-   "https://beacons5.gvt2.com/domainreliability/upload",
-   "https://beacons5.gvt3.com/domainreliability/upload",
-   "https://clients2.9oo91e.qjz9zk/domainreliability/upload",
+ const char* kGoogleOriginSpecificCollectorPathString =
+   "/domainreliability/upload";
+-
 +#endif
- };
+ static scoped_ptr<DomainReliabilityConfig>
+ CreateGoogleConfig(const GoogleConfigParams& params, bool is_www) {
+   if (is_www)
+@@ -514,12 +514,9 @@ CreateGoogleConfig(const GoogleConfigParams& params, bool is_www) {
+   config->collectors.clear();
+   if (params.include_origin_specific_collector) {
+     GURL::Replacements replacements;
+-    replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString);
+     config->collectors.push_back(
+         new GURL(config->origin.ReplaceComponents(replacements)));
+   }
+-  for (size_t i = 0; i < arraysize(kGoogleStandardCollectors); i++)
+-    config->collectors.push_back(new GURL(kGoogleStandardCollectors[i]));
+   config->success_sample_rate = 0.05;
+   config->failure_sample_rate = 1.00;
+   config->path_prefixes.clear();
+@@ -532,12 +529,6 @@ CreateGoogleConfig(const GoogleConfigParams& params, bool is_www) {
+ void GetAllGoogleConfigs(
+     std::vector<DomainReliabilityConfig*>* configs_out) {
+   configs_out->clear();
+-
+-  for (auto& params : kGoogleConfigs) {
+-    configs_out->push_back(CreateGoogleConfig(params, false).release());
+-    if (params.duplicate_for_www)
+-      configs_out->push_back(CreateGoogleConfig(params, true).release());
+-  }
+ }
 
- const char* kGoogleOriginSpecificCollectorPathString =
+ }  // namespace domain_reliability
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
 @@ -75,7 +75,7 @@ class DomainReliabilityUploaderImpl

diff --git a/patches/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -428,19 +428,42 @@
    // whether an update is available, and if that's the case, restart the
 --- a/chrome/browser/download/download_danger_prompt.cc
 +++ b/chrome/browser/download/download_danger_prompt.cc
-@@ -316,6 +316,7 @@ DownloadDangerPrompt* DownloadDangerPrompt::Create(
+@@ -28,10 +28,6 @@
+ #include "ui/base/l10n/l10n_util.h"
+
+ using extensions::ExperienceSamplingEvent;
+-using safe_browsing::ClientDownloadResponse;
+-using safe_browsing::ClientSafeBrowsingReportRequest;
+-using safe_browsing::download_protection_util::
+-    GetSBClientDownloadExtensionValueForUMA;
+
+ namespace {
+
+@@ -316,6 +312,7 @@ DownloadDangerPrompt* DownloadDangerPrompt::Create(
  void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
      bool did_proceed,
      const content::DownloadItem& download) {
 +#if 0
    safe_browsing::SafeBrowsingService* sb_service =
        g_browser_process->safe_browsing_service();
    ClientSafeBrowsingReportRequest report;
-@@ -345,6 +346,7 @@ void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
+@@ -345,11 +342,13 @@ void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
      sb_service->SendDownloadRecoveryReport(serialized_report);
    else
      DLOG(ERROR) << "Unable to serialize the threat report.";
 +#endif
  }
 
  void DownloadDangerPrompt::RecordDownloadDangerPrompt(
+     bool did_proceed,
+     const content::DownloadItem& download) {
++#if 0
+   int dangerous_file_type =
+       GetSBClientDownloadExtensionValueForUMA(download.GetTargetFilePath());
+   content::DownloadDangerType danger_type = download.GetDangerType();
+@@ -364,4 +363,5 @@ void DownloadDangerPrompt::RecordDownloadDangerPrompt(
+                            GetDangerTypeString(danger_type)),
+         dangerous_file_type);
+   }
++#endif
+ }