CVS commit: pkgsrc/devel/nss

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 25 21:35:03 UTC 2026

Modified Files:
        pkgsrc/devel/nss: distinfo
        pkgsrc/devel/nss/patches: patch-me

Log Message:
nss: try fixing Solaris build using upstream suggestion


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/nss/patches/patch-me

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.205 pkgsrc/devel/nss/distinfo:1.206
--- pkgsrc/devel/nss/distinfo:1.205     Mon Feb 23 22:49:38 2026
+++ pkgsrc/devel/nss/distinfo   Wed Feb 25 21:35:03 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.205 2026/02/23 22:49:38 wiz Exp $
+$NetBSD: distinfo,v 1.206 2026/02/25 21:35:03 wiz Exp $
 
 BLAKE2s (nss-3.121.tar.gz) = abfcfe489335a3240df9b3dfb3663bf4681893fdeb7ec4751fb1ccd029737661
 SHA512 (nss-3.121.tar.gz) = 799cfb07bb806d3ab2786f7f1e88aa20ad490a0021a931b9382c08b08b6e6728367768335b05e15229f134275ee27ff153afaad78f07b394ef4c0b0e554e130c
 Size (nss-3.121.tar.gz) = 77644546 bytes
-SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
-SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
+SHA1 (patch-md) = ebc903bb19456bfa111fad3c101e3f18168b43b3
+SHA1 (patch-me) = 518044ccba92c0792fc4518c0c6c98d56f7e7c40
 SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6

Index: pkgsrc/devel/nss/patches/patch-me
diff -u pkgsrc/devel/nss/patches/patch-me:1.9 pkgsrc/devel/nss/patches/patch-me:1.10
--- pkgsrc/devel/nss/patches/patch-me:1.9       Fri Apr  9 06:40:59 2021
+++ pkgsrc/devel/nss/patches/patch-me   Wed Feb 25 21:35:03 2026
@@ -1,10 +1,13 @@
-$NetBSD: patch-me,v 1.9 2021/04/09 06:40:59 wiz Exp $
+$NetBSD: patch-me,v 1.10 2026/02/25 21:35:03 wiz Exp $
 
 clang for SunOS(?)
 
---- nss/lib/freebl/Makefile.orig       2020-03-06 18:44:20.000000000 +0000
+Try using preprocessed assembler file
+https://bugzilla.mozilla.org/show_bug.cgi?id=2019194
+
+--- nss/lib/freebl/Makefile.orig       2026-02-19 09:30:44.000000000 +0000
 +++ nss/lib/freebl/Makefile
-@@ -472,7 +472,11 @@ else
+@@ -508,7 +508,11 @@ else
      ifdef NS_USE_GCC
        LD = gcc
        AS = gcc
@@ -16,3 +19,12 @@ clang for SunOS(?)
      endif
      ifeq ($(USE_64),1)
        # Solaris for AMD64
+@@ -517,7 +521,7 @@ else
+           ASFLAGS += -march=opteron -m64 -fPIC
+           MPI_SRCS += mp_comba.c
+           # comment the next four lines to turn off Intel HW acceleration
+-          ASFILES += intel-gcm.S
++          ASFILES += intel-gcm.s
+           EXTRA_SRCS += intel-gcm-wrap.c
+           DEFINES += -DHAVE_PLATFORM_GCM
+           INTEL_GCM = 1