feat: update nss to 2:3.105-2

debian/changelog

@@ -1,3 +1,42 @@
+nss (2:3.105-2) unstable; urgency=medium
+
+  * debian/rules: Set OS_TEST properly on ppc64el.
+
+ -- Mike Hommey <[email protected]>  Wed, 02 Oct 2024 09:34:34 +0900
+
+nss (2:3.105-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/rules: Override OS_TEST and KERNEL even when not cross-compiling.
+    Closes: #1083086
+
+ -- Mike Hommey <[email protected]>  Wed, 02 Oct 2024 07:06:03 +0900
+
+nss (2:3.103-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Mike Hommey <[email protected]>  Wed, 07 Aug 2024 07:53:53 +0900
+
+nss (2:3.102-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Mike Hommey <[email protected]>  Wed, 10 Jul 2024 08:54:51 +0900
+
+nss (2:3.101-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/libnss3.symbols: Add NSS_3.101 and NSSUTIL_3.101 symbol versions.
+
+ -- Mike Hommey <[email protected]>  Wed, 12 Jun 2024 06:13:56 +0900
+
+nss (2:3.100-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Mike Hommey <[email protected]>  Wed, 15 May 2024 09:27:25 +0900
+
 nss (2:3.99-1) unstable; urgency=medium
 
   * New upstream release.

debian/libnss3.symbols

@@ -21,6 +21,7 @@ libnss3.so libnss3 #MINVER#
  HASH_GetType@NSS_3.12 2:3.13.4-2~
  (symver)NSS_3.10 2:3.13.4-2~
  (symver)NSS_3.10.2 2:3.13.4-2~
+ (symver)NSS_3.101 2:3.101
  (symver)NSS_3.11 2:3.13.4-2~
  (symver)NSS_3.11.1 2:3.13.4-2~
  (symver)NSS_3.11.2 2:3.13.4-2~
@@ -99,6 +100,7 @@ libnssdbm3.so libnss3 #MINVER#
  (symver)NSSDBM_3.12 2:3.13.4-2~
 libnssutil3.so libnss3 #MINVER#
 * Build-Depends-Package: libnss3-dev
+ (symver)NSSUTIL_3.101 2:3.101
  (symver)NSSUTIL_3.12 2:3.13.4-2~
  (symver)NSSUTIL_3.12.3 2:3.13.4-2~
  (symver)NSSUTIL_3.12.5 2:3.13.4-2~
@@ -121,6 +123,7 @@ libnssutil3.so libnss3 #MINVER#
 libsmime3.so libnss3 #MINVER#
 * Build-Depends-Package: libnss3-dev
  (symver)NSS_3.10 2:3.13.4-2~
+ (symver)NSS_3.101 2:3.101
  (symver)NSS_3.12.10 2:3.13.4-2~
  (symver)NSS_3.12.2 2:3.13.4-2~
  (symver)NSS_3.13 2:3.13.4-2~

debian/rules

@@ -45,9 +45,9 @@ TOOLCHAIN += CCC=$(CXX)
 ifeq ($(origin RANLIB),default)
 TOOLCHAIN += RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib
 endif
-TOOLCHAIN += OS_TEST=$(DEB_HOST_GNU_CPU)
-TOOLCHAIN += KERNEL=$(DEB_HOST_ARCH_OS)
 endif
+TOOLCHAIN += OS_TEST=$(if $(filter-out powerpc64le,$(DEB_HOST_GNU_CPU)),$(DEB_HOST_GNU_CPU),ppc64le)
+TOOLCHAIN += KERNEL=$(DEB_HOST_ARCH_OS)
 
 # $(foreach foo,$(list),$(call cmd,some command $(foo))) expands to
 #    some command first-elem

nss/.hg_archival.txt

@@ -1,4 +1,4 @@
 repo: 9949429068caa6bb8827a8ceeaa7c605d722f47f
-node: 3594a1841f437338d44afa970a527714d86f36c7
-branch: NSS_3_99_BRANCH
-tag: NSS_3_99_RTM
+node: c08d594c13fddb2f55e91222d8fc7cc1ac52abe7
+branch: default
+tag: NSS_3_105_RTM

nss/.taskcluster.yml

@@ -76,6 +76,16 @@ tasks:
         features:
           taskclusterProxy: true
 
+        artifacts:
+          'public/docker-contexts':
+            type: 'directory'
+            path: '/home/worker/docker-contexts'
+            # This needs to be at least the deadline of the
+            # decision task + the docker-image task deadlines.
+            # It is set to a week to allow for some time for
+            # debugging, but they are not useful long-term.
+            expires: {$fromNow: '7 day'}
+
       extra:
         treeherder:
           symbol: D

nss/Makefile

@@ -79,9 +79,6 @@ endif
 ifdef USE_64
 NSPR_CONFIGURE_OPTS += --enable-64bit
 endif
-ifeq ($(OS_TARGET),WIN95)
-NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
-endif
 ifdef USE_DEBUG_RTL
 NSPR_CONFIGURE_OPTS += --enable-debug-rtl
 endif
@@ -138,9 +135,14 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
 	--prefix='$(NSS_GYP_PREFIX)'
 endif
 
+ifndef NSS_DISABLE_NSPR_TESTS
 build_nspr: $(NSPR_CONFIG_STATUS)
 	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
+else
+build_nspr: $(NSPR_CONFIG_STATUS)
+	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+endif
 
 install_nspr: build_nspr
 	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install

nss/automation/abi-check/expected-report-libnss3.so.txt

@@ -5,11 +5,11 @@
     parameter 2 of type 'typedef SECOidTag' has sub-type changes:
       underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
         type size hasn't changed
-        2 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-          '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+        1 enumerator insertion:
+          '__anonymous_enum__::SEC_OID_MLKEM768X25519' value '389'
 
         1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+          '__anonymous_enum__::SEC_OID_TOTAL' from value '389' to '390' at secoidt.h:34:1
+
 
 

nss/automation/abi-check/expected-report-libnssutil3.so.txt

@@ -1,15 +1,15 @@
 
 1 function with some indirect sub-type change:
 
-  [C]'function SECStatus NSS_GetAlgorithmPolicy(SECOidTag, PRUint32*)' at secoid.c:2291:1 has some indirect sub-type changes:
-    parameter 1 of type 'typedef SECOidTag' has sub-type changes:
+  [C]'function SECOidTag HASH_GetHMACOidTagByHashOidTag_Util(SECOidTag)' at nsshash.c:146:1 has some indirect sub-type changes:
+    return type changed:
       underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
         type size hasn't changed
-        2 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-          '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+        1 enumerator insertion:
+          '__anonymous_enum__::SEC_OID_MLKEM768X25519' value '389'
 
         1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+          '__anonymous_enum__::SEC_OID_TOTAL' from value '389' to '390' at secoidt.h:34:1
+
 
 

nss/automation/abi-check/expected-report-libsmime3.so.txt

@@ -1,8 +1,4 @@
 
-1 Added function:
-
-  'function PRBool NSS_CMSRecipient_IsSupported(CERTCertificate*)'    {NSS_CMSRecipient_IsSupported@@NSS_3.99}
-
 1 function with some indirect sub-type change:
 
   [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:426:1 has some indirect sub-type changes:
@@ -17,29 +13,29 @@
                1 data member changes (3 filtered):
                 type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
                   in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
-                    underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:463:1 changed:
+                    underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:470:1 changed:
                       type size hasn't changed
                       1 data member changes (1 filtered):
                        type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
                          in pointed to type 'NSSCMSAttribute*':
                            in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
-                             underlying type 'struct NSSCMSAttributeStr' at cmst.h:482:1 changed:
+                             underlying type 'struct NSSCMSAttributeStr' at cmst.h:489:1 changed:
                                type size hasn't changed
                                1 data member change:
                                 type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
                                   in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
-                                    underlying type 'struct SECOidDataStr' at secoidt.h:536:1 changed:
+                                    underlying type 'struct SECOidDataStr' at secoidt.h:553:1 changed:
                                       type size hasn't changed
                                       1 data member change:
                                        type of 'SECOidTag SECOidDataStr::offset' changed:
                                          underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
                                            type size hasn't changed
-                                           2 enumerator insertions:
-                                             '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-                                             '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+                                           1 enumerator insertion:
+                                             '__anonymous_enum__::SEC_OID_MLKEM768X25519' value '389'
 
                                            1 enumerator change:
-                                             '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+                                             '__anonymous_enum__::SEC_OID_TOTAL' from value '389' to '390' at secoidt.h:34:1
+
 
 
 

nss/automation/abi-check/previous-nss-release

@@ -1 +1 @@
-NSS_3_98_BRANCH
+NSS_3_104_BRANCH

nss/automation/clang-format/Dockerfile

@@ -1,25 +1,17 @@
-# Minimal image with clang-format 3.9.
-FROM ubuntu:18.04
-LABEL maintainer="Martin Thomson <martin.thomson@gmail.com>"
+# Minimal image with clang-format-13
+FROM debian:bookworm-20240904-slim
+LABEL maintainer="John Schanck <jschanck@mozilla.com>"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    clang-format-10 \
+    clang-format-13 \
     locales \
-    python-dev \
-    python-pip \
-    python-setuptools \
-    python-wheel \
-    build-essential \
+    mercurial \
  && 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-10) 10
+    clang-format $(which clang-format-13) 13
 
 ENV SHELL /bin/bash
 ENV USER worker

nss/automation/taskcluster/docker-acvp/bin/checkout.sh

@@ -17,9 +17,10 @@ hg clone -r $REVISION $REPOSITORY nss
 # Clone NSPR if needed.
 hg clone -r default https://hg.mozilla.org/projects/nspr
 
-if [[ -f nss/nspr.patch && "$ALLOW_NSPR_PATCH" == "1" ]]; then
-  pushd nspr
+pushd nspr
+hg revert --all
+if [[ -f ../nss/nspr.patch && "$ALLOW_NSPR_PATCH" == "1" ]]; then
   cat ../nss/nspr.patch | patch -p1
-  popd
 fi
+popd
 

nss/automation/taskcluster/docker-builds/Dockerfile

@@ -72,7 +72,7 @@ RUN chmod +x $HOME/bin/*
 USER $USER
 
 # Install golang for bogo tests
-RUN curl https://dl.google.com/go/go1.21.6.linux-amd64.tar.gz -sLf | tar xzf - -C $HOME
+RUN curl https://dl.google.com/go/go1.23.1.linux-amd64.tar.gz -sLf | tar xzf - -C $HOME
 ENV PATH "$PATH:$HOME/go/bin"
 
 # Set a default command for debugging.

nss/automation/taskcluster/docker-clang-format/Dockerfile

@@ -1,18 +1,18 @@
-# Minimal image with clang-format 10
-FROM ubuntu:bionic-20221215
-LABEL maintainer="Martin Thomson <martin.thomson@gmail.com>"
+# Minimal image with clang-format-13
+FROM debian:bookworm-20240904-slim
+LABEL maintainer="John Schanck <jschanck@mozilla.com>"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     ca-certificates \
-    clang-format-10 \
+    clang-format-13 \
     locales \
     mercurial \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get autoremove -y && apt-get clean -y
 
 RUN update-alternatives --install /usr/bin/clang-format \
-    clang-format $(which clang-format-10) 10
+    clang-format $(which clang-format-13) 13
 
 ENV SHELL /bin/bash
 ENV USER worker