[tor-commits] [tor-browser-build/master] Bug 27320: Add nssckbi library to mar-tools

[gk at torproject.org]

commit bec987dfaae5e683a15e09a1e722b0de15161c52
Author: JeremyRand <biolizard89 at gmail.com>
Date:   Sat Sep 8 13:24:59 2018 +0000

    Bug 27320: Add nssckbi library to mar-tools
    
    This library is needed for a subset of certutil's functionality
    (specifically, the ability for certutil to change the trust settings of
    built-in certificates).
---
 projects/firefox/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 1b5a942..c9330fa 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -195,7 +195,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 [% IF c("var/linux") %]
   cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
   cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/
-  NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
+  NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
   NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
   for LIB in $NSS_LIBS $NSPR_LIBS; do
       cp -p obj-*/dist/bin/$LIB $MARTOOLS/
@@ -204,7 +204,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 [% IF c("var/osx") %]
   cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
   cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/
-  NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib"
+  NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib"
   for LIB in $NSS_LIBS; do
       cp -p obj-*/dist/bin/$LIB $MARTOOLS/
   done
@@ -212,7 +212,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 [% IF c("var/windows") %]
   cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/
   cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/
-  NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll"
+  NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll"
   for LIB in $NSS_LIBS; do
       cp -p obj-*/dist/bin/$LIB $MARTOOLS/
   done