From 7dc9898f519a85f7b0846f0e6b36a49cbf168864 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 18 Feb 2024 21:16:34 -0500 Subject: Switch GNU IceCat to follow upstream candidates Considering Mozilla publishes the RC build(s) the week before the release, following upstream candidate builds rather than waiting for final releases gives us (and distros packaging IceCat downstream) an additional week to prepare IceCat builds and do some testing before Mozilla formally announces the release and any security vulnerabilities discovered since the last release. * makeicecat (FFBUILD): Add variable for the candidate build number. (SOURCEBALL_URL): Update to point to candidate sourceballs instead. (ICECATVERSION): Incorporate FFBUILD in GNU IceCat's version. --- makeicecat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'makeicecat') diff --git a/makeicecat b/makeicecat index c100f23..19560ca 100755 --- a/makeicecat +++ b/makeicecat @@ -24,12 +24,13 @@ readonly FFMAJOR=115 readonly FFMINOR=8 readonly FFSUB=0 +readonly FFBUILD=1 readonly GNUVERSION=1 readonly SOURCEBALL_CHECKSUM='af8086f23efc8492d286671f6035b1a915de6f4ed5c7897e40be0e1cb6b895ea' readonly SOURCEBALL_SIGNINGKEY='14F26682D0916CDD81E37B6D61B7B526D98F0353' readonly FFVERSION=${FFMAJOR}.${FFMINOR}.${FFSUB} readonly SOURCEBALL=firefox-${FFVERSION}esr.source.tar.xz -readonly SOURCEBALL_URL=https://ftp.mozilla.org/pub/firefox/releases/${FFVERSION}esr/source/${SOURCEBALL} +readonly SOURCEBALL_URL=https://ftp.mozilla.org/pub/firefox/candidates/${FFVERSION}esr-candidates/build${FFBUILD}/source/${SOURCEBALL} readonly KEYSERVER=keyserver.ubuntu.com # branding @@ -49,7 +50,7 @@ readonly PREFS_OUT_FILE=/browser/browser/preferences/preferences.ftl # build environment, working directory, and outputs readonly DATADIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data -readonly ICECATVERSION=${FFVERSION}-gnu${GNUVERSION} +readonly ICECATVERSION=${FFVERSION}-${FFBUILD}gnu${GNUVERSION} readonly OUTPUT_SOURCEBALL=icecat-${ICECATVERSION}.tar.bz2 readonly SOURCEDIR=icecat-${FFVERSION} -- cgit v1.2.3