commit b244f1543b96ae508be2086f3a65d41e20185ead
parent 9294f9a39b118c32bfb3ffdcdadbc89bcbafe8f1
Author: emmett1 <emmett1.2miligrams@protonmail.com>
Date: Sun, 28 Dec 2025 00:35:37 +0800
nss: updated to 3.119.1
Diffstat:
7 files changed, 15 insertions(+), 247 deletions(-)
diff --git a/repos/extra/nss/.checksum b/repos/extra/nss/.checksum
@@ -1,5 +1,2 @@
-c18020d6abe44ba040323663614767fcacb9a3c9dd249877c1deea76deb8adca clang-ias.patch
-eed65c57ec9da12513745bf6d039bf17459f75bd6fa1645aae7e9bcdcade0619 native-nsinstall-cflags.patch
-07fb0ac407330114abbeebcc9fce6383da81bab6500e30e4a9d09ac6f2a4858d nss-3.118.1.tar.gz
-08ab7f772b7f7d4ab1ead564b54398c19e74f62394d811a2c8df327176505de7 nss-3.92-standalone-1.patch
-19cf08686ecb10f8f51052c9168f7b3bb1bf3489465ccfe840b8d5b9837a86d5 respect-ldflags.patch
+cbfc62197671d8d85eb2ae63761985d72ac5c92a9378ff28899bbd3d5bb10c11 nss-3_119_1.tar.gz
+08ab7f772b7f7d4ab1ead564b54398c19e74f62394d811a2c8df327176505de7 nss-standalone-1.patch
diff --git a/repos/extra/nss/.files b/repos/extra/nss/.files
@@ -276,7 +276,6 @@ drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libnssdbm3.so
-rwxr-xr-x root/root usr/lib/libnsssysinit.so
-rwxr-xr-x root/root usr/lib/libnssutil3.so
--rwxr-xr-x root/root usr/lib/libpkcs11testmodule.so
-rwxr-xr-x root/root usr/lib/libsmime3.so
-rw-r--r-- root/root usr/lib/libsoftokn3.chk
-rwxr-xr-x root/root usr/lib/libsoftokn3.so
diff --git a/repos/extra/nss/abuild b/repos/extra/nss/abuild
@@ -1,23 +1,23 @@
name=nss
-version=3.118.1
+version=3.119.1
_version=$(echo $version | sed 's/\./_/g')
release=1
-source="https://archive.mozilla.org/pub/security/nss/releases/NSS_${_version}_RTM/src/nss-$version.tar.gz
- clang-ias.patch
- native-nsinstall-cflags.patch
- nss-3.92-standalone-1.patch
- respect-ldflags.patch"
+source="https://archive.mozilla.org/pub/security/nss/releases/NSS_${_version}_RTM/src/nss-$_version.tar.gz
+ nss-standalone-1.patch"
build() {
cd nss
- make BUILD_OPT=1 \
- NSPR_INCLUDE_DIR=/usr/include/nspr \
- USE_SYSTEM_ZLIB=1 \
- ZLIB_LIBS=-lz \
- NSS_ENABLE_WERROR=0 \
- USE_64=1 \
- NSS_USE_SYSTEM_SQLITE=1
+
+ export BUILD_OPT=1
+ export NSPR_INCLUDE_DIR=/usr/include/nspr
+ export USE_SYSTEM_ZLIB=1
+ export ZLIB_LIBS=-lz
+ export NSS_ENABLE_WERROR=0
+ export USE_64=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSS_DISABLE_GTESTS=1
+ make
cd ../dist
mkdir -p $PKG/usr/lib $PKG/usr/bin $PKG/usr/lib/pkgconfig
diff --git a/repos/extra/nss/clang-ias.patch b/repos/extra/nss/clang-ias.patch
@@ -1,207 +0,0 @@
-diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 7673357..1d2fe12 100644
---- a/nss/lib/freebl/Makefile
-+++ b/nss/lib/freebl/Makefile
-@@ -746,15 +746,6 @@ ifdef INTEL_GCM
- # GCM binary needs -mssse3
- #
- $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3
--
--# The integrated assembler in Clang 3.2 does not support % in the
--# expression of a .set directive. intel-gcm.s uses .set to give
--# symbolic names to registers, for example,
--# .set Htbl, %rdi
--# So we can't use Clang's integrated assembler with intel-gcm.s.
--ifdef CC_IS_CLANG
--$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): CFLAGS += -no-integrated-as
--endif
- endif
-
- ifdef INTEL_GCM_CLANG_CL
-diff --git a/nss/lib/freebl/ppc-gcm.s b/nss/lib/freebl/ppc-gcm.s
-index 06ad586..471c502 100644
---- a/nss/lib/freebl/ppc-gcm.s
-+++ b/nss/lib/freebl/ppc-gcm.s
-@@ -4,9 +4,6 @@
-
- # Registers:
-
--.set SP, 1
--.set TOCP, 2
--
- .macro VEC_LOAD_DATA VR, DATA, GPR
- addis \GPR, 2, \DATA@got@ha
- ld \GPR, \DATA@got@l(\GPR)
-@@ -90,8 +87,8 @@
- .type ppc_aes_gcmINIT,@function
- .align 5
- ppc_aes_gcmINIT:
--addis TOCP,12,(.TOC.-ppc_aes_gcmINIT)@ha
--addi TOCP,TOCP,(.TOC.-ppc_aes_gcmINIT)@l
-+addis %r2,12,(.TOC.-ppc_aes_gcmINIT)@ha
-+addi %r2,%r2,(.TOC.-ppc_aes_gcmINIT)@l
- .localentry ppc_aes_gcmINIT, .-ppc_aes_gcmINIT
-
- .set Htbl, 3
-@@ -255,8 +252,8 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmINIT)@l
- .type ppc_aes_gcmHASH,@function
- .align 5
- ppc_aes_gcmHASH:
--addis TOCP,12,(.TOC.-ppc_aes_gcmHASH)@ha
--addi TOCP,TOCP,(.TOC.-ppc_aes_gcmHASH)@l
-+addis %r2,12,(.TOC.-ppc_aes_gcmHASH)@ha
-+addi %r2,%r2,(.TOC.-ppc_aes_gcmHASH)@l
- .localentry ppc_aes_gcmHASH, .-ppc_aes_gcmHASH
-
- .set Htbl, 3
-@@ -290,13 +287,13 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmHASH)@l
- .set H4L, 31
-
- # store non-volatile vector registers
-- addi 7, SP, -16
-+ addi 7, %r1, -16
- stvx 31, 0, 7
-- addi 7, SP, -32
-+ addi 7, %r1, -32
- stvx 30, 0, 7
-- addi 7, SP, -48
-+ addi 7, %r1, -48
- stvx 29, 0, 7
-- addi 7, SP, -64
-+ addi 7, %r1, -64
- stvx 28, 0, 7
-
- VEC_LOAD_DATA SWAP_MASK, .Ldb_bswap_mask, 7
-@@ -482,13 +479,13 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmHASH)@l
- VEC_STORE D, Tp, 0
-
- # restore non-volatile vector registers
-- addi 7, SP, -16
-+ addi 7, %r1, -16
- lvx 31, 0, 7
-- addi 7, SP, -32
-+ addi 7, %r1, -32
- lvx 30, 0, 7
-- addi 7, SP, -48
-+ addi 7, %r1, -48
- lvx 29, 0, 7
-- addi 7, SP, -64
-+ addi 7, %r1, -64
- lvx 28, 0, 7
- blr
- .size ppc_aes_gcmHASH, . - ppc_aes_gcmHASH
-@@ -500,8 +497,8 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmHASH)@l
- .type ppc_aes_gcmTAG,@function
- .align 5
- ppc_aes_gcmTAG:
--addis TOCP,12,(.TOC.-ppc_aes_gcmTAG)@ha
--addi TOCP,TOCP,(.TOC.-ppc_aes_gcmTAG)@l
-+addis %r2,12,(.TOC.-ppc_aes_gcmTAG)@ha
-+addi %r2,%r2,(.TOC.-ppc_aes_gcmTAG)@l
- .localentry ppc_aes_gcmTAG, .-ppc_aes_gcmTAG
-
- .set Htbl, 3
-@@ -567,8 +564,8 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmTAG)@l
- .type ppc_aes_gcmCRYPT,@function
- .align 5
- ppc_aes_gcmCRYPT:
--addis TOCP,12,(.TOC.-ppc_aes_gcmCRYPT)@ha
--addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l
-+addis %r2,12,(.TOC.-ppc_aes_gcmCRYPT)@ha
-+addi %r2,%r2,(.TOC.-ppc_aes_gcmCRYPT)@l
- .localentry ppc_aes_gcmCRYPT, .-ppc_aes_gcmCRYPT
-
- .set PT, 3
-@@ -639,30 +636,30 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l
- .endm
-
- # store non-volatile general registers
-- std 31,-8(SP);
-- std 30,-16(SP);
-- std 29,-24(SP);
-- std 28,-32(SP);
-- std 27,-40(SP);
-- std 26,-48(SP);
-- std 25,-56(SP);
-+ std 31,-8(%r1);
-+ std 30,-16(%r1);
-+ std 29,-24(%r1);
-+ std 28,-32(%r1);
-+ std 27,-40(%r1);
-+ std 26,-48(%r1);
-+ std 25,-56(%r1);
-
- # store non-volatile vector registers
-- addi 9, SP, -80
-+ addi 9, %r1, -80
- stvx 31, 0, 9
-- addi 9, SP, -96
-+ addi 9, %r1, -96
- stvx 30, 0, 9
-- addi 9, SP, -112
-+ addi 9, %r1, -112
- stvx 29, 0, 9
-- addi 9, SP, -128
-+ addi 9, %r1, -128
- stvx 28, 0, 9
-- addi 9, SP, -144
-+ addi 9, %r1, -144
- stvx 27, 0, 9
-- addi 9, SP, -160
-+ addi 9, %r1, -160
- stvx 26, 0, 9
-- addi 9, SP, -176
-+ addi 9, %r1, -176
- stvx 25, 0, 9
-- addi 9, SP, -192
-+ addi 9, %r1, -192
- stvx 24, 0, 9
-
- VEC_LOAD_DATA SWAP_MASK, .Ldb_bswap_mask, 9
-@@ -1013,31 +1010,31 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l
- VEC_STORE CTR, CTRP, 0
-
- # restore non-volatile vector registers
-- addi 9, SP, -80
-+ addi 9, %r1, -80
- lvx 31, 0, 9
-- addi 9, SP, -96
-+ addi 9, %r1, -96
- lvx 30, 0, 9
-- addi 9, SP, -112
-+ addi 9, %r1, -112
- lvx 29, 0, 9
-- addi 9, SP, -128
-+ addi 9, %r1, -128
- lvx 28, 0, 9
-- addi 9, SP, -144
-+ addi 9, %r1, -144
- lvx 27, 0, 9
-- addi 9, SP, -160
-+ addi 9, %r1, -160
- lvx 26, 0, 9
-- addi 9, SP, -176
-+ addi 9, %r1, -176
- lvx 25, 0, 9
-- addi 9, SP, -192
-+ addi 9, %r1, -192
- lvx 24, 0, 9
-
- # restore non-volatile general registers
-- ld 31,-8(SP);
-- ld 30,-16(SP);
-- ld 29,-24(SP);
-- ld 28,-32(SP);
-- ld 27,-40(SP);
-- ld 26,-48(SP);
-- ld 25,-56(SP);
-+ ld 31,-8(%r1);
-+ ld 30,-16(%r1);
-+ ld 29,-24(%r1);
-+ ld 28,-32(%r1);
-+ ld 27,-40(%r1);
-+ ld 26,-48(%r1);
-+ ld 25,-56(%r1);
- blr
- .size ppc_aes_gcmCRYPT, . - ppc_aes_gcmCRYPT
-
diff --git a/repos/extra/nss/native-nsinstall-cflags.patch b/repos/extra/nss/native-nsinstall-cflags.patch
@@ -1,10 +0,0 @@
---- nss-3.80.orig/nss/coreconf/nsinstall/Makefile
-+++ nss-3.80/nss/coreconf/nsinstall/Makefile
-@@ -32,6 +32,7 @@ endif
-
- ifdef NATIVE_FLAGS
- OS_CFLAGS=$(NATIVE_FLAGS)
-+XCFLAGS = $(NATIVE_FLAGS)
- endif
-
- ifdef NATIVE_LDFLAGS
diff --git a/repos/extra/nss/nss-3.92-standalone-1.patch b/repos/extra/nss/nss-standalone-1.patch
diff --git a/repos/extra/nss/respect-ldflags.patch b/repos/extra/nss/respect-ldflags.patch
@@ -1,11 +0,0 @@
---- nss-3.67.orig/nss/coreconf/rules.mk
-+++ nss-3.67/nss/coreconf/rules.mk
-@@ -223,7 +223,7 @@ ifdef MT
- endif # MSVC with manifest tool
- endif
- else
-- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-+ $(MKSHLIB) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
- chmod +x $@
- endif
- endif
