Rebase NSPR to 4.35 for NSS 3.90 for Fireffox ESR 115

Related: rhbz#2211858

.gitignore

@@ -1,2 +1,11 @@
+/nspr-4.17.0.tar.gz
+/nspr-4.19.0.tar.gz
+/nspr-4.20.tar.gz
+/nspr-4.21.tar.gz
+/nspr-4.25.tar.gz
+/nspr-4.30.tar.gz
+/nspr-4.31.tar.gz
+/nspr-4.32.tar.gz
 SOURCES/nspr-4.34.tar.gz
 /nspr-4.34.tar.gz
+/nspr-4.35.tar.gz

nspr-gcc-atomics.patch

@@ -1,12 +1,7 @@
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
+diff -up ./pr/include/md/_linux.h.gcc-atomics ./pr/include/md/_linux.h
---- a/pr/include/md/_linux.h
+--- ./pr/include/md/_linux.h.gcc-atomics	2022-09-20 11:23:22.008942926 -0700
-+++ b/pr/include/md/_linux.h
++++ ./pr/include/md/_linux.h	2022-09-20 11:34:45.536751340 -0700
-@@ -82,53 +82,73 @@
+@@ -105,6 +105,15 @@
- #define NO_DLOPEN_NULL
- #endif
- 
- #if defined(__FreeBSD_kernel__) || defined(__GNU__)
- #define _PR_HAVE_SOCKADDR_LEN
  #endif
  
  #if defined(__i386__)
@@ -22,11 +17,7 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
  #define _PR_HAVE_ATOMIC_OPS
  #define _MD_INIT_ATOMIC()
  extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
+@@ -116,6 +125,7 @@ extern PRInt32 _PR_x86_AtomicAdd(PRInt32
- extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
- extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
  extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_AtomicSet
  #endif
@@ -34,15 +25,7 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
  
  #if defined(__ia64__)
  #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
+@@ -131,6 +141,15 @@ extern PRInt32 _PR_ia64_AtomicSet(PRInt3
- extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT          _PR_ia64_AtomicIncrement
- extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
- extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
- extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
  #endif
  
  #if defined(__x86_64__)
@@ -58,20 +41,11 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
  #define _PR_HAVE_ATOMIC_OPS
  #define _MD_INIT_ATOMIC()
  extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
+@@ -142,6 +161,7 @@ extern PRInt32 _PR_x86_64_AtomicAdd(PRIn
- extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
- extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
  extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
  #endif
 +#endif
  
- #if defined(__or1k__)
+ #if defined(__loongarch__)
  #if defined(__GNUC__)
- /* Use GCC built-in functions */
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- #define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
- #define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)

nspr.spec

@@ -1,4 +1,4 @@
-%global nspr_version 4.34.0
+%global nspr_version 4.35.0
 
 # The upstream omits the trailing ".0", while we need it for
 # consistency with the pkg-config version:
@@ -11,7 +11,7 @@ rpm.define(string.format("nspr_archive_version %s",
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        %{nspr_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        MPLv2.0
 URL:            http://ftp.mozilla.org/pub/nspr/releases/v${nspr_archive_version}/src
 Group:          System Environment/Libraries
@@ -157,6 +157,9 @@ done
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jun 14 2023 Bob Relyea <rrelyea@redhat.com> - 4.34.0-1
+- Upste to NSPR 4.35
+
 * Wed Jun 15 2022 Bob Relyea <rrelyea@redhat.com> - 4.34.0-3
 - Coverity fix changed selfserv from passive to active, change it back
 

sources

@@ -1 +1 @@
-SHA512 (nspr-4.34.tar.gz) = 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
+SHA512 (nspr-4.35.tar.gz) = 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f