import UBI nspr-4.35.0-1.el8_8

This commit is contained in:
eabdullin 2023-09-21 08:56:58 +00:00
parent 3c1870f3a9
commit d4e60c6361
4 changed files with 15 additions and 38 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/nspr-4.34.tar.gz SOURCES/nspr-4.35.tar.gz

View File

@ -1 +1 @@
efea1385dc83c55018183257036206b5f2c77c59 SOURCES/nspr-4.34.tar.gz 71267859a581d61fea8d7d36c25f716750271cac SOURCES/nspr-4.35.tar.gz

View File

@ -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 #endif
#if defined(__i386__) #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 _PR_HAVE_ATOMIC_OPS
#define _MD_INIT_ATOMIC() #define _MD_INIT_ATOMIC()
extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val); 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); extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
#define _MD_ATOMIC_SET _PR_x86_AtomicSet #define _MD_ATOMIC_SET _PR_x86_AtomicSet
#endif #endif
@ -34,15 +25,7 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
#if defined(__ia64__) #if defined(__ia64__)
#define _PR_HAVE_ATOMIC_OPS #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 #endif
#if defined(__x86_64__) #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 _PR_HAVE_ATOMIC_OPS
#define _MD_INIT_ATOMIC() #define _MD_INIT_ATOMIC()
extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val); 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); extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
#endif #endif
+#endif +#endif
#if defined(__or1k__) #if defined(__loongarch__)
#if defined(__GNUC__) #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)

View File

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