Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Builds with v4.3.0 instead of fork of older version of SQL Cipher [ci full] #2732

Closed
wants to merge 1 commit into from
+34 −18
Closed

Builds with v4.3.0 instead of fork of older version of SQL Cipher [ci full] #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CHANGES_UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,24 @@

# Unreleased Changes

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, looks like you need to resolve this conflict still (Let us know if you need help with this)

[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]
32 changes: 14 additions & 18 deletions libs/build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down