svn commit: r409407 - in branches/2016Q1/devel/nspr: . files

[Jan Beich]

Author: jbeich
Date: Tue Feb 23 10:03:30 2016
New Revision: 409407
URL: https://svnweb.freebsd.org/changeset/ports/409407

Log:
  MFH: r409344
  
  devel/nspr: update to 4.12
  
  Changes:	http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-12-Release-td351657.html
  Approved by:	ports-secteam (feld)

Deleted:
  branches/2016Q1/devel/nspr/files/patch-bug782111
  branches/2016Q1/devel/nspr/files/patch-pr-include-md-freebsd.cfg
  branches/2016Q1/devel/nspr/files/patch-pr-include-md-freebsd.h
Modified:
  branches/2016Q1/devel/nspr/Makefile
  branches/2016Q1/devel/nspr/distinfo
  branches/2016Q1/devel/nspr/files/patch-warnings
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/devel/nspr/Makefile
==============================================================================
--- branches/2016Q1/devel/nspr/Makefile	Tue Feb 23 10:02:41 2016	(r409406)
+++ branches/2016Q1/devel/nspr/Makefile	Tue Feb 23 10:03:30 2016	(r409407)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.11
+DISTVERSION=	4.12
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 

Modified: branches/2016Q1/devel/nspr/distinfo
==============================================================================
--- branches/2016Q1/devel/nspr/distinfo	Tue Feb 23 10:02:41 2016	(r409406)
+++ branches/2016Q1/devel/nspr/distinfo	Tue Feb 23 10:03:30 2016	(r409407)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.11.tar.gz) = cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2
-SIZE (nspr-4.11.tar.gz) = 1134106
+SHA256 (nspr-4.12.tar.gz) = e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de
+SIZE (nspr-4.12.tar.gz) = 1135458

Modified: branches/2016Q1/devel/nspr/files/patch-warnings
==============================================================================
--- branches/2016Q1/devel/nspr/files/patch-warnings	Tue Feb 23 10:02:41 2016	(r409406)
+++ branches/2016Q1/devel/nspr/files/patch-warnings	Tue Feb 23 10:03:30 2016	(r409407)
@@ -18,37 +18,6 @@
  #endif
  
  NSPR_API(PRCounterHandle) 
---- pr/src/io/prprf.c.orig	2015-10-16 13:22:19 UTC
-+++ pr/src/io/prprf.c
-@@ -697,7 +697,7 @@ static int dosprintf(SprintfState *ss, c
-     char *hexp;
-     int rv, i;
-     struct NumArg* nas = NULL;
--    struct NumArg* nap;
-+    struct NumArg* nap = NULL;
-     struct NumArg  nasArray[ NAS_DEFAULT_NUM ];
-     char  pattern[20];
-     const char* dolPt = NULL;  /* in "%4$.2f", dolPt will point to . */
---- pr/src/io/prscanf.c.orig	2015-10-16 13:22:19 UTC
-+++ pr/src/io/prscanf.c
-@@ -194,7 +194,7 @@ static PRStatus
- GetInt(ScanfState *state, int code)
- {
-     char buf[FMAX + 1], *p;
--    int ch;
-+    int ch = -1;
-     static const char digits[] = "0123456789abcdefABCDEF";
-     PRBool seenDigit = PR_FALSE;
-     int base;
-@@ -304,7 +304,7 @@ static PRStatus
- GetFloat(ScanfState *state)
- {
-     char buf[FMAX + 1], *p;
--    int ch;
-+    int ch = -1;
-     PRBool seenDigit = PR_FALSE;
- 
-     if (state->width == 0 || state->width > FMAX) {
 --- pr/src/misc/pralarm.c.orig	2015-10-16 13:22:19 UTC
 +++ pr/src/misc/pralarm.c
 @@ -101,7 +101,7 @@ static void PR_CALLBACK pr_alarmNotifier
@@ -71,30 +40,8 @@
  		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
  		spec_case, try_quick;
  	Long L;
---- pr/src/misc/prtpool.c.orig	2015-10-16 13:22:19 UTC
-+++ pr/src/misc/prtpool.c
-@@ -281,8 +281,8 @@ PRThreadPool *tp = (PRThreadPool *) arg;
- int pollfd_cnt, pollfds_used;
- int rv;
- PRCList *qp, *nextqp;
--PRPollDesc *pollfds;
--PRJob **polljobs;
-+PRPollDesc *pollfds = NULL;
-+PRJob **polljobs = NULL;
- int poll_timeout;
- PRIntervalTime now;
- 
 --- pr/src/pthreads/ptio.c.orig	2015-10-16 13:22:19 UTC
 +++ pr/src/pthreads/ptio.c
-@@ -3765,7 +3765,7 @@ static PRInt32 _pr_poll_with_poll(
-      * We use these variables to figure out how much time has
-      * elapsed and how much of the timeout still remains.
-      */
--    PRIntervalTime start, elapsed, remaining;
-+    PRIntervalTime start = 0, elapsed, remaining;
- 
-     if (pt_TestAbort()) return -1;
- 
 @@ -4934,6 +4934,7 @@ PR_IMPLEMENT(PRInt32) PR_Select(
  
      if (timeout == PR_INTERVAL_NO_TIMEOUT) {