[tor-commits] [tor-messenger-build/master] Temporarily disable shipping certs

[sukhbir at torproject.org]

commit 65aa9a79684dc9f21882eb7f4f1b7feea53beef5
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Thu Nov 27 22:29:32 2014 +0530

    Temporarily disable shipping certs
---
 projects/instantbird/build  |    4 ++--
 projects/instantbird/config |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 5bfa723..a925891 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -37,8 +37,8 @@ for patch in $(ls -1 ../*.patch | sort)
 do
   patch -p1 < $patch
 done
-cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-cat ../ccc-jabber-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+# cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+# cat ../ccc-jabber-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 cd mozilla
 if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1
 then
diff --git a/projects/instantbird/config b/projects/instantbird/config
index ce37906..1fb3023 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -65,8 +65,6 @@ input_files:
   - filename: accountcreation.patch
   - filename: links.patch
   - filename: picture.patch
-  - filename: spi-cacert.der
-  - filename: ccc-jabber-cacert.der
   - filename: fix-mingw-build.nsprpatch
     enable: '[% c("var/windows") %]'
   - filename: fix-mingw-build.patch