Replace NSS with Pale Moon's

security/nss/automation/clang-format/Dockerfile

@@ -5,14 +5,21 @@ LABEL maintainer="Martin Thomson <martin.thomson@gmail.com>"
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     ca-certificates \
-    clang-format-3.9 \
+    clang-format-10 \
     locales \
-    mercurial \
+    python-dev \
+    python-pip \
+    python-setuptools \
+    python-wheel \
+    build-essential \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get autoremove -y && apt-get clean -y
 
+RUN pip install mercurial==6.1.1
+
+
 RUN update-alternatives --install /usr/bin/clang-format \
-    clang-format $(which clang-format-3.9) 10
+    clang-format $(which clang-format-10) 10
 
 ENV SHELL /bin/bash
 ENV USER worker

security/nss/automation/clang-format/run_clang_format.sh

@@ -13,7 +13,7 @@ set -e
 # Any differences between formatted and unformatted files is printed to stdout to give a hint what's wrong.
 
 # Includes a default set of directories NOT to clang-format on.
-blacklist=(
+blocklist=(
      "./automation" \
      "./coreconf" \
      "./doc" \
@@ -37,8 +37,8 @@ fi
 
 format_folder()
 {
-    for black in "${blacklist[@]}"; do
-        if [[ "$1" == "$black"* ]]; then
+    for block in "${blocklist[@]}"; do
+        if [[ "$1" == "$block"* ]]; then
             echo "skip $1"
             return 1
         fi
@@ -54,7 +54,7 @@ for dir in "${dirs[@]}"; do
         if [ "${#c}" == "1" ]; then
             depth+=(-maxdepth 1)
         fi
-        find "$dir" "${depth[@]}" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -i {} \+
+        find "$dir" "${depth[@]}" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -sort-includes=false -i {} \+
     fi
 done