From f1c367895da284c85169038e02b07572355a9aec Mon Sep 17 00:00:00 2001
From: Thom Chiovoloni <tchiovoloni@mozilla.com>
Date: Tue, 28 Jan 2020 11:36:43 +0100
Subject: [PATCH] Set LTO to thin. Fixes #2531. [ci full]

Build with SQL Cipher 4.3.0 with NSS backend

Build with SQL Cipher 4.3.0
---
 CHANGES_UNRELEASED.md | 20 ++++++++++++++++++++
 libs/build-all.sh     | 32 ++++++++++++++------------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/CHANGES_UNRELEASED.md b/CHANGES_UNRELEASED.md
index f69a400afa..795b42a44b 100644
--- a/CHANGES_UNRELEASED.md
+++ b/CHANGES_UNRELEASED.md
@@ -2,4 +2,24 @@
 
 # Unreleased Changes
 
+<<<<<<< HEAD
 [Full Changelog](https://github.com/mozilla/application-services/compare/v0.53.0...master)
+=======
+[Full Changelog](https://github.com/mozilla/application-services/compare/v0.52.0...master)
+
+## FxA Client
+
+### What's changed
+
+- The `ensureCapabilities` method will not perform any network requests if the
+  given capabilities are already registered with the server.
+  ([#2681](https://github.com/mozilla/application-services/pull/2681)).
+
+## Libs
+
+### What's changed
+
+- The project now builds with version 4.3.0 of SQL Cipher instead of a fork
+  of version 4.2.0. Newest version has NSS crypto backend.
+  ([Issue #1386](https://github.com/mozilla/application-services/issues/1386)).
+>>>>>>> Set LTO to thin. Fixes #2531. [ci full]
diff --git a/libs/build-all.sh b/libs/build-all.sh
index 6ff2ba9a37..71ef28ce78 100755
--- a/libs/build-all.sh
+++ b/libs/build-all.sh
@@ -2,8 +2,8 @@
 
 set -euvx
 
-# SQLCIPHER_VERSION="4.1.0"
-# SQLCIPHER_SHA256="65144ca3ba4c0f9cd4bae8c20bb42f2b84424bf29d1ebcf04c44a728903b1faa"
+SQLCIPHER_VERSION="4.3.0"
+SQLCIPHER_SHA256="fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f"
 
 NSS="nss-3.46"
 NSS_ARCHIVE="nss-3.46-with-nspr-4.22.tar.gz"
@@ -46,22 +46,18 @@ if ! [[ -x "$(command -v tclsh)" ]]; then
   exit 1
 fi
 
-# Delete the following...
-rm -rf sqlcipher
-git clone --single-branch --branch nss-crypto-impl --depth 1 "https://github.com/eoger/sqlcipher.git"
-SQLCIPHER_SRC_PATH=$(abspath "sqlcipher")
-# ... and uncomment the following once SQLCipher has an NSS crypto backend.
-# SQLCIPHER="v${SQLCIPHER_VERSION}"
-# rm -rf "${SQLCIPHER}"
-# if [[ ! -e "${SQLCIPHER}.tar.gz" ]]; then
-#   echo "Downloading ${SQLCIPHER}.tar.gz"
-#   curl -sfSL --retry 5 --retry-delay 10 -O "https://github.com/sqlcipher/sqlcipher/archive/${SQLCIPHER}.tar.gz"
-# else
-#   echo "Using ${SQLCIPHER}.tar.gz"
-# fi
-# echo "${SQLCIPHER_SHA256}  ${SQLCIPHER}.tar.gz" | shasum -a 256 -c - || exit 2
-# tar xfz "${SQLCIPHER}.tar.gz"
-# SQLCIPHER_SRC_PATH=$(abspath "sqlcipher-${SQLCIPHER_VERSION}")
+# Use currrent version of SQL Cipher with NSS crypto backend
+SQLCIPHER="v${SQLCIPHER_VERSION}"
+rm -rf "${SQLCIPHER}"
+if [[ ! -e "${SQLCIPHER}.tar.gz" ]]; then
+  echo "Downloading ${SQLCIPHER}.tar.gz"
+  curl -sfSL --retry 5 --retry-delay 10 -O "https://github.com/sqlcipher/sqlcipher/archive/${SQLCIPHER}.tar.gz"
+else
+  echo "Using ${SQLCIPHER}.tar.gz"
+fi
+echo "${SQLCIPHER_SHA256}  ${SQLCIPHER}.tar.gz" | shasum -a 256 -c - || exit 2
+tar xfz "${SQLCIPHER}.tar.gz"
+SQLCIPHER_SRC_PATH=$(abspath "sqlcipher-${SQLCIPHER_VERSION}")
 
 rm -rf "${NSS}"
 if [[ ! -e "${NSS_ARCHIVE}" ]]; then