From 497cdf100f405204a22f5de96f142b9d040697e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Sep 2023 17:47:50 -0400 Subject: Update to 115.3.0. Thanks to Chippy for providing preliminary patches upon which these changes are based. * makeicecat (FFMAJOR, FFMINOR, SOURCEBALL_CHECKSUM): Update to 115.3.0. (fail, skip_thru_matching_endif, remove_if_block) (remove_if_block_in_file, sort_inner_list) (sort_inner_list_in_file): New shell functions. (configure, configure_search, apply_branding) (apply_batch_branding): Adapt to upstream changes. * data/patches/about-addons.patch: Adapt as needed. * data/patches/fix-data-reporting-check.patch, data/patches/reproducible-langpacks.patch: Remove obsolete patches. * data/settings.js: Block undesirable functionality. Use in place of . --- data/patches/reproducible-langpacks.patch | 45 ------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 data/patches/reproducible-langpacks.patch (limited to 'data/patches/reproducible-langpacks.patch') diff --git a/data/patches/reproducible-langpacks.patch b/data/patches/reproducible-langpacks.patch deleted file mode 100644 index b36a770..0000000 --- a/data/patches/reproducible-langpacks.patch +++ /dev/null @@ -1,45 +0,0 @@ -Prevent the extension manifests from embedding the current date. - -This is inspired by the Debian -"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for -their Firefox package as well as reproducible-builds.org guidelines from -https://reproducible-builds.org/docs/source-date-epoch/. - -Upstream status: https://phabricator.services.mozilla.com/D169979 - ---- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 -+++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 -@@ -36,6 +36,15 @@ - pushlog_api_url = "{0}/json-rev/{1}" - - -+import os -+import time -+import datetime -+ -+def get_build_date(): -+ """Honor SOURCE_DATE_EPOCH for reproducibility.""" -+ return datetime.datetime.utcfromtimestamp( -+ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) -+ - ### - # Retrievers a UTC datetime of the push for the current commit - # from a mercurial clone directory. -@@ -54,7 +63,7 @@ - with mozversioncontrol.get_repository_object(path=path) as repo: - phase = repo._run("log", "-r", ".", "-T" "{phase}") - if phase.strip() != "public": -- return datetime.datetime.utcnow() -+ return get_build_date() - repo_url = repo._run("paths", "default") - repo_url = repo_url.strip().replace("ssh://", "https://") - repo_url = repo_url.replace("hg://", "https://") -@@ -105,7 +114,7 @@ - dt = get_dt_from_hg(path) - - if dt is None: -- dt = datetime.datetime.utcnow() -+ dt = get_build_date() - - dt = dt.replace(microsecond=0) - return dt.strftime("%Y%m%d%H%M%S") -- cgit v1.2.3