From fdcd9ee4acdf9c63a6d243cf817fa96f55ba8878 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Apr 10 2023 19:27:02 +0000 Subject: [PATCH 1/2] 112.0, update according to upstream changes --- diff --git a/release.sh b/release.sh index 916532c..622f31f 100755 --- a/release.sh +++ b/release.sh @@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=102.0 +brandingver=112.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch index 3125ec3..2fdab0a 100644 --- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch +++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch @@ -18,9 +18,9 @@ index d9c9384e97..ef67ae371e 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build @@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]: - DEFINES["MOZ_BACKGROUNDTASKS"] = True - - REQUIRES_UNIFIED_BUILD = True + FINAL_TARGET_PP_FILES += [ + "greprefs.js", + ] + +if CONFIG['MOZ_OFFICIAL_BRANDING']: + DEFINES['MOZ_OFFICIAL_BRANDING'] = True From 96dd50891ef8f709deb15a19c74f8ebfa15d79fe Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Jul 04 2023 20:51:58 +0000 Subject: [PATCH 2/2] 115.0 and try to make the tarball reproducible. --- diff --git a/release.sh b/release.sh index 622f31f..fd74ea0 100755 --- a/release.sh +++ b/release.sh @@ -1,9 +1,13 @@ #!/bin/bash +# Reproducible timestamp according to: +# https://reproducible-builds.org/docs/source-date-epoch/ +SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) + set -eu pkgname=iceweasel -brandingver=112.0 +brandingver=115.0 brandingrel=1 srcdir=src @@ -16,7 +20,15 @@ mkdir -pv $distdir cp -rv $srcdir/* $distdir/ rm -f ${tarball}{,.sig} -tar -cJf $tarball $distdir + +# Reproducible archive metadata according to: +# https://reproducible-builds.org/docs/archives/#full-example +tar --sort=name \ + --mtime="@${SOURCE_DATE_EPOCH}" \ + --owner=0 --group=0 --numeric-owner \ + --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ + -cJf $tarball $distdir + gpg --output ${tarball}.sig --detach-sig $tarball rm -rf $distdir diff --git a/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch index 9c8b146..ef66411 100644 --- a/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch +++ b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch @@ -14,16 +14,17 @@ index fc6c382171..059bc7b65d 100644 diff --git a/browser/base/content/overrides/app-license.html b/browser/base/content/overrides/app-license.html -index e7a158c792..290abbe35d 100644 +index eafe954..f17fb30 100644 --- a/browser/base/content/overrides/app-license.html +++ b/browser/base/content/overrides/app-license.html -@@ -2,5 +2,5 @@ - - License, v. 2.0. If a copy of the MPL was not distributed with this +@@ -3,6 +3,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -

Binaries of this product have been made available to you by the -- Mozilla Project under the Mozilla -+ Parabola GNU/Linux-libre project under the Mozilla - Public License 2.0 (MPL). Know your rights.

+

+ Binaries of this product have been made available to you by the +- Mozilla Project under the Mozilla Public ++ Parabola GNU/Linux-libre project under the Mozilla Public + License 2.0 (MPL). Know your rights. +

diff -u browser/locales/en-US/browser/aboutDialog.ftl{,.patched} --- a/browser/locales/en-US/browser/aboutDialog.ftl +++ b/browser/locales/en-US/browser/aboutDialog.ftl