diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-10-28 04:18:26 -0400 |
|---|---|---|
| committer | Mike Gerwitz <mtg@gnu.org> | 2019-10-30 00:18:12 -0400 |
| commit | 494224001a616f2c2ac54b502b5354671785cec1 (patch) | |
| tree | b664dc581a1936f6db7651c92bcbf2fafb823b41 | |
| parent | c30f2a825603e01130f34c3ef51cf1c71d697a8f (diff) | |
Disable MOZ_SERVICES_HEALTHREPORT and MOZ_DATA_REPORTING.
* data/patches/fix-data-reporting-check.patch: New file.
* data/patches/legacy-profiles.patch: Rename to ...
* data/patches/moz-configure-changes.patch: ... this,
and set MOZ_SERVICES_HEALTHREPORT to False.
| -rw-r--r-- | data/patches/fix-data-reporting-check.patch | 22 | ||||
| -rw-r--r-- | data/patches/moz-configure-changes.patch (renamed from data/patches/legacy-profiles.patch) | 9 |
2 files changed, 28 insertions, 3 deletions
diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch new file mode 100644 index 0000000..d586dc5 --- /dev/null +++ b/data/patches/fix-data-reporting-check.patch @@ -0,0 +1,22 @@ +--- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500 ++++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400 +@@ -3116,7 +3116,7 @@ + dnl If we have any service that uploads data (and requires data submission + dnl policy alert), set MOZ_DATA_REPORTING. + dnl We need SUBST for build system and DEFINE for xul preprocessor. +-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then ++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then + MOZ_DATA_REPORTING=1 + AC_DEFINE(MOZ_DATA_REPORTING) + AC_SUBST(MOZ_DATA_REPORTING) +--- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500 ++++ b/old-configure 2019-10-28 04:15:41.772322191 -0400 +@@ -12150,7 +12150,7 @@ + + + +-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then ++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then + MOZ_DATA_REPORTING=1 + cat >> confdefs.pytmp <<\EOF + (''' MOZ_DATA_REPORTING ''', ' 1 ') diff --git a/data/patches/legacy-profiles.patch b/data/patches/moz-configure-changes.patch index 33e9e99..aa6f1a5 100644 --- a/data/patches/legacy-profiles.patch +++ b/data/patches/moz-configure-changes.patch @@ -1,8 +1,11 @@ --- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 -@@ -7,7 +7,7 @@ ++++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 +@@ -5,9 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + imply_option('MOZ_PLACES', True) - imply_option('MOZ_SERVICES_HEALTHREPORT', True) +-imply_option('MOZ_SERVICES_HEALTHREPORT', True) ++imply_option('MOZ_SERVICES_HEALTHREPORT', False) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) +imply_option('MOZ_DEDICATED_PROFILES', False) |