From 896eadd21f026efc459bfd6ad15c306035533b4d Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 31 Dec 2019 05:19:59 +0000
Subject: [PATCH] firefox-privacy: new package at 1.0

---
 testing/firefox-privacy/build                      |  7 +++++++
 testing/firefox-privacy/checksums                  |  2 ++
 testing/firefox-privacy/depends                    |  1 +
 .../files/policies-1.0.json}                       |  0
 .../files/vendor-1.0.js}                           |  0
 testing/firefox-privacy/sources                    |  2 ++
 testing/firefox-privacy/version                    |  1 +
 testing/firefox/build                              |  3 ---
 testing/firefox/checksums                          |  2 --
 testing/firefox/post-install                       | 14 ++++++++++++++
 testing/firefox/sources                            |  2 --
 11 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100755 testing/firefox-privacy/build
 create mode 100644 testing/firefox-privacy/checksums
 create mode 100644 testing/firefox-privacy/depends
 rename testing/{firefox/files/policies.json => firefox-privacy/files/policies-1.0.json} (100%)
 rename testing/{firefox/files/vendor.js => firefox-privacy/files/vendor-1.0.js} (100%)
 create mode 100644 testing/firefox-privacy/sources
 create mode 100644 testing/firefox-privacy/version
 create mode 100755 testing/firefox/post-install

diff --git a/testing/firefox-privacy/build b/testing/firefox-privacy/build
new file mode 100755
index 00000000..40251477
--- /dev/null
+++ b/testing/firefox-privacy/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+install -Dm644 vendor-*.js \
+    "$1/usr/lib/firefox/browser/defaults/preferences/vendor.js"
+
+install -Dm644 policies-*.json \
+    "$1/usr/lib/firefox/distribution/policies.json"
diff --git a/testing/firefox-privacy/checksums b/testing/firefox-privacy/checksums
new file mode 100644
index 00000000..2c52a975
--- /dev/null
+++ b/testing/firefox-privacy/checksums
@@ -0,0 +1,2 @@
+cfc7d5006a3381e1b04f642b518317e19790ee31d23757274fdfeaba65c98b0c  vendor-1.0.js
+f4ce7ee2485256b3f8c2bc467445f14b4730a7b895b17de7a21711d78bcfedea  policies-1.0.json
diff --git a/testing/firefox-privacy/depends b/testing/firefox-privacy/depends
new file mode 100644
index 00000000..dbfb8f93
--- /dev/null
+++ b/testing/firefox-privacy/depends
@@ -0,0 +1 @@
+firefox
diff --git a/testing/firefox/files/policies.json b/testing/firefox-privacy/files/policies-1.0.json
similarity index 100%
rename from testing/firefox/files/policies.json
rename to testing/firefox-privacy/files/policies-1.0.json
diff --git a/testing/firefox/files/vendor.js b/testing/firefox-privacy/files/vendor-1.0.js
similarity index 100%
rename from testing/firefox/files/vendor.js
rename to testing/firefox-privacy/files/vendor-1.0.js
diff --git a/testing/firefox-privacy/sources b/testing/firefox-privacy/sources
new file mode 100644
index 00000000..5cd0524f
--- /dev/null
+++ b/testing/firefox-privacy/sources
@@ -0,0 +1,2 @@
+files/vendor-1.0.js
+files/policies-1.0.json
diff --git a/testing/firefox-privacy/version b/testing/firefox-privacy/version
new file mode 100644
index 00000000..f35ed484
--- /dev/null
+++ b/testing/firefox-privacy/version
@@ -0,0 +1 @@
+1.0 1
diff --git a/testing/firefox/build b/testing/firefox/build
index fb862887..abd96dfc 100755
--- a/testing/firefox/build
+++ b/testing/firefox/build
@@ -37,6 +37,3 @@ rm -f  "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi"
 rm -f  "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi"
 rm -f  "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi"
 rm -f  "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi"
-
-install -D vendor.js "$1/usr/lib/firefox/browser/defaults/preferences/vendor.js"
-install -D policies.json "$1/usr/lib/firefox/distribution/policies.json"
diff --git a/testing/firefox/checksums b/testing/firefox/checksums
index da0d0c26..f83f4962 100644
--- a/testing/firefox/checksums
+++ b/testing/firefox/checksums
@@ -2,8 +2,6 @@
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e  autoconf-2.13.tar.gz
 b5e70b12cc9dd18fffd7924a7d3a2e11574136fe0764359d08eba0755f1c5d4c  mozconfig
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
-cfc7d5006a3381e1b04f642b518317e19790ee31d23757274fdfeaba65c98b0c  vendor.js
-f4ce7ee2485256b3f8c2bc467445f14b4730a7b895b17de7a21711d78bcfedea  policies.json
 315880530f09175788dfa48a1915bfa1e190bfd3e267988b9100cb93006c808c  fix-fortify-system-wrappers.patch
 14f281ee323aa682e04479019171bde243ac6227820856aa03b162179b14bfd9  fix-seccomp-bpf.patch
 b19aaae7fc45db643f8d2540d96919c745ea341e36d9aea2df40e3e90eb951f0  fix-toolkit.patch
diff --git a/testing/firefox/post-install b/testing/firefox/post-install
new file mode 100755
index 00000000..99de9d2b
--- /dev/null
+++ b/testing/firefox/post-install
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cat <<EOF
+
+NOTE: Install the 'firefox-privacy' package to
+      enable extra privacy restrictions.
+
+NOTE: This includes more telemetry removals,
+      hardened settings, no phoning-home etc.
+
+-> kiss b firefox-privacy
+-> kiss i firefox-privacy
+
+EOF
diff --git a/testing/firefox/sources b/testing/firefox/sources
index aa09119e..7ab57a9d 100644
--- a/testing/firefox/sources
+++ b/testing/firefox/sources
@@ -2,8 +2,6 @@ https://archive.mozilla.org/pub/firefox/releases/72.0b11/source/firefox-72.0b11.
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 files/mozconfig
 files/stab.h toolkit/crashreporter/google-breakpad/src/
-files/vendor.js
-files/policies.json
 patches/fix-fortify-system-wrappers.patch
 patches/fix-seccomp-bpf.patch
 patches/fix-toolkit.patch