summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2023-07-04 22:51:58 +0200
committerbill-auger <mr.j.spam.me@gmail.com>2023-07-08 01:23:49 -0400
commitd59b3dfab54e2c12f22df3306ea9cccae063893f (patch)
treec9f52faece4585ff6817cae1c121ebf0e68e94f9
parent24d135484550be36c77b62ce3992fcad446ce2d3 (diff)
115.0 and try to make the tarball reproducible.115.0-1
-rwxr-xr-xrelease.sh16
-rw-r--r--src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch15
2 files changed, 22 insertions, 9 deletions
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
</vbox>
</vbox>
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/. -->
- <p><b>Binaries</b> of this product have been made available to you by the
-- <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
-+ <a href="https://www.parabola.nu/">Parabola GNU/Linux-libre project</a> under the Mozilla
- Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>
+ <p>
+ <b>Binaries</b> of this product have been made available to you by the
+- <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla Public
++ <a href="https://www.parabola.nu/">Parabola GNU/Linux-libre project</a> under the Mozilla Public
+ License 2.0 (MPL). <a href="about:rights">Know your rights</a>.
+ </p>
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