commit 933d4b890546abc07729e455c3074783c5da62f2 Author: Georg Koppen gk@torproject.org Date: Fri Aug 21 20:14:00 2020 +0000

Downgrade NSS and SQLCipher for 61.0.10

We are about to switch to a previous `application-services` version which is the proper dependency for the `android-components` and `fenix` commits we'll use. However, that version requires an NSS and SQLCipher downgrade. The code that landed previously was based on a later `application-services` commit in the assumption that we'll use a tag which includes those changes by the time we would wire all our requirements for `fenix` together. --- projects/nss/config | 6 +++--- projects/sqlcipher/config | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/nss/config b/projects/nss/config index b260e77..2b5b4d3 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 3.54 -nspr_version: 4.26 +version: 3.53.1 +nspr_version: 4.25 var: container: use_container: 1 @@ -19,7 +19,7 @@ input_files: project: ninja - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_%5B% c("version") | replace("\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' name: nss - sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 + sha256sum: 132ce527f3963e3ae5be3337ed4e1099e160b9402be177b5704de3ed2f5271d2 - filename: configure.patch - filename: config.patch - filename: bug_13028.patch diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config index fb4ae3a..da78dcd 100644 --- a/projects/sqlcipher/config +++ b/projects/sqlcipher/config @@ -2,7 +2,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 4.4.0 +version: 4.3.0 var: container: use_container: 1 @@ -18,4 +18,4 @@ input_files: project: nss - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v%5B% c("version") %].tar.gz' name: sqlcipher - sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148 + sha256sum: fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f