[tor-commits] [tor-browser-build/master] Bug 27320: Add certutil and signmar to macOS mar-tools

[gk at torproject.org]

commit b40b18fc4b0e87b8536be04383258b2cd4e4c69b
Author: JeremyRand <biolizard89 at gmail.com>
Date:   Sat Sep 8 12:25:01 2018 +0000

    Bug 27320: Add certutil and signmar to macOS mar-tools
    
    These binaries were already being built but were being discarded.
    Since reproducible builds of these tools for macOS are likely to be
    useful to some people (even though they're not required for Tor Browser
    to operate), it seems like they're worth distributing.
    
    They're placed in the mar-tools zip because that's where they were
    already being placed for Linux.
---
 projects/firefox/build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/projects/firefox/build b/projects/firefox/build
index da7640a..1b5a942 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -201,6 +201,14 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
       cp -p obj-*/dist/bin/$LIB $MARTOOLS/
   done
 [% END %]
+[% 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"
+  for LIB in $NSS_LIBS; do
+      cp -p obj-*/dist/bin/$LIB $MARTOOLS/
+  done
+[% END %]
 [% 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/