From 0e62f73e904ddec79a9cf707abfda3a807176315 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Jan 26 2014 18:24:28 +0000
Subject: import nspr-4.10.2-4.el7.src.rpm


---

diff --git a/.nspr.metadata b/.nspr.metadata
index aec3f18..daa0640 100644
--- a/.nspr.metadata
+++ b/.nspr.metadata
@@ -1 +1 @@
-415966084cb51379e7a7afe052aaf45743b0b7ad SOURCES/nspr-4.10.tar.bz2
+c9252c0993977519d526dea0ba5442c5bfb91690 SOURCES/nspr-4.10.2.tar.bz2
diff --git a/SOURCES/nspr-561901.patch b/SOURCES/nspr-561901.patch
new file mode 100644
index 0000000..45dfc58
--- /dev/null
+++ b/SOURCES/nspr-561901.patch
@@ -0,0 +1,13 @@
+diff -up ./nspr/pr/src/pthreads/ptthread.c.s390x ./nspr/pr/src/pthreads/ptthread.c
+--- ./nspr/pr/src/pthreads/ptthread.c.s390x	2012-03-01 18:25:40.922241580 -0800
++++ ./nspr/pr/src/pthreads/ptthread.c	2012-03-01 18:27:12.759116440 -0800
+@@ -836,6 +836,9 @@ static void _pt_thread_death_internal(vo
+ #if defined(DEBUG)
+     memset(thred, 0xaf, sizeof(PRThread));
+ #endif /* defined(DEBUG) */
++#if defined(__s390x__)
++    if (callDestructors)
++#endif
+     PR_Free(thred);
+ }  /* _pt_thread_death */
+ 
diff --git a/SPECS/nspr.spec b/SPECS/nspr.spec
index 260427c..0570035 100644
--- a/SPECS/nspr.spec
+++ b/SPECS/nspr.spec
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.10
-Release:        3%{?dist}
+Version:        4.10.2
+Release:        4%{?dist}
 License:        MPLv2.0
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -15,6 +15,8 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        nspr-config.xml
 
 Patch1:         nspr-config-pc.patch
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=853902
+Patch2:         nspr-561901.patch
 
 %description
 NSPR provides platform independence for non-GUI operating system 
@@ -45,7 +47,8 @@ Header files for doing development with the Netscape Portable Runtime.
 # that go into nspr.pc for pkg-config.
 
 cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
-%patch1 -p0 -b flags
+%patch1 -p0 -b .flags
+%patch2 -p0
 
 %build
 
@@ -139,6 +142,25 @@ done
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 4.10.2-4
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 4.10.2-3
+- Mass rebuild 2013-12-27
+
+* Fri Nov 29 2013 Elio Maldonado <emaldona@redhat.com> - 4.10.2-2
+- Restore previously used s390x patch as it isn't upstream yet
+- Related: rhbz#1031465 - CVE-2013-5607
+
+* Sat Nov 23 2013 Elio Maldonado <emaldona@redhat.com> - 4.10.2-1
+- Update to NSPR_4_10_2_RTM
+- Avoid unsigned integer wrapping in PL_ArenaAllocate
+- Resolves: rhbz#1031465 - CVE-2013-5607
+
+* Fri Nov 22 2013 Elio Maldonado <emaldona@redhat.com> - 4.10-4
+- Avoid unsigned integer wrapping in PL_ArenaAllocate
+- Resolves: rhbz#1031465
+
 * Fri Aug 02 2013 Elio Maldonado <emaldona@redhat.com> - 4.10-3
 - Update information on the provenance of the upstream sources