From 49cc4b98130feebf2fa01385f0b6e921b08be8cf Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 27 Apr 2022 10:25:15 +0200 Subject: [PATCH] add disable-verify-mar patch --- assets/disable-verify-mar.patch | 26 ++++++++++++++++++++++++++ mk.py | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 assets/disable-verify-mar.patch diff --git a/assets/disable-verify-mar.patch b/assets/disable-verify-mar.patch new file mode 100644 index 0000000..898a4ef --- /dev/null +++ b/assets/disable-verify-mar.patch @@ -0,0 +1,26 @@ +diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build +index a4dae3f..312873c 100644 +--- a/toolkit/components/maintenanceservice/moz.build ++++ b/toolkit/components/maintenanceservice/moz.build +@@ -18,7 +18,7 @@ USE_LIBS += [ + ] + + # For debugging purposes only +-# DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True ++DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True + + DEFINES["UNICODE"] = True + DEFINES["_UNICODE"] = True +diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build +index 1a52a88..59d100c 100644 +--- a/toolkit/mozapps/update/tests/moz.build ++++ b/toolkit/mozapps/update/tests/moz.build +@@ -59,7 +59,7 @@ if CONFIG["MOZ_MAINTENANCE_SERVICE"]: + DEFINES["MOZ_MAINTENANCE_SERVICE"] = CONFIG["MOZ_MAINTENANCE_SERVICE"] + + # For debugging purposes only +-# DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True ++DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True + + if CONFIG["CC_TYPE"] == "clang-cl": + WIN32_EXE_LDFLAGS += ["-ENTRY:wmainCRTStartup"] diff --git a/mk.py b/mk.py index e597587..1a4e1cc 100644 --- a/mk.py +++ b/mk.py @@ -40,7 +40,9 @@ def build(debug=False): exec('cp -v ../assets/mozconfig.windows.debug mozconfig') else: exec('cp -v ../assets/mozconfig.windows mozconfig') - + + # two patches for windows only, currently + patch('../assets/disable-verify-mar.patch') patch('../assets/package-manifest.patch') # perform the build and package