开源软件构建与测试

_service:tar_scm:nspr.spec Changed

@@ -1,7 +1,7 @@
-%global nspr_version 4.32
+%global nspr_version 4.35
 Name:           nspr
-Version:        4.32.0
-Release:        1
+Version:        4.35.0
+Release:        2
 Summary:        Netscape Portable Runtime
 License:        MPLv2.0
 URL:            http://www.mozilla.org/projects/nspr
@@ -35,7 +35,8 @@
 %configure \
                  --includedir=%{_includedir}/nspr4 \
                  --enable-64bit \
-                 --enable-optimize="$RPM_OPT_FLAGS"
+                 --enable-optimize="$RPM_OPT_FLAGS" \
+                 --disable-debug
 %make_build
 date +"%e %B %Y" | tr -d '\n' > date.xml
 echo -n %{version} > version.xml
@@ -83,6 +84,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 24 2023 Wenyu Liu <liuwenyu7@huawei.com> - 4.35.0-2
+- disable debug option
+
+* Wed Dec 28 2022 Wenyu Liu <liuwenyu7@huawei.com> - 4.35.0-1
+- update to 4.35.0
+
+* Mon Nov 14 2022 zhaozhen <zhaozhen@loongson.cn> - 4.32.0-2
+- Support loongarch64
+
 * Mon Nov 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 4.32.0-1
 - update to 4.32.0

_service:tar_scm:nspr-gcc-atomics.patch Changed

@@ -1,12 +1,8 @@
 diff --git a/nspr/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h
+index ad57d08..57877b8 100644
 --- a/nspr/pr/include/md/_linux.h
 +++ b/nspr/pr/include/md/_linux.h
-@@ -96,53 +96,73 @@
- #define NO_DLOPEN_NULL
- #endif
- 
- #if defined(__FreeBSD_kernel__) || defined(__GNU__)
- #define _PR_HAVE_SOCKADDR_LEN
+@@ -105,6 +105,15 @@
  #endif
  
  #if defined(__i386__)
@@ -22,11 +18,7 @@
  #define _PR_HAVE_ATOMIC_OPS
  #define _MD_INIT_ATOMIC()
  extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
- 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
+@@ -116,6 +125,7 @@ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
  extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_AtomicSet
  #endif
@@ -34,15 +26,7 @@
  
  #if defined(__ia64__)
  #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- 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
+@@ -131,6 +141,15 @@ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
  #endif
  
  #if defined(__x86_64__)
@@ -58,20 +42,14 @@
  #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
- 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
+@@ -142,6 +161,7 @@ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
  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)
+-- 
+2.32.1 (Apple Git-133)
+

_service Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/.hg_archival.txt -> _service:tar_scm:nspr-4.35.tar.gz/nspr/.hg_archival.txt Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/configure -> _service:tar_scm:nspr-4.35.tar.gz/nspr/configure Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/configure.in -> _service:tar_scm:nspr-4.35.tar.gz/nspr/configure.in Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/include/md/_linux.cfg -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/include/md/_linux.cfg Changed

@@ -499,7 +499,7 @@
 #elif defined(__mips__)
 
 /* For _ABI64 */
-#include <sgidefs.h>
+#include <asm/sgidefs.h>
 
 #ifdef __MIPSEB__
 #define IS_BIG_ENDIAN 1
@@ -1255,6 +1255,52 @@
 #define PR_BYTES_PER_WORD_LOG2  3
 #define PR_BYTES_PER_DWORD_LOG2 3
 
+#elif defined(__loongarch64)
+
+#undef  IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#define IS_64
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   8
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   8
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    64
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    64
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   6
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   6
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    8
+#define PR_ALIGN_OF_INT64   8
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  8
+#define PR_ALIGN_OF_POINTER 8
+#define PR_ALIGN_OF_WORD    8
+
+#define PR_BYTES_PER_WORD_LOG2  3
+#define PR_BYTES_PER_DWORD_LOG2 3
+
 #else
 
 #error "Unknown CPU architecture"

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/include/md/_linux.h -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/include/md/_linux.h Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/include/prinit.h -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/include/prinit.h Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/include/private/pprthred.h -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/include/private/pprthred.h Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/include/prnetdb.h -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/include/prnetdb.h Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/io/prsocket.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/io/prsocket.c Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/md/unix/unix.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/md/unix/unix.c Changed

@@ -2755,8 +2755,8 @@
     _md_iovector._mmap64 = mmap64;
 #if (defined(ANDROID) && __ANDROID_API__ < 21)
     /* Same as the open64 case for Android. */
-    _md_iovector._fstat64 = fstat;
-    _md_iovector._stat64 = stat;
+    _md_iovector._fstat64 = (_MD_Fstat64)fstat;
+    _md_iovector._stat64 = (_MD_Stat64)stat;
 #else
     _md_iovector._fstat64 = fstat64;
     _md_iovector._stat64 = stat64;
@@ -3301,36 +3301,21 @@
 ** in a pre-emptive threaded environment, we need to use a lock.
 */
 
