diff -Nru nss-3.87.1/debian/changelog nss-3.87.1/debian/changelog
--- nss-3.87.1/debian/changelog	2023-02-15 00:22:38.000000000 +0000
+++ nss-3.87.1/debian/changelog	2023-11-27 00:59:56.000000000 +0000
@@ -1,3 +1,15 @@
+nss (2:3.87.1-1ubuntu0.1~rebuild2) lunar; urgency=medium
+
+  * Pass explicit -j 1 to make build.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 27 Nov 2023 13:59:56 +1300
+
+nss (2:3.87.1-1ubuntu0.1~rebuild1) lunar; urgency=medium
+
+  * Fix a warning.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 14 Jun 2023 22:09:31 +1200
+
 nss (2:3.87.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru nss-3.87.1/debian/control nss-3.87.1/debian/control
--- nss-3.87.1/debian/control	2022-05-31 21:30:45.000000000 +0000
+++ nss-3.87.1/debian/control	2023-06-14 10:10:16.000000000 +0000
@@ -1,7 +1,8 @@
 Source: nss
 Section: libs
 Priority: optional
-Maintainer: Maintainers of Mozilla-related packages <team+pkg-mozilla@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Maintainers of Mozilla-related packages <team+pkg-mozilla@tracker.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>
 Build-Depends: debhelper-compat (= 13),
  dpkg-dev (>= 1.17.14),
diff -Nru nss-3.87.1/debian/patches/fix-warning.patch nss-3.87.1/debian/patches/fix-warning.patch
--- nss-3.87.1/debian/patches/fix-warning.patch	1970-01-01 00:00:00.000000000 +0000
+++ nss-3.87.1/debian/patches/fix-warning.patch	2023-06-14 09:56:08.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/nss/lib/softoken/pkcs11c.c
++++ b/nss/lib/softoken/pkcs11c.c
+@@ -1496,7 +1496,7 @@
+         if (context->padDataLength != 0) {
+             /* fill in the padded to a full block size */
+             for (i = context->padDataLength;
+-                 (ulPartLen != 0) && i < context->blockSize; i++) {
++                 (ulPartLen != 0) && i < context->blockSize && i < 16; i++) {
+                 context->padBuf[i] = *pPart++;
+                 ulPartLen--;
+                 context->padDataLength++;
diff -Nru nss-3.87.1/debian/patches/series nss-3.87.1/debian/patches/series
--- nss-3.87.1/debian/patches/series	2021-11-01 22:39:53.000000000 +0000
+++ nss-3.87.1/debian/patches/series	2023-06-14 09:51:52.000000000 +0000
@@ -1,3 +1,4 @@
 38_hurd.patch
 80_security_tools.patch
 38_hppa.patch
+fix-warning.patch
diff -Nru nss-3.87.1/debian/rules nss-3.87.1/debian/rules
--- nss-3.87.1/debian/rules	2022-08-23 21:57:38.000000000 +0000
+++ nss-3.87.1/debian/rules	2023-11-27 00:48:00.000000000 +0000
@@ -59,7 +59,7 @@
 
 endef
 
-CFLAGS += -Wall -pipe
+CFLAGS += -Wall -pipe -O3
 
 DISTDIR := $(CURDIR)/dist
 
@@ -127,6 +127,7 @@
 		NSS_USE_SYSTEM_SQLITE=1 \
 		NSS_ENABLE_ECC=1 \
 		CHECKLOC= \
+		-j 1 \
 		$(TOOLCHAIN)
 
 override_dh_auto_clean: