commit eff31e3a9673ba2561b94f66e4d98431b51b0742 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Feb 1 15:50:58 2016 -0500

Remove SPI root certificate as Debian no longer ships it (#13795) --- ChangeLog | 4 ++++ projects/instantbird/build | 1 - projects/instantbird/config | 1 - 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 7cc9673..c78ed29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tor Messenger -- + * All Platforms + * Remove SPI root certificate because Debian no longer ships it (#13795) + Tor Messenger 0.1.0b4 -- November 22 2015 * All Platforms * Bug 17492: Include default bridges configuration diff --git a/projects/instantbird/build b/projects/instantbird/build index 3bd8af9..1828857 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -51,7 +51,6 @@ for patch in $(ls -1 $rootdir/branding/*.patch | sort) do patch -p1 < $patch done -cat $rootdir/spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt

[% IF c("var/osx") -%] cp $rootdir/cert_override.txt im/app/profile diff --git a/projects/instantbird/config b/projects/instantbird/config index 868a3b8..213e413 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -55,7 +55,6 @@ input_files: - name: mozilla-src project: mozilla pkg_type: src - - filename: spi-cacert.der - filename: preferences.patch - filename: irc-default-server.patch - filename: top-protocols.patch