-void PR_XLock(void)
+void _PR_XLock(void)
 {
     PR_EnterMonitor(_pr_Xfe_mon);
 }
 
-void PR_XUnlock(void)
+void _PR_XUnlock(void)
 {
     PR_ExitMonitor(_pr_Xfe_mon);
 }
 
-PRBool PR_XIsLocked(void)
+PRBool _PR_XIsLocked(void)
 {
     return (PR_InMonitor(_pr_Xfe_mon)) ? PR_TRUE : PR_FALSE;
 }
 
-void PR_XWait(int ms)
-{
-    PR_Wait(_pr_Xfe_mon, PR_MillisecondsToInterval(ms));
-}
-
-void PR_XNotify(void)
-{
-    PR_Notify(_pr_Xfe_mon);
-}
-
-void PR_XNotifyAll(void)
-{
-    PR_NotifyAll(_pr_Xfe_mon);
-}
-
 #if defined(HAVE_FCNTL_FILE_LOCKING)
 
 PRStatus
@@ -3656,7 +3641,8 @@
         int events = filedesi.events;
         PRBool fdHasEvent = PR_FALSE;
 
-        if (osfd < 0) {
+        PR_ASSERT(osfd < FD_SETSIZE);
+        if (osfd < 0 || osfd >= FD_SETSIZE) {
             continue;  /* Skip this osfd. */
         }
 
@@ -3701,6 +3687,10 @@
             if (filedesi.fd < 0) {
                 continue;
             }
+            if (filedesi.fd >= FD_SETSIZE) {
+                filedesi.revents |= POLLNVAL;
+                continue;
+            }
             if (FD_ISSET(filedesi.fd, &rd)) {
                 if (filedesi.events & POLLIN) {
                     filedesi.revents |= POLLIN;

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/md/unix/uxwrap.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/md/unix/uxwrap.c Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/md/windows/w95sock.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/md/windows/w95sock.c Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/misc/prnetdb.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/misc/prnetdb.c Changed

@@ -2178,6 +2178,73 @@
 #endif
 }
 
+PR_IMPLEMENT(PRStatus)
+PR_GetPrefLoopbackAddrInfo(PRNetAddr *result,
+                           PRUint16 port)
+{
+    char          tmpBuf 40 ;
+    const int     tmpBufSize = sizeof( tmpBuf );
+
+    if (!result) {
+        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
+        return PR_FAILURE;
+    }
+
+    if (!_pr_initialized) _PR_ImplicitInitialization();
+
+    PR_snprintf(tmpBuf, tmpBufSize, "%u", port );
+
+#if !defined(_PR_HAVE_GETADDRINFO) || !defined(AI_PASSIVE)
+    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
+    return PR_FAILURE;
+#else
+
+    PRADDRINFO *res, hints;
+    PRStatus rv;
+
+    memset(&hints, 0, sizeof(hints));
+
+    rv = GETADDRINFO(NULL, tmpBuf, &hints, &res);
+    if (rv == 0) {
+        PRBool result_still_empty = PR_TRUE;
+        PRADDRINFO *ai = res;
+        do {
+            PRNetAddr aNetAddr;
+
+            while (ai && ai->ai_addrlen > sizeof(PRNetAddr))
+                ai = ai->ai_next;
+
+            if (ai) {
+                /* copy sockaddr to PRNetAddr */
+                memcpy(&aNetAddr, ai->ai_addr, ai->ai_addrlen);
+                aNetAddr.raw.family = ai->ai_addr->sa_family;
+#ifdef _PR_INET6
+                if (AF_INET6 == aNetAddr.raw.family)
+                    aNetAddr.raw.family = PR_AF_INET6;
+#endif
+                if (ai->ai_addrlen < sizeof(PRNetAddr))
+                    memset(((char*)result)+ai->ai_addrlen, 0,
+                           sizeof(PRNetAddr) - ai->ai_addrlen);
+            }
+
+            /* If we obtain more than one result, prefer IPv6. */
+            if (result_still_empty || aNetAddr.raw.family == PR_AF_INET6) {
+                memcpy(result, &aNetAddr, sizeof(PRNetAddr));
+            }
+            result_still_empty = PR_FALSE;
+            ai = ai->ai_next;
+        }
+        while (ai);
+
+        FREEADDRINFO(res);
+        return PR_SUCCESS;
+    }
+
+    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, rv);
+    return PR_FAILURE;
+#endif
+}
+
 PR_IMPLEMENT(void) PR_FreeAddrInfo(PRAddrInfo *ai)
 {
 #if defined(_PR_HAVE_GETADDRINFO)

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/misc/prsystem.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/misc/prsystem.c Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/src/nspr.def -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/src/nspr.def Changed

_service:tar_scm:nspr-4.32.tar.gz/nspr/pr/tests/vercheck.c -> _service:tar_scm:nspr-4.35.tar.gz/nspr/pr/tests/vercheck.c Changed

Changes of Revision 2