Unverified Commit bec987df authored by JeremyRand's avatar JeremyRand
Browse files

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).
parent b40b18fc

projects/firefox/build

+3 −3
Original line number Diff line number Diff line
@@ -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