Index: devel/nspr/Makefile =================================================================== --- devel/nspr/Makefile (revision 400752) +++ devel/nspr/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.10.9 +DISTVERSION= 4.10.10 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src Index: devel/nspr/distinfo =================================================================== --- devel/nspr/distinfo (revision 400752) +++ devel/nspr/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (nspr-4.10.9.tar.gz) = 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881 -SIZE (nspr-4.10.9.tar.gz) = 1134015 +SHA256 (nspr-4.10.10.tar.gz) = 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 +SIZE (nspr-4.10.10.tar.gz) = 1134164 Index: devel/nspr/files/patch-tests =================================================================== --- devel/nspr/files/patch-tests (revision 400752) +++ devel/nspr/files/patch-tests (working copy) @@ -1,6 +1,50 @@ ---- ../pr/tests/cleanup.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/cleanup.c Tue Jul 12 01:19:53 2005 -@@ -48,5 +48,5 @@ +--- ../lib/tests/Makefile.in.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../lib/tests/Makefile.in 2015-11-04 02:02:20.438739000 +0000 +@@ -167,7 +167,7 @@ else + ifeq ($(OS_ARCH),OS2) + $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) + else +- $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@ ++ $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@ + endif + endif + endif +--- ../pr/tests/Makefile.in.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/Makefile.in 2015-11-04 02:02:20.439768000 +0000 +@@ -489,17 +489,18 @@ endif + ALWAYS: + + runtests:: $(PROGS) ALWAYS +- @$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n" +- @$(ECHO) "BEGIN\t\t\t`date`" +- @$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n" +- @$(ECHO) "Test\t\t\tResult\n" ++ @$(ECHO) "NSPR Test Results - $(OBJDIR)" ++ @$(ECHO) "BEGIN `date`" ++ @$(ECHO) "Test Result" + @cd $(OBJDIR); for i in $(PROGRAMS); do \ +- $(ECHO) "$$i\c"; \ +- ./$$i >> $(LOGFILE) 2>&1 ; \ ++ printf "$$i"; \ ++ ./$$i > $$i.output 2>&1; \ + if [ 0 = $$? ] ; then \ +- $(ECHO) "\t\t\tPassed"; \ +- else \ +- $(ECHO) "\t\t\tFAILED"; \ +- fi; \ ++ $(ECHO) " Passed"; \ ++ rm $$i.output; \ ++ else \ ++ $(ECHO) " FAILED"; \ ++ cat $$i.output; \ ++ fi; \ + done +- @$(ECHO) "\nEND\t\t`date`\n" ++ @$(ECHO) "END `date`" +--- ../pr/tests/cleanup.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/cleanup.c 2015-11-04 02:02:20.433719000 +0000 +@@ -15,7 +15,7 @@ + static void PR_CALLBACK Thread(void *sleep) { - PR_Sleep(PR_SecondsToInterval((PRUint32)sleep)); @@ -7,7 +51,9 @@ + PR_Sleep(PR_SecondsToInterval((intptr_t)sleep)); printf("Thread exiting\n"); } -@@ -72,5 +72,6 @@ + +@@ -39,7 +39,8 @@ int main(int argc, char **argv) + PRThreadScope type = PR_LOCAL_THREAD; PRFileDesc *err = PR_GetSpecialFD(PR_StandardError); PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:"); - PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1; @@ -15,7 +61,9 @@ + intptr_t child_sleep = 10; PR_STDIO_INIT(); -@@ -113,5 +114,5 @@ + while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) +@@ -80,7 +81,7 @@ int main(int argc, char **argv) + (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL"); PR_fprintf(err, "\tConcurrency: %d\n", concurrency); PR_fprintf(err, "\tNumber of threads: %d\n", threads); - PR_fprintf(err, "\tThread sleep: %d\n", child_sleep); @@ -22,16 +70,29 @@ + PR_fprintf(err, "\tThread sleep: %d\n", (int)child_sleep); PR_fprintf(err, "\tMain sleep: %d\n", main_sleep); PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT "); ---- ../pr/tests/cvar.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/cvar.c Tue Jul 12 01:22:52 2005 -@@ -174,5 +174,5 @@ + +--- ../pr/tests/cltsrv.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/cltsrv.c 2015-11-04 02:02:20.467222000 +0000 +@@ -887,7 +887,7 @@ int main(int argc, char** argv) { + PRUintn index; + PRBool boolean; +- CSClient_t *client; ++ CSClient_t *client = NULL; + PRStatus rv, joinStatus; + CSServer_t *server = NULL; + +--- ../pr/tests/cvar.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/cvar.c 2015-11-04 02:02:20.434287000 +0000 +@@ -135,14 +135,14 @@ static int alive; + static void PR_CALLBACK CXReader(void *arg) + { CircBuf *cbp = (CircBuf *)arg; - PRInt32 i, n; + intptr_t i, n; void *data; -@@ -180,6 +180,6 @@ + n = count / 2; for (i = 0; i < n; i++) { data = GetCBData(cbp); - if ((int)data != i) @@ -40,7 +101,9 @@ + if (debug_mode) printf("data mismatch at for i = %ld usec\n", (long)i); } -@@ -193,5 +193,5 @@ + PR_EnterMonitor(mon); +@@ -154,7 +154,7 @@ static void PR_CALLBACK CXReader(void *a + static void PR_CALLBACK CXWriter(void *arg) { CircBuf *cbp = (CircBuf *)arg; - PRInt32 i, n; @@ -47,9 +110,170 @@ + intptr_t i, n; n = count / 2; ---- ../pr/tests/foreign.c Mon Mar 7 20:22:57 2005 -+++ ../pr/tests/foreign.c Tue Jul 12 01:25:31 2005 -@@ -269,5 +269,5 @@ + for (i = 0; i < n; i++) +--- ../pr/tests/cvar2.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/cvar2.c 2015-11-04 02:02:20.452205000 +0000 +@@ -95,7 +95,7 @@ PrivateCondVarThread(void *_info) + for (index=0; indexloops; index++) { + PR_Lock(info->lock); + if (*info->tcount == 0) { +- DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n", ++ DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n", + PR_GetCurrentThread(), info->cvar)); + PR_WaitCondVar(info->cvar, info->timeout); + } +@@ -108,8 +108,8 @@ PrivateCondVarThread(void *_info) + PR_Lock(info->exitlock); + (*info->exitcount)++; + PR_NotifyCondVar(info->exitcvar); +-DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n", +- PR_GetCurrentThread(), info->exitcvar,(*info->exitcount))); ++DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n", ++ PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount))); + PR_Unlock(info->exitlock); + } + #if 0 +@@ -157,7 +157,7 @@ CreateTestThread(threadinfo *info, + void + CondVarTestSUU(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -189,7 +189,7 @@ CondVarTestSUU(void *_arg) + PR_TRUE, + PR_LOCAL_THREAD); + index++; +- DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread)); ++ DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread)); + } + + for (loops = 0; loops < count; loops++) { +@@ -199,7 +199,7 @@ CondVarTestSUU(void *_arg) + (*list[index].tcount)++; + PR_NotifyCondVar(list[index].cvar); + PR_Unlock(list[index].lock); +- DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n", ++ DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n", + PR_GetCurrentThread(), list[index].cvar)); + } + +@@ -227,7 +227,7 @@ CondVarTestSUU(void *_arg) + void + CondVarTestSUK(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -301,7 +301,7 @@ CondVarTestSUK(void *_arg) + void + CondVarTestPUU(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -336,7 +336,7 @@ CondVarTestPUU(void *_arg) + PR_FALSE, + PR_LOCAL_THREAD); + +- DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread)); ++ DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread)); + index++; + tcount++; + } +@@ -354,8 +354,8 @@ CondVarTestPUU(void *_arg) + PR_Lock(exitlock); + /* Wait for threads to finish */ + while(exitcount < arg) { +-DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n", +- PR_GetCurrentThread(), exitcvar, exitcount)); ++DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n", ++ PR_GetCurrentThread(), exitcvar, (int)exitcount)); + PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60)); + } + PR_ASSERT(exitcount >= arg); +@@ -365,7 +365,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx w + + /* Join all the threads */ + for(index=0; index<(arg); index++) { +- DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread)); ++ DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread)); + PR_JoinThread(list[index].thread); + if (list[index].internal) { + PR_Lock(list[index].lock); +@@ -387,7 +387,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx w + void + CondVarTestPUK(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -468,7 +468,7 @@ CondVarTestPUK(void *_arg) + void + CondVarTest(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -601,7 +601,7 @@ CondVarTest(void *_arg) + void + CondVarTimeoutTest(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -712,7 +712,7 @@ CondVarTimeoutTest(void *_arg) + void + CondVarMixedTest(void *_arg) + { +- PRInt32 arg = (PRInt32)_arg; ++ PRInt32 arg = (PRInt32)(intptr_t)_arg; + PRInt32 index, loops; + threadinfo *list; + PRLock *sharedlock; +@@ -802,7 +802,7 @@ CondVarMixedTest(void *_arg) + for(index=0; index<(arg*4); index+=3) { + + PR_Lock(list[index].lock); +- *list[index].tcount++; ++ list[index].tcount++; + PR_NotifyCondVar(list[index].cvar); + PR_Unlock(list[index].lock); + +@@ -873,7 +873,7 @@ static void Measure(void (*func)(void *) + double d; + + start = PR_IntervalNow(); +- (*func)((void *)arg); ++ (*func)((void *)(intptr_t)arg); + stop = PR_IntervalNow(); + + d = (double)PR_IntervalToMicroseconds(stop - start); +@@ -932,7 +932,7 @@ default_threads, default_threads*2, defa + PR_SetConcurrency(2); + + for (threads = default_threads; threads < default_threads*5; threads+=default_threads) { +- printf("\n%ld Thread tests\n", threads); ++ printf("\n%d Thread tests\n", (int)threads); + Measure(CondVarTestSUU, threads, "Condvar simple test shared UU"); + Measure(CondVarTestSUK, threads, "Condvar simple test shared UK"); + Measure(CondVarTestPUU, threads, "Condvar simple test priv UU"); +--- ../pr/tests/foreign.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/foreign.c 2015-11-04 02:02:20.434883000 +0000 +@@ -202,7 +202,7 @@ static void OneShot(void *arg) + PRFileDesc *fd; PRDir *dir; PRFileDesc *pair[2]; - PRIntn test = (PRIntn)arg; @@ -56,7 +280,9 @@ + intptr_t test = (intptr_t)arg; for (test = 0; test < 12; ++test) { -@@ -364,5 +364,5 @@ + +@@ -302,7 +302,7 @@ static void OneShot(void *arg) + int main(int argc, char **argv) { PRStatus rv; - PRInt32 thread_cnt = DEFAULT_THREAD_COUNT; @@ -63,9 +289,11 @@ + intptr_t thread_cnt = DEFAULT_THREAD_COUNT; PLOptStatus os; PLOptState *opt = PL_CreateOptState(argc, argv, "dt:"); ---- ../pr/tests/forktest.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/forktest.c Tue Jul 12 01:28:15 2005 -@@ -80,5 +80,5 @@ + +--- ../pr/tests/forktest.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/forktest.c 2015-11-04 02:02:20.435492000 +0000 +@@ -47,7 +47,7 @@ ClientThreadFunc(void *arg) + { PRNetAddr addr; PRFileDesc *sock = NULL; - PRInt32 tmp = (PRInt32)arg; @@ -72,7 +300,9 @@ + intptr_t tmp = (intptr_t)arg; /* -@@ -176,5 +176,5 @@ + * Make sure the PR_Accept call will block +@@ -143,7 +143,7 @@ DoIO(void) + goto finish; } clientThread = PR_CreateThread( PR_USER_THREAD, ClientThreadFunc, - (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, @@ -79,135 +309,21 @@ + (void *)(intptr_t)PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0); if (clientThread == NULL) { -@@ -185,2 +185,5 @@ + fprintf(stderr, "Cannot create client thread: (%d, %d)\n", +@@ -151,6 +151,9 @@ DoIO(void) + failed_already = 1; + goto finish; } + printf("Wait one second before accept\n"); + fflush(stdout); + PR_Sleep(PR_SecondsToInterval(1)); printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port)); ---- ../pr/tests/mbcs.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/mbcs.c Tue Jul 12 01:34:26 2005 -@@ -87,5 +87,5 @@ - ** Traverse directory - */ --static void TraverseDirectory( unsigned char *dir ) -+static void TraverseDirectory(const char *dir) - { - PRDir *cwd; -@@ -93,5 +93,4 @@ - PRFileInfo info; - PRStatus rc; -- PRInt32 err; - PRFileDesc *fd; - char nextDir[256]; -@@ -114,14 +114,14 @@ - } - if ( PR_FILE_FILE == info.type ) { -- printf("File: %s \tsize: %ld\n", dirEntry->name, info.size ); -+ printf("File: %s \tsize: %ld\n", dirEntry->name, (long)info.size ); - fd = PR_Open( file, PR_RDONLY, 0 ); - if ( NULL == fd ) { - printf("PR_Open() failed. Error: %ld, OSError: %ld\n", -- PR_GetError(), PR_GetOSError()); -+ (long)PR_GetError(), (long)PR_GetOSError()); - } - rc = PR_Close( fd ); - if ( PR_FAILURE == rc ) { - printf("PR_Close() failed. Error: %ld, OSError: %ld\n", -- PR_GetError(), PR_GetOSError()); -+ (long)PR_GetError(), (long)PR_GetOSError()); - } - } else if ( PR_FILE_DIRECTORY == info.type ) { ---- ../pr/tests/nonblock.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/nonblock.c Tue Jul 12 01:37:52 2005 -@@ -84,5 +84,5 @@ - clientThreadFunc(void *arg) - { -- PRUintn port = (PRUintn)arg; -+ intptr_t port = (intptr_t)arg; - PRFileDesc *sock; - PRNetAddr addr; -@@ -196,5 +196,5 @@ - - clientThread = PR_CreateThread(PR_USER_THREAD, -- clientThreadFunc, (void *) listenPort, -+ clientThreadFunc, (void *) (intptr_t)listenPort, - PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, - PR_UNJOINABLE_THREAD, 0); -@@ -240,5 +240,5 @@ - PL_PrintError("First Receive:\n"); - fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n", -- retVal, PR_GetError()); -+ (long)retVal, (long)PR_GetError()); - exit(1); - } -@@ -250,5 +250,5 @@ - PL_PrintError("Second Receive:\n"); - fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", -- retVal, PR_GetError()); -+ (long)retVal, (long)PR_GetError()); - exit(1); - } ---- ../pr/tests/peek.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/peek.c Tue Jul 12 01:41:44 2005 -@@ -168,5 +168,5 @@ - PRFileDesc *sock; - PRSocketOptionData opt; -- PRUint16 port = (PRUint16) arg; -+ PRUint16 port = (intptr_t) arg; - PRNetAddr addr; - char buf[BUFFER_SIZE]; -@@ -332,5 +332,5 @@ - } - client = PR_CreateThread( -- PR_USER_THREAD, ClientNB, (void *) port, -+ PR_USER_THREAD, ClientNB, (void *)(intptr_t) port, - PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0); - if (NULL == client) { ---- ../pr/tests/pipepong.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/pipepong.c Tue Jul 12 01:43:52 2005 -@@ -69,5 +69,5 @@ - fprintf(stderr, "pong process: received \"%s\"\n", buf); - if (nBytes != 5) { -- fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n", -+ fprintf(stderr, "pong process: expected 5 bytes but got %zd bytes\n", - nBytes); - exit(1); ---- ../pr/tests/poll_nm.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/poll_nm.c Tue Jul 12 01:45:57 2005 -@@ -97,5 +97,5 @@ - clientThreadFunc(void *arg) - { -- PRUintn port = (PRUintn) arg; -+ PRUintn port = (intptr_t) arg; - PRFileDesc *sock; - PRNetAddr addr; -@@ -251,5 +251,5 @@ - - clientThread = PR_CreateThread(PR_USER_THREAD, -- clientThreadFunc, (void *) listenPort1, -+ clientThreadFunc, (void *)(intptr_t)listenPort1, - PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, - PR_UNJOINABLE_THREAD, 0); -@@ -261,5 +261,5 @@ - - clientThread = PR_CreateThread(PR_USER_THREAD, -- clientThreadFunc, (void *) listenPort2, -+ clientThreadFunc, (void *)(intptr_t)listenPort2, - PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, - PR_UNJOINABLE_THREAD, 0); ---- ../lib/tests/Makefile.in Sun Nov 7 21:52:55 2004 -+++ ../lib/tests/Makefile.in Tue Jul 12 01:49:15 2005 -@@ -247,5 +247,5 @@ - $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) - else -- $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@ -+ $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@ - endif - endif ---- ../pr/tests/getai.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/getai.c Tue Jul 12 02:20:40 2005 -@@ -46,6 +46,11 @@ + fflush(stdout); + sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5)); +--- ../pr/tests/getai.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/getai.c 2015-11-04 02:02:20.439194000 +0000 +@@ -13,8 +13,13 @@ int main(int argc, char **argv) + PRAddrInfo *ai; void *iter; PRNetAddr addr; + const char *host; @@ -220,52 +336,27 @@ + ai = PR_GetAddrInfoByName(host, PR_AF_UNSPEC, PR_AI_ADDRCONFIG); if (ai == NULL) { fprintf(stderr, "PR_GetAddrInfoByName failed: (%d, %d)\n", ---- ../pr/tests/Makefile.in Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/Makefile.in Tue Jul 12 02:25:18 2005 -@@ -556,16 +557,17 @@ + PR_GetError(), PR_GetOSError()); +--- ../pr/tests/instrumt.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/instrumt.c 2015-11-04 02:02:20.440472000 +0000 +@@ -36,6 +36,7 @@ + */ - runtests:: $(PROGS) ALWAYS -- @$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n" -- @$(ECHO) "BEGIN\t\t\t`date`" -- @$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n" -- @$(ECHO) "Test\t\t\tResult\n" -+ @$(ECHO) "NSPR Test Results - $(OBJDIR)" -+ @$(ECHO) "BEGIN `date`" -+ @$(ECHO) "Test Result" - @cd $(OBJDIR); for i in $(PROGRAMS); do \ -- $(ECHO) "$$i\c"; \ -- ./$$i >> $(LOGFILE) 2>&1 ; \ -+ printf "$$i"; \ -+ ./$$i > $$i.output 2>&1; \ - if [ 0 = $$? ] ; then \ -- $(ECHO) "\t\t\tPassed"; \ -- else \ -- $(ECHO) "\t\t\tFAILED"; \ -- fi; \ -+ $(ECHO) " Passed"; \ -+ rm $$i.output; \ -+ else \ -+ $(ECHO) " FAILED"; \ -+ cat $$i.output; \ -+ fi; \ - done -- @$(ECHO) "\nEND\t\t`date`\n" -+ @$(ECHO) "END `date`" ---- ../pr/tests/instrumt.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/instrumt.c Mon Jul 25 20:45:54 2005 -@@ -69,4 +69,5 @@ - #include +#define DEBUG #include #include -@@ -83,5 +84,4 @@ + #include +@@ -50,7 +51,6 @@ + #define COUNT_LIMIT (10 * ( 1024)) #define SMALL_TRACE_BUFSIZE ( 60 * 1024 ) - typedef enum { -@@ -111,8 +111,8 @@ + CountLoop = 1, +@@ -78,10 +78,10 @@ static void Help(void) + static void ListCounters(void) { +#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS) @@ -275,7 +366,9 @@ - const char **qname = &qn, **rname = &rn, **desc = &dn; PRUint32 tCtr; -@@ -125,6 +125,6 @@ + PR_INIT_COUNTER_HANDLE( qh, NULL ); +@@ -92,7 +92,7 @@ static void ListCounters(void) + PR_FIND_NEXT_COUNTER_RNAME(rh, rh, qh ); while ( rh != NULL ) { - PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc ); @@ -283,7 +376,8 @@ PR_GET_COUNTER(tCtr, rh); PR_LOG( lm, msgLevel, ( "QName: %s RName: %s Desc: %s Value: %ld\n", -@@ -134,13 +134,13 @@ +@@ -101,15 +101,15 @@ static void ListCounters(void) + } PR_FIND_NEXT_COUNTER_QNAME(qh, qh); } - return; @@ -299,7 +393,9 @@ - const char **qname = &qn, **rname = &rn, **desc = &dn; PR_INIT_TRACE_HANDLE( qh, NULL ); -@@ -152,5 +152,5 @@ + PR_FIND_NEXT_TRACE_QNAME(qh, qh ); +@@ -119,7 +119,7 @@ static void ListTraces(void) + PR_FIND_NEXT_TRACE_RNAME(rh, rh, qh ); while ( rh != NULL ) { - PR_GET_TRACE_NAME_FROM_HANDLE( rh, qname, rname, desc ); @@ -306,7 +402,9 @@ + PR_GET_TRACE_NAME_FROM_HANDLE( rh, &qn, &rn, &dn ); PR_LOG( lm, msgLevel, ( "QName: %s RName: %s Desc: %s", -@@ -160,5 +160,5 @@ + qn, rn, dn )); +@@ -127,7 +127,7 @@ static void ListTraces(void) + } PR_FIND_NEXT_TRACE_QNAME(qh, qh); } - return; @@ -313,7 +411,9 @@ +#endif } /* end ListCounters() */ -@@ -359,5 +359,5 @@ + +@@ -326,7 +326,7 @@ static void PR_CALLBACK SampleTrace( voi + */ static void TraceTest( void ) { - PRInt32 i; @@ -320,9 +420,80 @@ + PRIntn i = 0; PRInt32 size; PR_DEFINE_TRACE( th ); ---- ../pr/tests/layer.c Fri Apr 29 18:46:05 2005 -+++ ../pr/tests/layer.c Mon Jul 25 20:53:03 2005 -@@ -78,5 +78,8 @@ + PRThread *t1, *t2; +--- ../pr/tests/io_timeout.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/io_timeout.c 2015-11-04 02:02:20.452831000 +0000 +@@ -22,11 +22,13 @@ + /* Used to get the command line option */ + #include "plgetopt.h" + ++#include + #include ++#include + #include "nspr.h" + + #define NUM_THREADS 1 +-#define BASE_PORT 8000 ++#define BASE_PORT 38011 + #define DEFAULT_ACCEPT_TIMEOUT 2 + + typedef struct threadInfo { +@@ -38,7 +40,7 @@ typedef struct threadInfo { + } threadInfo; + + PRIntn failed_already = 0; +-PRIntn debug_mode = 0; ++PRIntn debug_mode = 1; + + #define LOCAL_SCOPE_STRING "LOCAL scope" + #define GLOBAL_SCOPE_STRING "GLOBAL scope" +@@ -54,7 +56,7 @@ thread_main(void *_info) + PRFileDesc *clientSock; + PRStatus rv; + PRThreadScope tscope; +- char *scope_str; ++ const char *scope_str; + + + if (debug_mode) +@@ -73,6 +75,7 @@ thread_main(void *_info) + break; + default: + PR_NOT_REACHED("Invalid thread scope"); ++ scope_str = NULL; + break; + } + printf("thread id %d, scope %s\n", info->id, scope_str); +@@ -91,7 +94,12 @@ thread_main(void *_info) + rv = PR_Bind(listenSock, &listenAddr); + if (rv == PR_FAILURE) { + if (debug_mode) +- printf("unable to bind\n"); ++ printf("unable to bind to %d: %s\n", ++ BASE_PORT + info->id, strerror(PR_GetOSError())); ++ if (PR_GetOSError() == EADDRINUSE) { ++ printf("can not proceed with this test\n"); ++ exit(0); ++ } + failed_already=1; + goto dead; + } +@@ -113,8 +121,9 @@ thread_main(void *_info) + if (clientSock == NULL) { + if (PR_GetError() == PR_IO_TIMEOUT_ERROR) { + if (debug_mode) { +- printf("PR_Accept() timeout worked!\n"); +- printf("TEST PASSED! PR_Accept() returned error %d\n", ++ printf("PR_Accept() timeout worked!\n" ++ "TEST PASSED! PR_Accept() returned error " ++ "PR_IO_TIMEOUT_ERROR (%ld)\n", + PR_IO_TIMEOUT_ERROR); + } + } else { +--- ../pr/tests/layer.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/layer.c 2015-11-04 02:02:20.441092000 +0000 +@@ -45,7 +45,10 @@ static PRUint16 default_port = 12273; + static PRFileDesc *PushLayer(PRFileDesc *stack) { PRFileDesc *layer = PR_CreateIOLayerStub(identity, &myMethods); - PRStatus rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer); @@ -332,45 +503,94 @@ + PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer); if (verbosity > quiet) PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer, stack); ---- ../pr/tests/lazyinit.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/lazyinit.c Mon Jul 25 20:54:18 2005 -@@ -76,5 +76,4 @@ + PR_ASSERT(PR_SUCCESS == rv); +--- ../pr/tests/lazyinit.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/lazyinit.c 2015-11-04 02:02:20.441575000 +0000 +@@ -43,7 +43,6 @@ int main(int argc, char **argv) + char *path = NULL; PRDir *dir = NULL; PRLock *ml = NULL; - PRCondVar *cv = NULL; PRThread *thread = NULL; PRIntervalTime interval = 0; ---- ../pr/tests/lltest.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/lltest.c Mon Jul 25 20:57:30 2005 -@@ -578,4 +578,5 @@ + PRFileDesc *file, *udp, *tcp, *pair[2]; +--- ../pr/tests/lltest.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/lltest.c 2015-11-04 02:02:20.442340000 +0000 +@@ -545,6 +545,7 @@ TestConversion( void ) + return; } +#if 0 static void ShiftCompileOnly() { -@@ -594,4 +595,5 @@ + /* +@@ -561,6 +562,7 @@ static void ShiftCompileOnly() + LL_ISHL(ia, 49, 32); } /* ShiftCompileOnly */ +#endif -@@ -668,5 +670,4 @@ + /* +@@ -635,7 +637,6 @@ TestArithmetic( void ) + PRInt64 largeValPlusOne = LL_INIT( 0x00000002, 0x00000000 ); PRInt64 largeValTimesTwo = LL_INIT( 0x00000003, 0xfffffffe ); PRInt64 largeMultCand = LL_INIT( 0x00000000, 0x7fffffff ); - PRInt64 largeMinusMultCand = LL_INIT( 0xffffffff, 0x10000001 ); PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 ); PRInt64 largeNumSHL5 = LL_INIT( 0x0000001f, 0xffffffe0 ); ---- ../pr/tests/nbconn.c Fri Apr 29 18:46:05 2005 -+++ ../pr/tests/nbconn.c Mon Jul 25 21:00:51 2005 -@@ -93,6 +93,5 @@ + PRInt64 result, result2; +--- ../pr/tests/mbcs.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/mbcs.c 2015-11-04 02:02:20.436041000 +0000 +@@ -54,13 +54,12 @@ char *dirName = NULL; /* directory nam + /* + ** Traverse directory + */ +-static void TraverseDirectory( unsigned char *dir ) ++static void TraverseDirectory(const char *dir) + { + PRDir *cwd; + PRDirEntry *dirEntry; + PRFileInfo info; + PRStatus rc; +- PRInt32 err; + PRFileDesc *fd; + char nextDir[256]; + char file[256]; +@@ -81,16 +80,16 @@ static void TraverseDirectory( unsigned + exit(1); + } + if ( PR_FILE_FILE == info.type ) { +- printf("File: %s \tsize: %ld\n", dirEntry->name, info.size ); ++ printf("File: %s \tsize: %ld\n", dirEntry->name, (long)info.size ); + fd = PR_Open( file, PR_RDONLY, 0 ); + if ( NULL == fd ) { + printf("PR_Open() failed. Error: %ld, OSError: %ld\n", +- PR_GetError(), PR_GetOSError()); ++ (long)PR_GetError(), (long)PR_GetOSError()); + } + rc = PR_Close( fd ); + if ( PR_FAILURE == rc ) { + printf("PR_Close() failed. Error: %ld, OSError: %ld\n", +- PR_GetError(), PR_GetOSError()); ++ (long)PR_GetError(), (long)PR_GetOSError()); + } + } else if ( PR_FILE_DIRECTORY == info.type ) { + sprintf( nextDir, "%s/%s", dir, dirEntry->name ); +--- ../pr/tests/nbconn.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/nbconn.c 2015-11-04 02:02:20.443098000 +0000 +@@ -54,8 +54,7 @@ int main(int argc, char **argv) + PRStatus rv; PRSocketOptionData optData; const char *hostname = NULL; - PRIntn default_case, n, bytes_read, bytes_sent; - PRInt32 failed_already = 0; + PRIntn default_case, n; - #ifdef XP_MAC - int index; -@@ -226,5 +225,5 @@ + + /* + * -d debug mode +@@ -164,7 +163,7 @@ int main(int argc, char **argv) + exit(1); } printf( "PR_GetConnectStatus: connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -377,7 +597,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); } PR_Close(sock); -@@ -300,5 +299,5 @@ + printf( "PASS\n"); +@@ -235,7 +234,7 @@ connection_success_test() + PRThread *thr = NULL; Server_Param sp; char send_buf[DATA_BUF_SIZE], recv_buf[DATA_BUF_SIZE]; - PRIntn default_case, n, bytes_read, bytes_sent; @@ -384,7 +606,9 @@ + PRIntn n, bytes_read, bytes_sent; PRIntn failed_already = 0; -@@ -376,5 +375,5 @@ + /* +@@ -311,7 +310,7 @@ connection_success_test() + failed_already=1; goto def_exit; } - DPRINTF(("Created TCP_Server thread [0x%x]\n",thr)); @@ -391,7 +615,9 @@ + DPRINTF(("Created TCP_Server thread [%p]\n", thr)); pd.fd = conn_fd; pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; -@@ -459,5 +458,5 @@ + n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT); +@@ -390,7 +389,7 @@ connection_success_test() + DPRINTF(("Data integrity verified\n")); } else { fprintf(stderr,"PR_GetConnectStatus: connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -398,15 +624,19 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already = 1; goto def_exit; -@@ -569,5 +568,4 @@ } +@@ -496,7 +495,6 @@ connection_failure_test() + goto def_exit; + } if (PR_GetConnectStatus(&pd) == PR_SUCCESS) { - PRInt32 rv; fprintf(stderr,"PR_GetConnectStatus succeeded, expected to fail\n"); failed_already = 1; ---- ../pr/tests/nblayer.c 2009-02-23 00:00:44.000000000 -0500 -+++ ../pr/tests/nblayer.c 2009-11-04 16:22:00.000000000 -0500 -@@ -332,5 +332,5 @@ + goto def_exit; +--- ../pr/tests/nblayer.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/nblayer.c 2015-11-04 02:02:20.443837000 +0000 +@@ -299,7 +299,7 @@ static PRStatus PR_CALLBACK MyClose(PRFi + static PRInt16 PR_CALLBACK MyPoll( PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags) { - PRInt16 my_flags, new_flags; @@ -413,7 +643,9 @@ + PRInt16 my_flags = -1, new_flags; PRFilePrivate *mine = (PRFilePrivate*)fd->secret; if (0 != (PR_POLL_READ & in_flags)) -@@ -375,5 +375,5 @@ + { +@@ -342,7 +342,7 @@ static PRFileDesc * PR_CALLBACK MyAccept + PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout) { PRStatus rv; - PRFileDesc *newfd, *layer = fd; @@ -420,7 +652,9 @@ + PRFileDesc *newfd; PRFileDesc *newstack; PRFilePrivate *newsecret; -@@ -461,4 +461,6 @@ + +@@ -428,6 +428,8 @@ static PRInt32 PR_CALLBACK MyRecv( + mine->rcvinprogress = 0; return mine->rcvreq; /* << -- that's it! */ default: + PR_ASSERT(!"How did I get this mine->rcvstate?"); @@ -427,7 +661,9 @@ + rv = -1; break; } -@@ -517,4 +517,6 @@ + } while (-1 != rv); +@@ -484,6 +486,8 @@ static PRInt32 PR_CALLBACK MySend( + mine->xmtinprogress = 0; return mine->xmtreq; /* <<-- That's the one! */ default: + PR_ASSERT(!"How did I get this mine->xmtstate?"); @@ -434,17 +670,59 @@ + rv = -1; break; } ---- ../pr/tests/obsints.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/obsints.c Mon Jul 25 21:04:56 2005 -@@ -58,4 +58,7 @@ + } while (-1 != rv); +--- ../pr/tests/nonblock.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/nonblock.c 2015-11-04 02:02:20.436606000 +0000 +@@ -39,7 +39,7 @@ + static void PR_CALLBACK + clientThreadFunc(void *arg) + { +- PRUintn port = (PRUintn)arg; ++ intptr_t port = (intptr_t)arg; + PRFileDesc *sock; + PRNetAddr addr; + char buf[CHUNK_SIZE]; +@@ -147,7 +147,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn + printf("%s", buf); + clientThread = PR_CreateThread(PR_USER_THREAD, +- clientThreadFunc, (void *) listenPort, ++ clientThreadFunc, (void *) (intptr_t)listenPort, + PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, 0); + if (clientThread == NULL) { +@@ -191,7 +191,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn + if (retVal != -1 || PR_GetError() != PR_WOULD_BLOCK_ERROR) { + PL_PrintError("First Receive:\n"); + fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n", +- retVal, PR_GetError()); ++ (long)retVal, (long)PR_GetError()); + exit(1); + } + printf("read: EWOULDBLOCK, good\n"); +@@ -201,7 +201,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn + if (retVal != CHUNK_SIZE) { + PL_PrintError("Second Receive:\n"); + fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", +- retVal, PR_GetError()); ++ (long)retVal, (long)PR_GetError()); + exit(1); + } + printf("read: %d bytes, good\n", retVal); +--- ../pr/tests/obsints.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/obsints.c 2015-11-04 02:02:20.444330000 +0000 +@@ -25,6 +25,9 @@ int main(int argc, char **argv) + #else /* NO_NSPR_10_SUPPORT */ + #include "prtypes.h" /* which includes protypes.h */ +#if !defined(__GNUC__) +# define __unused +#endif - int main() -@@ -65,15 +68,15 @@ + int main(int argc, char **argv) + { +@@ -32,17 +35,17 @@ int main(int argc, char **argv) + * Compilation fails if any of these integer types are not * defined by protypes.h. */ - intn in; @@ -471,9 +749,53 @@ + uint64 ui64 __unused; printf("PASS\n"); ---- ../pr/tests/perf.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/perf.c Mon Jul 25 21:05:55 2005 -@@ -181,5 +181,5 @@ + return 0; +--- ../pr/tests/parsetm.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/parsetm.c 2015-11-04 02:02:20.467739000 +0000 +@@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx + + /* Print day of the week, month, day, hour, minute, and second */ + if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ", +- dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, +- et->tm_hour, et->tm_min, et->tm_sec); ++ dayOfWeek[et->tm_wday], month[et->tm_month], (long)et->tm_mday, ++ (long)et->tm_hour, (long)et->tm_min, (long)et->tm_sec); + + /* Print time zone */ + totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset; +@@ -47,7 +47,7 @@ static void PrintExplodedTime(const PREx + hourOffset = totalOffset / 3600; + minOffset = (totalOffset % 3600) / 60; + if (debug_mode) +- printf("%s%02ld%02ld ", sign, hourOffset, minOffset); ++ printf("%s%02ld%02ld ", sign, (long)hourOffset, (long)minOffset); + } + + /* Print year */ +--- ../pr/tests/peek.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/peek.c 2015-11-04 02:02:20.437204000 +0000 +@@ -135,7 +135,7 @@ static void ClientNB(void *arg) + { + PRFileDesc *sock; + PRSocketOptionData opt; +- PRUint16 port = (PRUint16) arg; ++ PRUint16 port = (intptr_t) arg; + PRNetAddr addr; + char buf[BUFFER_SIZE]; + PRPollDesc pd; +@@ -299,7 +299,7 @@ RunTest(PRThreadScope scope, PRFileDesc + exit(1); + } + client = PR_CreateThread( +- PR_USER_THREAD, ClientNB, (void *) port, ++ PR_USER_THREAD, ClientNB, (void *)(intptr_t) port, + PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0); + if (NULL == client) { + fprintf(stderr, "PR_CreateThread failed\n"); +--- ../pr/tests/perf.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/perf.c 2015-11-04 02:02:20.445028000 +0000 +@@ -141,7 +141,7 @@ static void PR_CALLBACK CXReader(void *a + n = count / 2; for (i = 0; i < n; i++) { while (cxq == 0) { - DPRINTF(("CXReader: thread = 0x%lx waiting\n", @@ -480,7 +802,9 @@ + DPRINTF(("CXReader: thread = %p waiting\n", PR_GetCurrentThread())); PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT); -@@ -194,5 +194,5 @@ + } +@@ -154,7 +154,7 @@ static void PR_CALLBACK CXReader(void *a + --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("CXReader: thread = 0x%lx exiting\n", PR_GetCurrentThread())); @@ -487,7 +811,9 @@ + DPRINTF(("CXReader: thread = %p exiting\n", PR_GetCurrentThread())); } -@@ -205,5 +205,5 @@ + static void PR_CALLBACK CXWriter(void *arg) +@@ -165,7 +165,7 @@ static void PR_CALLBACK CXWriter(void *a + n = count / 2; for (i = 0; i < n; i++) { while (cxq == 1) { - DPRINTF(("CXWriter: thread = 0x%lx waiting\n", @@ -494,7 +820,9 @@ + DPRINTF(("CXWriter: thread = %p waiting\n", PR_GetCurrentThread())); PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT); -@@ -218,5 +218,5 @@ + } +@@ -178,7 +178,7 @@ static void PR_CALLBACK CXWriter(void *a + --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("CXWriter: thread = 0x%lx exiting\n", PR_GetCurrentThread())); @@ -501,7 +829,9 @@ + DPRINTF(("CXWriter: thread = %p exiting\n", PR_GetCurrentThread())); } -@@ -238,5 +238,5 @@ + static void ContextSwitch(PRThreadScope scope1, PRThreadScope scope2) +@@ -198,7 +198,7 @@ static void ContextSwitch(PRThreadScope + if (NULL == t1) { fprintf(stderr, "ContextSwitch: cannot create thread\n"); } else { - DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n", @@ -508,7 +838,9 @@ + DPRINTF(("ContextSwitch: created %s thread = %p\n", (scope1 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), -@@ -252,5 +252,5 @@ + t1)); +@@ -212,7 +212,7 @@ static void ContextSwitch(PRThreadScope + if (NULL == t2) { fprintf(stderr, "ContextSwitch: cannot create thread\n"); } else { - DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n", @@ -515,7 +847,9 @@ + DPRINTF(("ContextSwitch: created %s thread = %p\n", (scope2 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), -@@ -294,8 +294,8 @@ + t2)); +@@ -254,10 +254,10 @@ static void PR_CALLBACK SemaThread(void + n = count / 2; for (i = 0; i < n; i++) { - DPRINTF(("SemaThread: thread = 0x%lx waiting on sem = 0x%lx\n", @@ -526,7 +860,9 @@ + DPRINTF(("SemaThread: thread = %p posting on sem = %p\n", PR_GetCurrentThread(), sem[1])); PR_PostSem(sem[1]); -@@ -306,5 +306,5 @@ + } +@@ -266,7 +266,7 @@ static void PR_CALLBACK SemaThread(void + --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("SemaThread: thread = 0x%lx exiting\n", PR_GetCurrentThread())); @@ -533,7 +869,9 @@ + DPRINTF(("SemaThread: thread = %p exiting\n", PR_GetCurrentThread())); } -@@ -334,5 +334,5 @@ + static PRSemaphore *sem_set1[2]; +@@ -294,7 +294,7 @@ static void SemaContextSwitch(PRThreadSc + if (NULL == t1) { fprintf(stderr, "SemaContextSwitch: cannot create thread\n"); } else { - DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n", @@ -540,7 +878,9 @@ + DPRINTF(("SemaContextSwitch: created %s thread = %p\n", (scope1 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), -@@ -349,5 +349,5 @@ + t1)); +@@ -309,7 +309,7 @@ static void SemaContextSwitch(PRThreadSc + if (NULL == t2) { fprintf(stderr, "SemaContextSwitch: cannot create thread\n"); } else { - DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n", @@ -547,16 +887,71 @@ + DPRINTF(("SemaContextSwitch: created %s thread = %p\n", (scope2 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), ---- ../pr/tests/prpoll.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/prpoll.c 2009-11-04 16:31:54.000000000 -0500 -@@ -72,5 +72,5 @@ + t2)); +--- ../pr/tests/pipepong.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/pipepong.c 2015-11-04 02:02:20.437688000 +0000 +@@ -36,7 +36,7 @@ int main(int argc, char **argv) + nBytes = fread(buf, 1, 5, stdin); + fprintf(stderr, "pong process: received \"%s\"\n", buf); + if (nBytes != 5) { +- fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n", ++ fprintf(stderr, "pong process: expected 5 bytes but got %zd bytes\n", + nBytes); + exit(1); + } +--- ../pr/tests/poll_nm.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/poll_nm.c 2015-11-04 02:02:20.438299000 +0000 +@@ -47,7 +47,7 @@ PRIntn debug_mode; + static void PR_CALLBACK clientThreadFunc(void *arg) { +- PRUintn port = (PRUintn) arg; ++ PRUintn port = (intptr_t) arg; + PRFileDesc *sock; + PRNetAddr addr; + char buf[128]; +@@ -196,7 +196,7 @@ int main(int argc, char **argv) + npds = 5; + + clientThread = PR_CreateThread(PR_USER_THREAD, +- clientThreadFunc, (void *) listenPort1, ++ clientThreadFunc, (void *)(intptr_t)listenPort1, + PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, 0); + if (clientThread == NULL) { +@@ -206,7 +206,7 @@ int main(int argc, char **argv) + } + + clientThread = PR_CreateThread(PR_USER_THREAD, +- clientThreadFunc, (void *) listenPort2, ++ clientThreadFunc, (void *)(intptr_t)listenPort2, + PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, 0); + if (clientThread == NULL) { +--- ../pr/tests/provider.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/provider.c 2015-11-04 02:02:20.468667000 +0000 +@@ -1049,7 +1049,7 @@ int main(int argc, char **argv) + { + PRUintn index; + PRBool boolean; +- CSClient_t *client; ++ CSClient_t *client = NULL; + PRStatus rv, joinStatus; + CSServer_t *server = NULL; + char *thread_type; +--- ../pr/tests/prpoll.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/prpoll.c 2015-11-04 02:02:20.445656000 +0000 +@@ -39,7 +39,7 @@ int main(int argc, char **argv) + static void + clientThreadFunc(void *arg) + { - PRUint16 port = (PRUint16) arg; + PRUint16 port = (PRUint16)(uintptr_t)arg; PRFileDesc *sock; PRNetAddr addr; -@@ -106,5 +106,5 @@ + char buf[BUF_SIZE]; +@@ -73,7 +73,7 @@ int main(int argc, char **argv) + PRInt32 rv; PROsfd sd; struct sockaddr_in saddr; - PRIntn saddr_len; @@ -563,7 +958,9 @@ + socklen_t saddr_len; PRUint16 listenPort3; PRFileDesc *socket_poll_fd; -@@ -232,5 +232,5 @@ + PRIntn i, j; +@@ -199,7 +199,7 @@ int main(int argc, char **argv) + npds--; clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort1, @@ -570,7 +967,9 @@ + clientThreadFunc, (void *)(uintptr_t)listenPort1, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); -@@ -241,5 +241,5 @@ + if (clientThread == NULL) { +@@ -208,7 +208,7 @@ int main(int argc, char **argv) + } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort2, @@ -577,7 +976,9 @@ + clientThreadFunc, (void *)(uintptr_t)listenPort2, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0); -@@ -250,5 +250,5 @@ + if (clientThread == NULL) { +@@ -217,7 +217,7 @@ int main(int argc, char **argv) + } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort3, @@ -584,9 +985,21 @@ + clientThreadFunc, (void *)(uintptr_t)listenPort3, PR_PRIORITY_NORMAL, PR_GLOBAL_BOUND_THREAD, PR_UNJOINABLE_THREAD, 0); ---- ../pr/tests/ranfile.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/ranfile.c Mon Jul 25 21:13:44 2005 -@@ -169,5 +169,5 @@ + if (clientThread == NULL) { +--- ../pr/tests/randseed.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/randseed.c 2015-11-04 02:02:20.446756000 +0000 +@@ -48,7 +48,6 @@ static void Help( void ) + static void PrintRand( void *buf, PRIntn size ) + { + PRUint32 *rp = buf; +- PRIntn i; + + printf("%4.4d--\n", size ); + while (size > 0 ) { +--- ../pr/tests/ranfile.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/ranfile.c 2015-11-04 02:02:20.446281000 +0000 +@@ -130,7 +130,7 @@ static void PR_CALLBACK Thread(void *arg + PRStatus rv = PR_SUCCESS; Hammer_t *cd = (Hammer_t*)arg; - (void)sprintf(filename, "%ssg%04ld.dat", baseName, cd->id); @@ -593,7 +1006,9 @@ + (void)sprintf(filename, "%ssg%04d.dat", baseName, (int)cd->id); if (debug_mode) printf("Starting work on %s\n", filename); -@@ -408,6 +408,6 @@ + +@@ -364,14 +364,14 @@ int main(int argc, char **argv) + } else if (debug_mode) printf( - "%s: test failed %s after %ld seconds\n", @@ -602,7 +1017,7 @@ + programName, where[hammer[poll].problem], (int)duration); else failed_already=1; } -@@ -415,5 +415,5 @@ + } } if (debug_mode) printf( - "%s: [%ld [%ld] %ld] writes/sec average\n", @@ -609,17 +1024,107 @@ + "%s: [%d [%d] %d] writes/sec average\n", programName, writesMin, writesTot * 1000 / durationTot, writesMax); ---- ../pr/tests/randseed.c Fri Apr 29 18:46:05 2005 -+++ ../pr/tests/randseed.c Mon Jul 25 21:15:01 2005 -@@ -81,5 +81,4 @@ - { - PRUint32 *rp = buf; -- PRIntn i; + PR_DestroyCondVar(cv); +--- ../pr/tests/runtests.sh.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/runtests.sh 2015-11-04 02:02:20.463710000 +0000 +@@ -58,9 +58,6 @@ fi + # Tests not run (but should) + # - printf("%4.4d--\n", size ); ---- ../pr/tests/sel_spd.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/sel_spd.c 2009-11-04 16:34:14.000000000 -0500 -@@ -48,4 +48,7 @@ +-#forktest (failed on IRIX) +-#nbconn - fails on some platforms +-#poll_er - fails on some platforms? limited use? + #prpoll - the bad-FD test needs to be moved to a different test + #sleep - specific to OS/2 + +@@ -92,6 +89,7 @@ exit + fdcach + fileio + foreign ++forktest + formattm + fsync + gethost +@@ -99,7 +97,6 @@ getproto + i2l + initclk + inrval +-instrumt + intrio + intrupt + io_timeout +@@ -120,6 +117,7 @@ logger + many_cv + multiwait + nameshm1 ++nbconn + nblayer + nonblock + ntioto +@@ -136,6 +134,7 @@ perf + pipeping + pipeping2 + pipeself ++poll_er + poll_nm + poll_to + pollable +@@ -208,7 +207,7 @@ OBJDIR=`basename $PWD` + printf "\nNSPR Test Results - $OBJDIR\n\n" + printf "BEGIN\t\t\t`date`\n" + printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n" +-printf "Test\t\t\tResult\n\n" ++printf " Test\t\t\tResult\n\n" + if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then + for prog in $TESTS + do +@@ -226,10 +225,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ + else + for prog in $TESTS + do +- printf "$prog" +- printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1 +- export test_rval +- ./$prog >> ${LOGFILE} 2>&1 & ++ printf %16s $prog ++ ./$prog >> $prog.output 2>&1 & + test_pid=$! + sleep_pid=0 + if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0 +@@ -244,28 +241,11 @@ else + printf "\t\t\tPassed\n"; + else + printf "\t\t\tFAILED\n"; ++ sed "s,^, $prog: ," < $prog.output + rval=1 + fi; +- printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1 + done + fi; + + printf "END\t\t\t`date`\n" + exit $rval +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +--- ../pr/tests/sel_spd.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/sel_spd.c 2015-11-04 02:02:20.447432000 +0000 +@@ -15,6 +15,9 @@ + #include #include #include +#if defined(XP_UNIX) || defined(XP_OS2_EMX) @@ -627,7 +1132,9 @@ +#endif #ifdef SYMBIAN #include -@@ -55,14 +58,14 @@ + #endif +@@ -22,16 +25,16 @@ + #define PORT_BASE 19000 typedef struct timer_slot_t { - unsigned long d_connect; @@ -650,7 +1157,9 @@ +static int _client_data = 8192; #ifdef SYMBIAN -@@ -73,10 +76,9 @@ + /* +@@ -40,12 +43,11 @@ static long _client_data = 8192; + * memory and not be able to allocate thread stack or client/server data * buffer. */ -static long _server_data = (8*1024); @@ -664,7 +1173,9 @@ +static int _threads_max = 10, _threads = 10; static int verbose=0; -@@ -134,5 +136,5 @@ + static PRMonitor *exit_cv; +@@ -101,7 +103,7 @@ _server_thread(void *arg_id) + void _client_thread(void *); PRThread *thread; int *id = (int *)arg_id; - PRFileDesc *sock; @@ -671,7 +1182,9 @@ + PRFileDesc *sock = NULL; PRSocketOptionData sockopt; PRNetAddr sa; -@@ -502,10 +504,10 @@ + PRFileDesc * newsock; +@@ -469,12 +471,12 @@ void + tally_results(int verbose) { int index; - unsigned long tot_connect = 0; @@ -688,9 +1201,11 @@ + unsigned int tot_requests = 0; fprintf(stdout, "Server results:\n\n"); ---- ../pr/tests/selct_nm.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/selct_nm.c Mon Jul 25 21:21:56 2005 -@@ -82,5 +82,5 @@ + for (index=0; index<_threads_max*2; index+=2) { +--- ../pr/tests/selct_nm.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/selct_nm.c 2015-11-04 02:02:20.447983000 +0000 +@@ -45,7 +45,7 @@ PRIntn debug_mode; + static void clientThreadFunc(void *arg) { - PRUintn port = (PRUintn) arg; @@ -697,7 +1212,9 @@ + PRUintn port = (PRUintn)(uintptr_t)arg; PRFileDesc *sock; PRNetAddr addr; -@@ -202,5 +202,5 @@ + char buf[128]; +@@ -165,7 +165,7 @@ failed_already=1; + if (debug_mode) printf("%s", buf); clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort1, @@ -704,7 +1221,9 @@ + clientThreadFunc, (void *)(uintptr_t)listenPort1, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); -@@ -212,5 +212,5 @@ + if (clientThread == NULL) { +@@ -175,7 +175,7 @@ failed_already=1; + } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort2, @@ -711,15 +1230,19 @@ + clientThreadFunc, (void *)(uintptr_t)listenPort2, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); ---- ../pr/tests/select2.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/select2.c Mon Jul 25 21:27:44 2005 -@@ -86,4 +86,5 @@ + if (clientThread == NULL) { +--- ../pr/tests/select2.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/select2.c 2015-11-04 02:02:20.448561000 +0000 +@@ -53,6 +53,7 @@ PRInt32 count; + ** ***********************************************************************/ +static int exitcode = 2; static void Test_Result (int result) -@@ -93,7 +94,10 @@ + { +@@ -60,9 +61,12 @@ static void Test_Result (int result) + { case PASS: printf ("PASS\n"); + if (exitcode == 2) @@ -730,14 +1253,17 @@ + exitcode = 1; break; default: -@@ -352,3 +357,4 @@ + printf ("NOSTATUS\n"); +@@ -319,4 +323,5 @@ int main(int argc, char **argv) + PR_Cleanup(); + return exitcode; } ---- ../pr/tests/semaerr.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/semaerr.c Mon Jul 25 21:29:23 2005 -@@ -91,5 +91,5 @@ +--- ../pr/tests/semaerr.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/semaerr.c 2015-11-04 02:02:20.449040000 +0000 +@@ -65,7 +65,7 @@ int main(int argc, char **argv) + exit(1); } if (PR_GetError() != PR_FILE_NOT_FOUND_ERROR) { - fprintf(stderr, "Expected error is %d but got (%d, %d)\n", @@ -744,18 +1270,22 @@ + fprintf(stderr, "Expected error is %ld (PR_FILE_NOT_FOUND_ERROR) but got (%d, %d)\n", PR_FILE_NOT_FOUND_ERROR, PR_GetError(), PR_GetOSError()); exit(1); ---- ../pr/tests/semaerr1.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/semaerr1.c Mon Jul 25 21:30:25 2005 -@@ -103,5 +103,5 @@ } +--- ../pr/tests/semaerr1.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/semaerr1.c 2015-11-04 02:02:20.449526000 +0000 +@@ -75,7 +75,7 @@ int main(int argc, char **argv) + exit(1); + } if (PR_GetError() != PR_FILE_EXISTS_ERROR) { - fprintf(stderr, "Expect %d but got %d\n", PR_FILE_EXISTS_ERROR, + fprintf(stderr, "Expected %ld (PR_FILE_EXISTS_ERROR) but got %d\n", PR_FILE_EXISTS_ERROR, PR_GetError()); exit(1); ---- ../pr/tests/sendzlf.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/sendzlf.c Mon Jul 25 21:31:35 2005 -@@ -59,5 +59,5 @@ + } +--- ../pr/tests/sendzlf.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/sendzlf.c 2015-11-04 02:02:20.450064000 +0000 +@@ -26,7 +26,7 @@ static void ClientThread(void *arg) + { PRFileDesc *sock; PRNetAddr addr; - PRUint16 port = (PRUint16) arg; @@ -762,7 +1292,9 @@ + PRUint16 port = (PRUint16)(uintptr_t)arg; char buf[1024]; char *bufPtr; -@@ -217,5 +217,5 @@ + PRInt32 nbytes; +@@ -184,7 +184,7 @@ int main(int argc, char **argv) + } clientThread = PR_CreateThread(PR_USER_THREAD, - ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)), @@ -769,9 +1301,11 @@ + ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)), PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { ---- ../pr/tests/servr_kk.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/servr_kk.c Mon Jul 25 21:38:28 2005 -@@ -90,5 +90,5 @@ + fprintf(stderr, "PR_CreateThread failed\n"); +--- ../pr/tests/server_test.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/server_test.c 2015-11-04 02:02:20.464401000 +0000 +@@ -60,7 +60,7 @@ PRCondVar *ServerStateCV; + #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF @@ -778,21 +1312,87 @@ +#define DPRINTF(...) #endif -@@ -501,4 +501,5 @@ + +@@ -502,6 +502,7 @@ static void do_workUU(void) + do_work(); } +#if 0 + static void do_workUK(void) + { + ServerScope = PR_LOCAL_THREAD; +@@ -522,6 +523,7 @@ static void do_workKK(void) + ClientScope = PR_GLOBAL_THREAD; + do_work(); + } ++#endif + + + static void Measure(void (*func)(void), const char *msg) +--- ../pr/tests/servr_kk.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/servr_kk.c 2015-11-04 02:02:20.450733000 +0000 +@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; + #ifdef DEBUGPRINTS + #define DPRINTF printf + #else +-#define DPRINTF ++#define DPRINTF(...) + #endif + + PRIntn failed_already=0; +@@ -472,6 +472,7 @@ void do_work() + PR_JoinThread(ServerThread); + } + ++#if 0 static void do_workUU(void) { -@@ -521,4 +522,5 @@ + ServerScope = PR_LOCAL_THREAD; +@@ -492,6 +493,7 @@ static void do_workKU(void) + ClientScope = PR_LOCAL_THREAD; do_work(); } +#endif static void do_workKK(void) ---- ../pr/tests/short_thread.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/short_thread.c Mon Jul 25 21:44:20 2005 -@@ -76,6 +76,6 @@ + { +--- ../pr/tests/servr_ku.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/servr_ku.c 2015-11-04 02:02:20.465050000 +0000 +@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; + #ifdef DEBUGPRINTS + #define DPRINTF printf + #else +-#define DPRINTF ++#define DPRINTF(...) + #endif + + PRIntn failed_already=0; +--- ../pr/tests/servr_uk.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/servr_uk.c 2015-11-04 02:02:20.465699000 +0000 +@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; + #ifdef DEBUGPRINTS + #define DPRINTF printf + #else +-#define DPRINTF ++#define DPRINTF(...) + #endif + + PRIntn failed_already=0; +--- ../pr/tests/servr_uu.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/servr_uu.c 2015-11-04 02:02:20.466349000 +0000 +@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; + #ifdef DEBUGPRINTS + #define DPRINTF printf + #else +-#define DPRINTF ++#define DPRINTF(...) + #endif + + PRIntn failed_already=0; +--- ../pr/tests/short_thread.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/short_thread.c 2015-11-04 02:02:20.451202000 +0000 +@@ -43,8 +43,8 @@ int main (int argc, char **argv) + PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0)) == NULL ) { fprintf(stderr, - "simple_test: Error - PR_CreateThread failed: (%ld, %ld)\n", @@ -801,192 +1401,12 @@ + PR_GetError(), PR_GetOSError()); exit( 1 ); } ---- ../pr/tests/cvar2.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/cvar2.c Mon Jul 25 20:37:10 2005 -@@ -128,5 +128,5 @@ - PR_Lock(info->lock); - if (*info->tcount == 0) { -- DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n", -+ DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n", - PR_GetCurrentThread(), info->cvar)); - PR_WaitCondVar(info->cvar, info->timeout); -@@ -141,6 +141,6 @@ - (*info->exitcount)++; - PR_NotifyCondVar(info->exitcvar); --DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n", -- PR_GetCurrentThread(), info->exitcvar,(*info->exitcount))); -+DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n", -+ PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount))); - PR_Unlock(info->exitlock); - } -@@ -190,5 +190,5 @@ - CondVarTestSUU(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -222,5 +222,5 @@ - PR_LOCAL_THREAD); - index++; -- DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread)); -+ DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread)); - } + PR_Cleanup(); +--- ../pr/tests/socket.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/socket.c 2015-11-04 02:02:20.454777000 +0000 +@@ -103,13 +103,15 @@ char *LARGE_FILE_NAME = "/tmp/prsocket_t + #endif -@@ -232,5 +232,5 @@ - PR_NotifyCondVar(list[index].cvar); - PR_Unlock(list[index].lock); -- DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n", -+ DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n", - PR_GetCurrentThread(), list[index].cvar)); - } -@@ -260,5 +260,5 @@ - CondVarTestSUK(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -334,5 +334,5 @@ - CondVarTestPUU(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -369,5 +369,5 @@ - PR_LOCAL_THREAD); - -- DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread)); -+ DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread)); - index++; - tcount++; -@@ -387,6 +387,6 @@ - /* Wait for threads to finish */ - while(exitcount < arg) { --DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n", -- PR_GetCurrentThread(), exitcvar, exitcount)); -+DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n", -+ PR_GetCurrentThread(), exitcvar, (int)exitcount)); - PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60)); - } -@@ -398,5 +398,5 @@ - /* Join all the threads */ - for(index=0; index<(arg); index++) { -- DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread)); -+ DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread)); - PR_JoinThread(list[index].thread); - if (list[index].internal) { -@@ -420,5 +420,5 @@ - CondVarTestPUK(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -501,5 +501,5 @@ - CondVarTest(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -634,5 +634,5 @@ - CondVarTimeoutTest(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -745,5 +745,5 @@ - CondVarMixedTest(void *_arg) - { -- PRInt32 arg = (PRInt32)_arg; -+ PRInt32 arg = (PRInt32)(intptr_t)_arg; - PRInt32 index, loops; - threadinfo *list; -@@ -835,5 +835,5 @@ - - PR_Lock(list[index].lock); -- *list[index].tcount++; -+ list[index].tcount++; - PR_NotifyCondVar(list[index].cvar); - PR_Unlock(list[index].lock); -@@ -906,5 +906,5 @@ - - start = PR_IntervalNow(); -- (*func)((void *)arg); -+ (*func)((void *)(intptr_t)arg); - stop = PR_IntervalNow(); - -@@ -965,5 +965,5 @@ - - for (threads = default_threads; threads < default_threads*5; threads+=default_threads) { -- printf("\n%ld Thread tests\n", threads); -+ printf("\n%d Thread tests\n", (int)threads); - Measure(CondVarTestSUU, threads, "Condvar simple test shared UU"); - Measure(CondVarTestSUK, threads, "Condvar simple test shared UK"); ---- ../pr/tests/io_timeout.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/io_timeout.c Mon Jul 25 20:50:40 2005 -@@ -55,9 +55,11 @@ - #include "plgetopt.h" - -+#include - #include -+#include - #include "nspr.h" - - #define NUM_THREADS 1 --#define BASE_PORT 8000 -+#define BASE_PORT 38011 - #define DEFAULT_ACCEPT_TIMEOUT 2 - -@@ -71,5 +73,5 @@ - - PRIntn failed_already = 0; --PRIntn debug_mode = 0; -+PRIntn debug_mode = 1; - - #define LOCAL_SCOPE_STRING "LOCAL scope" -@@ -87,5 +89,5 @@ - PRStatus rv; - PRThreadScope tscope; -- char *scope_str; -+ const char *scope_str; - - -@@ -106,4 +108,5 @@ - default: - PR_ASSERT(!"Invalid thread scope"); -+ scope_str = NULL; - break; - } -@@ -124,5 +127,10 @@ - if (rv == PR_FAILURE) { - if (debug_mode) -- printf("unable to bind\n"); -+ printf("unable to bind to %d: %s\n", -+ BASE_PORT + info->id, strerror(PR_GetOSError())); -+ if (PR_GetOSError() == EADDRINUSE) { -+ printf("can not proceed with this test\n"); -+ exit(0); -+ } - failed_already=1; - goto dead; -@@ -146,6 +154,7 @@ - if (PR_GetError() == PR_IO_TIMEOUT_ERROR) { - if (debug_mode) { -- printf("PR_Accept() timeout worked!\n"); -- printf("TEST PASSED! PR_Accept() returned error %d\n", -+ printf("PR_Accept() timeout worked!\n" -+ "TEST PASSED! PR_Accept() returned error " -+ "PR_IO_TIMEOUT_ERROR (%ld)\n", - PR_IO_TIMEOUT_ERROR); - } ---- ../pr/tests/socket.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/socket.c 2009-11-04 16:45:41.000000000 -0500 -@@ -132,11 +132,13 @@ - static PRInt32 num_tcp_clients = NUM_TCP_CLIENTS; -static PRInt32 num_udp_clients = NUM_UDP_CLIENTS; static PRInt32 num_transmitfile_clients = NUM_TRANSMITFILE_CLIENTS; @@ -1000,7 +1420,9 @@ +#endif static PRInt32 thread_count; -@@ -210,5 +212,7 @@ + PRUint16 server_domain = PR_AF_INET, client_domain = PR_AF_INET; +@@ -181,19 +183,23 @@ readn(PRFileDesc *sockfd, char *buf, int + int rem; int bytes; int offset = 0; +#ifdef WINNT @@ -1008,7 +1430,8 @@ +#endif PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT; -@@ -217,10 +221,12 @@ + if (test_cancelio) + timeout = PR_SecondsToInterval(2); for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n", @@ -1023,7 +1446,9 @@ + DPRINTF(("thread = %p: returning from PR_Recv, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes < 0) { -@@ -253,9 +259,9 @@ + #ifdef WINNT +@@ -224,11 +230,11 @@ writen(PRFileDesc *sockfd, char *buf, in + int offset = 0; for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n", @@ -1035,7 +1460,9 @@ + DPRINTF(("thread = %p: returning from PR_Send, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes <= 0) -@@ -308,5 +314,5 @@ + return -1; +@@ -279,7 +285,7 @@ Serve_Client(void *arg) + fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n"); } #endif - DPRINTF(("Serve_Client [0x%lx]: inbuf[0] = 0x%lx\n",PR_GetCurrentThread(), @@ -1042,7 +1469,9 @@ + DPRINTF(("Serve_Client [%p]: inbuf[0] = %d\n",PR_GetCurrentThread(), (*((int *) in_buf->data)))); if (writen(sockfd, in_buf->data, bytes) < bytes) { -@@ -447,5 +453,5 @@ + fprintf(stderr,"prsocket_test: ERROR - Serve_Client:writen\n"); +@@ -418,7 +424,7 @@ TCP_Server(void *arg) + goto exit; } - DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", @@ -1049,7 +1478,9 @@ + DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); if (PR_SetNetAddr(PR_IpAddrLoopback, client_domain, -@@ -489,5 +495,5 @@ + PR_ntohs(PR_NetAddrInetPort(&netaddr)), +@@ -460,7 +466,7 @@ TCP_Server(void *arg) + scp->datalen = sp->datalen; t = create_new_thread(PR_USER_THREAD, - Serve_Client, (void *)scp, @@ -1056,7 +1487,9 @@ + Serve_Client, (void *)scp, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -499,5 +505,5 @@ + PR_UNJOINABLE_THREAD, +@@ -470,7 +476,7 @@ TCP_Server(void *arg) + failed_already=1; goto exit; } - DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", t)); @@ -1063,7 +1496,9 @@ + DPRINTF(("TCP_Server: Created Serve_Client = %p\n", t)); } -@@ -515,7 +521,8 @@ + exit: +@@ -486,9 +492,10 @@ exit: + --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("TCP_Server [0x%lx] exiting\n", PR_GetCurrentThread())); @@ -1073,7 +1508,9 @@ +#if defined(SYMBIAN) && !defined(__WINSCW__) /* * UDP Server -@@ -573,5 +580,5 @@ + * Server Thread +@@ -544,7 +551,7 @@ UDP_Server(void *arg) + return; } - DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", @@ -1080,7 +1517,9 @@ + DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); /* -@@ -611,5 +618,5 @@ + * We can't use the IP address returned by PR_GetSockName in +@@ -582,13 +589,13 @@ UDP_Server(void *arg) + */ memset(&netaddr, 0 , sizeof(netaddr)); for (i = 0; i < (num_udp_clients * num_udp_datagrams_per_client); i++) { - DPRINTF(("UDP_Server: calling PR_RecvFrom client - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n", @@ -1087,7 +1526,7 @@ + DPRINTF(("UDP_Server: calling PR_RecvFrom client - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n", netaddr.inet.ip, netaddr.inet.port, bytes, in_buf->data, in_buf->data[0])); -@@ -617,5 +624,5 @@ + rv = PR_RecvFrom(sockfd, in_buf->data, bytes, 0, &netaddr, PR_INTERVAL_NO_TIMEOUT); - DPRINTF(("UDP_Server: PR_RecvFrom client - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n", @@ -1094,7 +1533,9 @@ + DPRINTF(("UDP_Server: PR_RecvFrom client - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n", netaddr.inet.ip, netaddr.inet.port, rv, in_buf->data, in_buf->data[0])); -@@ -640,6 +647,7 @@ + if (rv != bytes) { +@@ -611,8 +618,9 @@ UDP_Server(void *arg) + --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("UDP_Server [0x%x] exiting\n", PR_GetCurrentThread())); @@ -1103,7 +1544,9 @@ +#endif /* defined(SYMBIAN) && !defined(__WINSCW__) */ /* -@@ -684,5 +692,5 @@ + * TCP_Client +@@ -655,7 +663,7 @@ TCP_Client(void *arg) + } if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){ fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1110,7 +1553,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; return; -@@ -692,5 +700,5 @@ + } +@@ -663,7 +671,7 @@ TCP_Client(void *arg) + /* * fill in random data */ - memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes); @@ -1117,7 +1562,9 @@ + memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes); /* * write to server -@@ -705,5 +713,5 @@ + */ +@@ -676,7 +684,7 @@ TCP_Client(void *arg) + failed_already=1; return; } - DPRINTF(("TCP Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n", @@ -1124,7 +1571,9 @@ + DPRINTF(("TCP Client [%p]: out_buf = %p out_buf[0] = 0x%x\n", PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data)))); if (readn(sockfd, in_buf->data, bytes) < bytes) { -@@ -745,11 +753,12 @@ + fprintf(stderr,"prsocket_test: ERROR - TCP_Client:readn\n"); +@@ -716,13 +724,14 @@ TCP_Client(void *arg) + --(*cp->exit_counter); PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); - DPRINTF(("TCP_Client [0x%x] exiting\n", PR_GetCurrentThread())); @@ -1139,7 +1588,9 @@ + * Create a socket and bind an address * Communicate with the server at the address specified in the argument. * Fill in a buffer, write data to server, read it back and check -@@ -809,5 +818,5 @@ + * for data corruption. +@@ -780,7 +789,7 @@ UDP_Client(void *arg) + return; } - DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", @@ -1146,7 +1597,9 @@ + DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); -@@ -826,7 +835,7 @@ + netaddr = cp->server_addr; +@@ -797,9 +806,9 @@ UDP_Client(void *arg) + /* * fill in random data */ - DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx bytes = 0x%lx\n", @@ -1156,7 +1609,9 @@ + memset(out_buf->data, ((intptr_t)(&netaddr)) + i, bytes); /* * write to server -@@ -841,5 +850,5 @@ + */ +@@ -812,7 +821,7 @@ UDP_Client(void *arg) + if (rv != bytes) { return; } - DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n", @@ -1163,7 +1618,9 @@ + DPRINTF(("UDP_Client [%p]: out_buf = %p out_buf[0] = 0x%x\n", PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data)))); if (cp->udp_connect) -@@ -852,5 +861,5 @@ + rv = PR_Recv(sockfd, in_buf->data, bytes, 0, +@@ -823,7 +832,7 @@ UDP_Client(void *arg) + if (rv != bytes) { return; } - DPRINTF(("UDP_Client [0x%lx]: in_buf = 0x%lx in_buf[0] = 0x%lx\n", @@ -1170,7 +1627,9 @@ + DPRINTF(("UDP_Client [%p]: in_buf = %p in_buf[0] = 0x%x\n", PR_GetCurrentThread(), in_buf, (*((int *) in_buf->data)))); /* -@@ -877,10 +886,11 @@ + * verify the data read +@@ -848,12 +857,13 @@ UDP_Client(void *arg) + PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); PR_DELETE(cp); - DPRINTF(("UDP_Client [0x%x] exiting\n", PR_GetCurrentThread())); @@ -1184,7 +1643,9 @@ + * * One server and several clients are started * Each client connects to the server and sends a chunk of data -@@ -934,5 +944,5 @@ + * For each connection, server starts another thread to read the data +@@ -905,7 +915,7 @@ TCP_Socket_Client_Server_Test(void) + sparamp->exit_counter = &thread_count; sparamp->datalen = datalen; t = PR_CreateThread(PR_USER_THREAD, - TCP_Server, (void *)sparamp, @@ -1191,7 +1652,9 @@ + TCP_Server, (void *)sparamp, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -944,5 +954,5 @@ + PR_UNJOINABLE_THREAD, +@@ -915,7 +925,7 @@ TCP_Socket_Client_Server_Test(void) + failed_already=1; return -1; } - DPRINTF(("Created TCP server = 0x%lx\n", t)); @@ -1198,7 +1661,9 @@ + DPRINTF(("Created TCP server = %p\n", t)); thread_count++; -@@ -978,5 +988,5 @@ + /* +@@ -949,7 +959,7 @@ TCP_Socket_Client_Server_Test(void) + failed_already=1; return -1; } - DPRINTF(("Created TCP client = 0x%lx\n", t)); @@ -1205,7 +1670,9 @@ + DPRINTF(("Created TCP client = %p\n", t)); thread_count++; } -@@ -988,7 +998,7 @@ + /* Wait for server and client threads to exit */ +@@ -959,17 +969,18 @@ TCP_Socket_Client_Server_Test(void) + } PR_ExitMonitor(mon2); printf("%30s","TCP_Socket_Client_Server_Test:"); - printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, @@ -1215,7 +1682,7 @@ + printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", num_tcp_mesgs_per_connection, tcp_mesg_size); -@@ -996,7 +1006,8 @@ + return 0; } +#if defined(SYMBIAN) && !defined(__WINSCW__) @@ -1225,7 +1692,9 @@ + * * One server and several clients are started * Each client connects to the server and sends a chunk of data -@@ -1052,5 +1063,5 @@ + * For each connection, server starts another thread to read the data +@@ -1023,7 +1034,7 @@ UDP_Socket_Client_Server_Test(void) + sparamp->datalen = datalen; DPRINTF(("Creating UDP server")); t = PR_CreateThread(PR_USER_THREAD, - UDP_Server, (void *)sparamp, @@ -1232,7 +1701,9 @@ + UDP_Server, (void *)sparamp, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -1113,10 +1124,11 @@ + PR_UNJOINABLE_THREAD, +@@ -1084,12 +1095,13 @@ UDP_Socket_Client_Server_Test(void) + } PR_ExitMonitor(mon2); printf("%30s","UDP_Socket_Client_Server_Test: "); - printf("%2ld Server %2ld Clients\n",1l, num_udp_clients); @@ -1246,7 +1717,9 @@ +#endif /* defined(SYMBIAN) && !defined(__WINSCW__) */ static PRFileDesc *small_file_fd, *large_file_fd; -@@ -1470,5 +1482,5 @@ + static void *small_file_addr, *small_file_header, *large_file_addr; +@@ -1441,7 +1453,7 @@ TransmitFile_Client(void *arg) + --(*cp->exit_counter); PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); - DPRINTF(("TransmitFile_Client [0x%lx] exiting\n", PR_GetCurrentThread())); @@ -1253,7 +1726,9 @@ + DPRINTF(("TransmitFile_Client [%p] exiting\n", PR_GetCurrentThread())); } -@@ -1513,5 +1525,5 @@ + /* +@@ -1484,7 +1496,7 @@ Serve_TransmitFile_Client(void *arg) + if (bytes != (SMALL_FILE_SIZE+ SMALL_FILE_HEADER_SIZE)) { fprintf(stderr, "prsocet_test: PR_TransmitFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1260,7 +1735,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1521,5 +1533,5 @@ + bytes = PR_TransmitFile(sockfd, local_large_file_fd, NULL, 0, +@@ -1492,7 +1504,7 @@ Serve_TransmitFile_Client(void *arg) + if (bytes != LARGE_FILE_SIZE) { fprintf(stderr, "prsocket_test: PR_TransmitFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1267,7 +1744,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1549,5 +1561,5 @@ + +@@ -1520,7 +1532,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1274,7 +1753,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1573,5 +1585,5 @@ + +@@ -1544,7 +1556,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1281,7 +1762,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1595,5 +1607,5 @@ + /* +@@ -1566,7 +1578,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1288,7 +1771,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1617,5 +1629,5 @@ + /* +@@ -1588,7 +1600,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1295,7 +1780,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1639,5 +1651,5 @@ + /* +@@ -1610,7 +1622,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1302,7 +1789,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1661,5 +1673,5 @@ + /* +@@ -1632,7 +1644,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1309,7 +1798,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1683,5 +1695,5 @@ + /* +@@ -1654,7 +1666,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1316,7 +1807,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1707,5 +1719,5 @@ + /* +@@ -1678,7 +1690,7 @@ Serve_TransmitFile_Client(void *arg) + slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); @@ -1323,7 +1816,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } -@@ -1781,5 +1793,5 @@ + done: +@@ -1752,7 +1764,7 @@ TransmitFile_Server(void *arg) + goto exit; } - DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", @@ -1330,7 +1825,9 @@ + DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); tcp_server_addr.inet.family = netaddr.inet.family; -@@ -1836,5 +1848,5 @@ + tcp_server_addr.inet.port = netaddr.inet.port; +@@ -1807,7 +1819,7 @@ TransmitFile_Server(void *arg) + scp->datalen = sp->datalen; t[i] = PR_CreateThread(PR_USER_THREAD, - Serve_TransmitFile_Client, (void *)scp, @@ -1337,7 +1834,9 @@ + Serve_TransmitFile_Client, (void *)scp, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -1847,5 +1859,5 @@ + PR_JOINABLE_THREAD, +@@ -1818,7 +1830,7 @@ TransmitFile_Server(void *arg) + failed_already=1; goto exit; } - DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = 0x%lx\n", t)); @@ -1344,7 +1843,9 @@ + DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = %p\n", t)); } -@@ -1875,10 +1887,10 @@ + /* +@@ -1846,12 +1858,12 @@ exit: + --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("TransmitFile_Server [0x%lx] exiting\n", PR_GetCurrentThread())); @@ -1358,7 +1859,9 @@ + * */ static PRInt32 -@@ -2015,5 +2027,5 @@ + Socket_Misc_Test(void) +@@ -1986,7 +1998,7 @@ Socket_Misc_Test(void) + fprintf(stderr, "prsocket_test failed to write to file %s: (%ld, %ld)\n", LARGE_FILE_NAME, - PR_GetError(), PR_GetOSError()); @@ -1365,7 +1868,9 @@ + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; rv = -1; -@@ -2094,5 +2106,5 @@ + goto done; +@@ -2065,7 +2077,7 @@ Socket_Misc_Test(void) + sparamp->exit_counter = &thread_count; sparamp->datalen = datalen; t = PR_CreateThread(PR_USER_THREAD, - TransmitFile_Server, (void *)sparamp, @@ -1372,7 +1877,9 @@ + TransmitFile_Server, (void *)sparamp, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -2105,5 +2117,5 @@ + PR_UNJOINABLE_THREAD, +@@ -2076,7 +2088,7 @@ Socket_Misc_Test(void) + rv = -1; goto done; } - DPRINTF(("Created TCP server = 0x%x\n", t)); @@ -1379,7 +1886,9 @@ + DPRINTF(("Created TCP server = %p\n", t)); thread_count++; -@@ -2142,5 +2154,5 @@ + /* +@@ -2113,7 +2125,7 @@ Socket_Misc_Test(void) + failed_already=1; goto done; } - DPRINTF(("Created TransmitFile client = 0x%lx\n", t)); @@ -1386,7 +1895,9 @@ + DPRINTF(("Created TransmitFile client = %p\n", t)); thread_count++; } -@@ -2173,5 +2185,5 @@ + /* Wait for server and client threads to exit */ +@@ -2144,7 +2156,7 @@ done: + } if ((PR_RmDir(TEST_DIR)) == PR_FAILURE) { fprintf(stderr,"prsocket_test failed to rmdir %s: (%ld, %ld)\n", - TEST_DIR, PR_GetError(), PR_GetOSError()); @@ -1393,9 +1904,11 @@ + TEST_DIR, (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } ---- ../pr/tests/sprintf.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/sprintf.c Mon Jul 25 22:21:32 2005 -@@ -162,5 +162,5 @@ + +--- ../pr/tests/sprintf.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/sprintf.c 2015-11-04 02:02:20.455364000 +0000 +@@ -127,7 +127,7 @@ static void test_l(char *pattern, char * + (strncmp(s, sbuf, sizeof(sbuf)) != 0)) { fprintf(stderr, "pattern='%s' l=%ld\nPR_smprintf='%s'\nPR_snprintf='%s'\n sprintf='%s'\n", - pattern, l, s, buf, sbuf); @@ -1402,16 +1915,20 @@ + pattern, (long)l, s, buf, sbuf); PR_smprintf_free(s); exit(-1); ---- ../pr/tests/stack.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/stack.c Mon Jul 25 22:22:43 2005 -@@ -86,5 +86,5 @@ - PRIntn main(PRIntn argc, char **argv) + } +--- ../pr/tests/stack.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/stack.c 2015-11-04 02:02:20.455937000 +0000 +@@ -54,7 +54,7 @@ PRFileDesc *errhandle; + int main(int argc, char **argv) { + #if !(defined(SYMBIAN) && defined(__WINS__)) - PRInt32 rv, cnt, sum; + PRInt32 cnt, sum; DataRecord *Item; PRStack *list1, *list2; -@@ -240,5 +240,5 @@ + PRStackElem *node; +@@ -209,7 +209,7 @@ int main(int argc, char **argv) + static void stackop(void *thread_arg) { PRInt32 val, cnt, index, loops; - DataRecord *Items, *Item; @@ -1418,9 +1935,10 @@ + DataRecord *Items; PRStack *list1, *list2; PRStackElem *node; ---- ../pr/tests/suspend.c.orig 2010-09-24 20:14:40.000000000 +0200 -+++ ../pr/tests/suspend.c 2011-01-15 13:56:43.000000000 +0100 -@@ -62,14 +62,14 @@ + stack_data *arg = (stack_data *) thread_arg; +--- ../pr/tests/suspend.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/suspend.c 2015-11-04 02:02:20.456555000 +0000 +@@ -30,14 +30,14 @@ void PR_CALLBACK Level_2_Thread(void *arg) { PR_Sleep(PR_MillisecondsToInterval(4 * 1000)); @@ -1437,7 +1955,7 @@ PRThreadScope scope = (PRThreadScope) tmp; PRThread *thr; -@@ -84,7 +84,7 @@ +@@ -52,7 +52,7 @@ Level_1_Thread(void *arg) if (!thr) { printf("Could not create thread!\n"); } else { @@ -1446,7 +1964,7 @@ PR_GetCurrentThread(), (scope == PR_GLOBAL_THREAD) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", -@@ -95,7 +95,7 @@ +@@ -63,7 +63,7 @@ Level_1_Thread(void *arg) alive--; PR_Notify(mon); PR_ExitMonitor(mon); @@ -1455,7 +1973,7 @@ } static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg) -@@ -104,14 +104,15 @@ +@@ -72,14 +72,15 @@ static PRStatus PR_CALLBACK print_thread PRWord *registers; printf( @@ -1475,7 +1993,7 @@ return PR_SUCCESS; } -@@ -139,7 +140,7 @@ +@@ -107,7 +108,7 @@ static void Level_0_Thread(PRThreadScope printf("Could not create thread!\n"); alive--; } @@ -1484,7 +2002,7 @@ PR_GetCurrentThread(), (scope1 == PR_GLOBAL_THREAD) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", -@@ -151,9 +152,10 @@ +@@ -119,9 +120,10 @@ static void Level_0_Thread(PRThreadScope PR_EnumerateThreads(print_thread, NULL); registers = PR_GetGCRegisters(me, 1, (int *)&words); if (registers) @@ -1498,9 +2016,21 @@ PR_ResumeAll(); /* Wait for all threads to exit */ ---- ../pr/tests/testfile.c Tue Jun 20 17:46:54 2000 -+++ ../pr/tests/testfile.c Mon Jul 25 22:36:39 2005 -@@ -69,4 +69,7 @@ +--- ../pr/tests/switch.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/switch.c 2015-11-04 02:02:20.469217000 +0000 +@@ -80,7 +80,7 @@ PRIntn PR_CALLBACK Switch(PRIntn argc, c + PRStatus status; + PRBool help = PR_FALSE; + PRUintn concurrency = 1; +- Shared *shared, *link; ++ Shared *shared = NULL, *link; + PRIntervalTime timein, timeout; + PRThreadScope thread_scope = PR_LOCAL_THREAD; + PRUintn thread_count, inner_count, loop_count, average; +--- ../pr/tests/testfile.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/testfile.c 2015-11-04 02:02:20.457379000 +0000 +@@ -36,6 +36,9 @@ static int _debug_on = 0; + #ifdef XP_WIN #define mode_t int #endif +#if defined(XP_UNIX) || defined(XP_OS2_EMX) @@ -1508,14 +2038,18 @@ +#endif #define DPRINTF(arg) if (_debug_on) printf arg -@@ -119,5 +122,5 @@ +@@ -93,7 +96,7 @@ static PRInt32 PR_CALLBACK DirTest(void + PRInt32 dirtest_failed = 0; + PRThread* create_new_thread(PRThreadType type, - void (*start)(void *arg), + void *(*start)(void *arg), void *arg, PRThreadPriority priority, -@@ -181,5 +184,5 @@ + PRThreadScope scope, +@@ -155,7 +158,7 @@ PRInt32 native_thread = 0; + return((PRThread *) thandle); #endif } else { - return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize)); @@ -1522,7 +2056,9 @@ + return(PR_CreateThread(type,(void (*)(void*))start,arg,priority,scope,state,stackSize)); } #else -@@ -342,6 +345,6 @@ + return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize)); +@@ -316,8 +319,8 @@ char tmpname[1024]; + printf( "testfile PR_GetFileInfo returned incorrect status-change time: %s\n", pathname); - printf("ft = %lld, ft1 = %lld\n",file_info.creationTime, @@ -1531,7 +2067,9 @@ + (long long)file_info1.creationTime); rv = -1; goto cleanup; -@@ -368,6 +371,6 @@ + } +@@ -342,8 +345,8 @@ char tmpname[1024]; + printf( "testfile PR_GetFileInfo returned incorrect modify time: %s\n", pathname); - printf("ft = %lld, ft1 = %lld\n",file_info.modifyTime, @@ -1540,7 +2078,9 @@ + (long long)file_info1.modifyTime); rv = -1; goto cleanup; -@@ -495,5 +498,5 @@ + } +@@ -469,7 +472,7 @@ File_Rdwr_Param *fparamp; + memset(fparamp->buf, i, len); t = create_new_thread(PR_USER_THREAD, - File_Write, (void *)fparamp, @@ -1547,7 +2087,9 @@ + (void *(*)(void *))File_Write, (void *)fparamp, PR_PRIORITY_NORMAL, scope, -@@ -530,5 +533,5 @@ + PR_UNJOINABLE_THREAD, +@@ -504,7 +507,7 @@ File_Rdwr_Param *fparamp; + fparamp->len = len; t = create_new_thread(PR_USER_THREAD, - File_Read, (void *)fparamp, @@ -1554,7 +2096,9 @@ + (void *(*)(void *))File_Read, (void *)fparamp, PR_PRIORITY_NORMAL, scope, -@@ -598,5 +601,5 @@ + PR_UNJOINABLE_THREAD, +@@ -572,7 +575,7 @@ struct dirtest_arg thrarg; + thrarg.done= 0; t = create_new_thread(PR_USER_THREAD, - DirTest, &thrarg, @@ -1561,57 +2105,47 @@ + (void *(*)(void *))DirTest, &thrarg, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, -@@ -953,6 +956,4 @@ - #if defined(XP_UNIX) || defined(XP_OS2_EMX) + PR_UNJOINABLE_THREAD, +@@ -895,8 +898,6 @@ int main(int argc, char **argv) + #endif + #if defined(XP_UNIX) || defined(XP_OS2) int opt; - extern char *optarg; - extern int optind; #endif - #if defined(XP_UNIX) || defined(XP_OS2_EMX) ---- ../pr/tests/thrpool_server.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/thrpool_server.c 2009-11-04 16:53:49.000000000 -0500 -@@ -351,5 +351,5 @@ + #if defined(XP_UNIX) || defined(XP_OS2) + while ((opt = getopt(argc, argv, "d")) != EOF) { +--- ../pr/tests/threads.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/threads.c 2015-11-04 02:02:20.459183000 +0000 +@@ -27,7 +27,7 @@ void + PR_CALLBACK + DumbThread(void *arg) + { +- PRInt32 tmp = (PRInt32)arg; ++ PRInt32 tmp = (PRInt32)(intptr_t)arg; + PRThreadScope scope = (PRThreadScope)tmp; + PRThread *thr; - DPRINTF(( -- "TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", -+ "TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", - netaddr.inet.ip, netaddr.inet.port)); +@@ -167,10 +167,10 @@ int main(int argc, char **argv) -@@ -363,5 +363,5 @@ - sp->iod.timeout = PR_SecondsToInterval(60); - sp->datalen = tcp_mesg_size; -- sp->exit_mon = sc_mon; -+ sp->exit_mon = NULL; - sp->job_counterp = &job_counter; - sp->conn_counter = 0; -@@ -486,5 +486,5 @@ + if (debug_mode) + { +- printf("\ +-** Tests lots of thread creations. \n\ +-** Create %ld native threads %ld times. \n\ +-** Create %ld user threads %ld times \n", iterations,count,iterations,count); ++ printf("** Tests lots of thread creations.\n" ++ "** Create %d native threads %d times.\n" ++ "** Create %d user threads %d times.\n", iterations, count, ++ iterations, count); + } - PR_ASSERT(NULL != jobp); -- DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp)); -+ DPRINTF(("TCP_Server: Created Serve_Client = %p\n", jobp)); + for (index=0; indexexit_mon); - printf("%30s","TCP_Socket_Client_Server_Test:"); -- printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, -+ printf(" 1 Server %2d Clients %2d connections_per_client\n", - num_tcp_clients, num_tcp_connections_per_client); -- printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":", -+ printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", - num_tcp_mesgs_per_connection, tcp_mesg_size); - ---- ../pr/tests/thrpool_client.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/thrpool_client.c Mon Jul 25 22:40:45 2005 -@@ -127,9 +127,9 @@ - for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n", + DPRINTF(("thread = %p: calling PR_Recv, bytes = %d\n", @@ -1622,7 +2156,9 @@ + DPRINTF(("thread = %p: returning from PR_Recv, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes < 0) { -@@ -152,9 +152,9 @@ + return -1; +@@ -107,11 +107,11 @@ writen(PRFileDesc *sockfd, char *buf, in + int offset = 0; for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n", @@ -1634,7 +2170,9 @@ + DPRINTF(("thread = %p: returning from PR_Send, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes <= 0) -@@ -209,5 +209,5 @@ + return -1; +@@ -164,7 +164,7 @@ TCP_Client(void *arg) + DPRINTF(("TCP client connecting to server:%d\n", server_port)); if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){ - fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n", @@ -1641,7 +2179,9 @@ + fprintf(stderr, "PR_Connect failed: (%d, %d)\n", PR_GetError(), PR_GetOSError()); failed_already=1; -@@ -218,5 +218,5 @@ + return; +@@ -173,7 +173,7 @@ TCP_Client(void *arg) + /* * fill in random data */ - memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes); @@ -1648,7 +2188,9 @@ + memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes); /* * write to server -@@ -326,5 +326,5 @@ + */ +@@ -281,7 +281,7 @@ TCP_Socket_Client_Server_Test(void) + PR_EnterMonitor(mon2); connections++; PR_ExitMonitor(mon2); - DPRINTF(("Created TCP client = 0x%lx\n", thr)); @@ -1655,7 +2197,9 @@ + DPRINTF(("Created TCP client = %p\n", thr)); } /* Wait for client jobs to exit */ -@@ -336,7 +336,7 @@ + PR_EnterMonitor(mon2); +@@ -291,9 +291,9 @@ TCP_Socket_Client_Server_Test(void) + } PR_ExitMonitor(mon2); printf("%30s","TCP_Socket_Client_Server_Test:"); - printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, @@ -1665,31 +2209,61 @@ + printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", num_tcp_mesgs_per_connection, tcp_mesg_size); ---- ../pr/tests/threads.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/threads.c Mon Jul 25 22:43:10 2005 -@@ -66,5 +66,5 @@ - DumbThread(void *arg) - { -- PRInt32 tmp = (PRInt32)arg; -+ PRInt32 tmp = (PRInt32)(intptr_t)arg; - PRThreadScope scope = (PRThreadScope)tmp; - PRThread *thr; -@@ -214,8 +214,8 @@ - if (debug_mode) - { -- printf("\ --** Tests lots of thread creations. \n\ --** Create %ld native threads %ld times. \n\ --** Create %ld user threads %ld times \n", iterations,count,iterations,count); -+ printf("** Tests lots of thread creations.\n" -+ "** Create %d native threads %d times.\n" -+ "** Create %d user threads %d times.\n", iterations, count, -+ iterations, count); + PR_DELETE(cparamp); +--- ../pr/tests/thrpool_server.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/thrpool_server.c 2015-11-04 02:02:20.458033000 +0000 +@@ -329,7 +329,7 @@ TCP_Server(void *arg) } ---- ../pr/tests/thruput.c.orig 2009-02-23 00:00:45.000000000 -0500 -+++ ../pr/tests/thruput.c 2009-11-04 16:56:33.000000000 -0500 -@@ -99,5 +99,5 @@ + DPRINTF(( +- "TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", ++ "TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", + netaddr.inet.ip, netaddr.inet.port)); + + sp = PR_NEW(Server_Param); +@@ -341,7 +341,7 @@ TCP_Server(void *arg) + sp->iod.socket = sockfd; + sp->iod.timeout = PR_SecondsToInterval(60); + sp->datalen = tcp_mesg_size; +- sp->exit_mon = sc_mon; ++ sp->exit_mon = NULL; + sp->job_counterp = &job_counter; + sp->conn_counter = 0; + sp->tp = tp; +@@ -464,7 +464,7 @@ TCP_Server_Accept(void *arg) + PR_FALSE); + + PR_ASSERT(NULL != jobp); +- DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp)); ++ DPRINTF(("TCP_Server: Created Serve_Client = %p\n", jobp)); + + /* + * single-threaded update; no lock needed +@@ -481,7 +481,7 @@ TCP_Server_Accept(void *arg) + print_stats, sp, PR_FALSE); + + PR_ASSERT(NULL != jobp); +- DPRINTF(("TCP_Server: Created print_stats timer job = 0x%lx\n", jobp)); ++ DPRINTF(("TCP_Server: Created print_stats timer job = %p\n", jobp)); + + exit: + PR_EnterMonitor(sp->exit_mon); +@@ -498,9 +498,9 @@ exit: + } + PR_DestroyMonitor(sp->exit_mon); + printf("%30s","TCP_Socket_Client_Server_Test:"); +- printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, ++ printf(" 1 Server %2d Clients %2d connections_per_client\n", + num_tcp_clients, num_tcp_connections_per_client); +- printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":", ++ printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", + num_tcp_mesgs_per_connection, tcp_mesg_size); + + DPRINTF(("%s: calling PR_ShutdownThreadPool\n", program_name)); +--- ../pr/tests/thruput.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/thruput.c 2015-11-04 02:02:20.459783000 +0000 +@@ -66,7 +66,7 @@ static void PR_CALLBACK Clientel(void *a + { PRStatus rv; PRFileDesc *xport; - PRInt32 bytes, sampled; @@ -1696,7 +2270,9 @@ + PRInt32 bytes, sampled = -1; PRIntervalTime now, interval; PRBool do_display = PR_FALSE; -@@ -208,5 +208,5 @@ + Shared *shared = (Shared*)arg; +@@ -175,7 +175,7 @@ static void Client(const char *server_na + static void PR_CALLBACK Servette(void *arg) { - PRInt32 bytes, sampled; @@ -1703,15 +2279,19 @@ + PRInt32 bytes, sampled = -1; PRIntervalTime now, interval; PRBool do_display = PR_FALSE; -@@ -405,4 +405,5 @@ + PRFileDesc *client = (PRFileDesc*)arg; +@@ -373,6 +373,7 @@ int main(int argc, char **argv) else Client(server_name); + return 0; + return 0; } /* main */ ---- ../pr/tests/timemac.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/timemac.c Mon Jul 25 22:45:33 2005 -@@ -63,5 +63,5 @@ + /* thruput.c */ +--- ../pr/tests/timemac.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/timemac.c 2015-11-04 02:02:20.460286000 +0000 +@@ -24,7 +24,7 @@ static void printExplodedTime(const PREx + const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - printf( "%s %s %ld %02ld:%02ld:%02ld ", @@ -1718,7 +2298,9 @@ + printf( "%s %s %d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); -@@ -79,5 +79,5 @@ + +@@ -40,7 +40,7 @@ static void printExplodedTime(const PREx + } hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); @@ -1725,7 +2307,9 @@ + printf("%s%02d%02d ", sign, hourOffset, minOffset); } -@@ -140,5 +140,5 @@ + /* Print year */ +@@ -97,7 +97,7 @@ int main(int argc, char** argv) + printf("Current local time is "); printExplodedTime(&et); printf("\n"); - printf("GMT offset is %ld, DST offset is %ld\n", @@ -1732,9 +2316,11 @@ + printf("GMT offset is %d, DST offset is %d\n", et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset); t2 = PR_ImplodeTime(&et); ---- ../pr/tests/timetest.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/timetest.c Mon Jul 25 22:48:03 2005 -@@ -75,5 +75,5 @@ + if (LL_NE(t1, t2)) { +--- ../pr/tests/timetest.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/timetest.c 2015-11-04 02:02:20.460982000 +0000 +@@ -36,7 +36,7 @@ static void PrintExplodedTime(const PREx + const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ", @@ -1741,7 +2327,9 @@ + if (debug_mode) printf("%s %s %d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); -@@ -92,5 +92,5 @@ + +@@ -53,7 +53,7 @@ static void PrintExplodedTime(const PREx + hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; if (debug_mode) - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); @@ -1748,7 +2336,9 @@ + printf("%s%02d%02d ", sign, hourOffset, minOffset); } -@@ -276,5 +276,5 @@ + /* Print year */ +@@ -232,7 +232,7 @@ int main(int argc, char** argv) + if (debug_mode) printf("Current local time is "); PrintExplodedTime(&et); if (debug_mode) printf("\n"); - if (debug_mode) printf("GMT offset is %ld, DST offset is %ld\n", @@ -1755,9 +2345,11 @@ + if (debug_mode) printf("GMT offset is %d, DST offset is %d\n", et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset); t2 = PR_ImplodeTime(&et); ---- ../pr/tests/y2k.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/y2k.c Mon Jul 25 22:49:18 2005 -@@ -82,5 +82,5 @@ + if (LL_NE(t1, t2)) { +--- ../pr/tests/y2k.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/y2k.c 2015-11-04 02:02:20.461806000 +0000 +@@ -43,7 +43,7 @@ static void PrintExplodedTime(const PREx + const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - printf("%s %s %2ld %02ld:%02ld:%02ld ", @@ -1764,7 +2356,9 @@ + printf("%s %s %2d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); -@@ -101,5 +101,5 @@ + +@@ -62,7 +62,7 @@ static void PrintExplodedTime(const PREx + } hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); @@ -1771,9 +2365,11 @@ + printf("%s%02d%02d ", sign, hourOffset, minOffset); } #ifdef PRINT_DETAILS ---- ../pr/tests/y2ktmo.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/y2ktmo.c Mon Jul 25 22:58:00 2005 -@@ -95,5 +95,5 @@ + printf("{%d, %d, %d, %d, %d, %d, %d, %d, %d, { %d, %d}}\n",et->tm_usec, +--- ../pr/tests/y2ktmo.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/y2ktmo.c 2015-11-04 02:02:20.462515000 +0000 +@@ -70,7 +70,7 @@ static struct _timeb start_time_tb; + static void SleepThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1780,7 +2376,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -142,5 +142,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -121,7 +121,7 @@ static void SleepThread(void *arg) + static void AcceptThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1787,7 +2385,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -214,5 +214,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -197,7 +197,7 @@ static void AcceptThread(void *arg) + static void PollThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1794,7 +2394,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -289,5 +289,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -276,7 +276,7 @@ static void PollThread(void *arg) + static void WaitCondVarThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1801,7 +2403,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -349,5 +349,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -340,7 +340,7 @@ static void WaitCondVarThread(void *arg) + static void WaitMonitorThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1808,7 +2412,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -402,5 +402,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -397,7 +397,7 @@ static void WaitMonitorThread(void *arg) + static void WaitCMonitorThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; @@ -1815,7 +2421,9 @@ + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) -@@ -525,5 +525,5 @@ + PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); +@@ -528,7 +528,7 @@ int main(int argc, char **argv) + for (i = 0; i < num_thread_scopes; i++) { for (j = 0; j < num_thread_funcs; j++) { threads[idx] = PR_CreateThread(PR_USER_THREAD, threadFuncs[j], - (void*)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL, @@ -1822,9 +2430,10 @@ + (void*)(intptr_t)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL, threadScopes[i], PR_JOINABLE_THREAD, 0); if (threads[idx] == NULL) { ---- ../pr/tests/zerolen.c.orig 2012-03-06 14:14:33.000000000 +0100 -+++ ../pr/tests/zerolen.c 2012-06-04 13:39:40.000000000 +0200 -@@ -45,7 +45,7 @@ + fprintf(stderr, "PR_CreateThread failed\n"); +--- ../pr/tests/zerolen.c.orig 2015-10-16 13:22:19.000000000 +0000 ++++ ../pr/tests/zerolen.c 2015-11-04 02:02:20.463071000 +0000 +@@ -45,7 +45,7 @@ static void ClientThread(void *arg) { PRFileDesc *sock; PRNetAddr addr; @@ -1833,7 +2442,7 @@ char buf[1024]; PRInt32 nbytes; -@@ -127,7 +127,7 @@ +@@ -127,7 +127,7 @@ int main() * First test PR_Writev. */ clientThread = PR_CreateThread(PR_USER_THREAD, @@ -1842,7 +2451,7 @@ PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); -@@ -171,7 +171,7 @@ +@@ -171,7 +171,7 @@ int main() * Then test PR_Write. */ clientThread = PR_CreateThread(PR_USER_THREAD, @@ -1851,7 +2460,7 @@ PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); -@@ -216,7 +216,7 @@ +@@ -216,7 +216,7 @@ int main() * Finally test PR_Send. */ clientThread = PR_CreateThread(PR_USER_THREAD, @@ -1860,188 +2469,3 @@ PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); ---- ../pr/tests/runtests.sh Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/runtests.sh Tue Jul 26 00:01:35 2005 -@@ -85,7 +85,4 @@ - # - --#forktest (failed on IRIX) --#nbconn - fails on some platforms --#poll_er - fails on some platforms? limited use? - #prpoll - the bad-FD test needs to be moved to a different test - #sleep - specific to OS/2 -@@ -119,4 +116,5 @@ - fileio - foreign -+forktest - formattm - fsync -@@ -126,5 +124,4 @@ - initclk - inrval --instrumt - intrio - intrupt -@@ -146,4 +143,5 @@ - multiwait - nameshm1 -+nbconn - nblayer - nonblock -@@ -161,4 +159,5 @@ - pipeping2 - pipeself -+poll_er - poll_nm - poll_to -@@ -230,5 +229,5 @@ - printf "BEGIN\t\t\t`date`\n" - printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n" --printf "Test\t\t\tResult\n\n" -+printf " Test\t\t\tResult\n\n" - if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then - for prog in $TESTS -@@ -248,8 +247,6 @@ - for prog in $TESTS - do -- printf "$prog" -- printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1 -- export test_rval -- ./$prog >> ${LOGFILE} 2>&1 & -+ printf %16s $prog -+ ./$prog >> $prog.output 2>&1 & - test_pid=$! - sleep_pid=0 -@@ -266,7 +263,7 @@ - else - printf "\t\t\tFAILED\n"; -+ sed "s,^, $prog: ," < $prog.output - rval=1 - fi; -- printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1 - done - fi; -@@ -274,19 +271,2 @@ - printf "END\t\t\t`date`\n" - exit $rval -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ---- ../pr/tests/server_test.c.orig 2009-03-18 10:49:45.000000000 +0100 -+++ ../pr/tests/server_test.c 2009-06-17 09:30:18.000000000 +0200 -@@ -92,7 +92,7 @@ - #ifdef DEBUGPRINTS - #define DPRINTF printf - #else --#define DPRINTF -+#define DPRINTF(...) - #endif - - -@@ -534,6 +534,7 @@ - do_work(); - } - -+#if 0 - static void do_workUK(void) - { - ServerScope = PR_LOCAL_THREAD; -@@ -554,6 +555,7 @@ - ClientScope = PR_GLOBAL_THREAD; - do_work(); - } -+#endif - - - static void Measure(void (*func)(void), const char *msg) ---- ../pr/tests/servr_ku.c.orig 2009-03-18 10:49:46.000000000 +0100 -+++ ../pr/tests/servr_ku.c 2009-06-17 09:51:45.000000000 +0200 -@@ -89,7 +89,7 @@ - #ifdef DEBUGPRINTS - #define DPRINTF printf - #else --#define DPRINTF -+#define DPRINTF(...) - #endif - - PRIntn failed_already=0; ---- ../pr/tests/servr_uk.c.orig 2009-03-18 10:49:46.000000000 +0100 -+++ ../pr/tests/servr_uk.c 2009-06-17 09:53:37.000000000 +0200 -@@ -89,7 +89,7 @@ - #ifdef DEBUGPRINTS - #define DPRINTF printf - #else --#define DPRINTF -+#define DPRINTF(...) - #endif - - PRIntn failed_already=0; ---- ../pr/tests/servr_uu.c.orig 2009-03-18 10:49:46.000000000 +0100 -+++ ../pr/tests/servr_uu.c 2009-06-17 09:55:30.000000000 +0200 -@@ -89,7 +89,7 @@ - #ifdef DEBUGPRINTS - #define DPRINTF printf - #else --#define DPRINTF -+#define DPRINTF(...) - #endif - - PRIntn failed_already=0; ---- ../pr/tests/cltsrv.c 2009-05-06 01:40:38.000000000 -0400 -+++ ../pr/tests/cltsrv.c 2009-11-04 15:34:25.000000000 -0500 -@@ -920,5 +920,5 @@ - PRUintn index; - PRBool boolean; -- CSClient_t *client; -+ CSClient_t *client = NULL; - PRStatus rv, joinStatus; - CSServer_t *server = NULL; ---- ../pr/tests/parsetm.c 2009-05-11 18:23:19.000000000 -0400 -+++ ../pr/tests/parsetm.c 2009-11-04 16:27:29.000000000 -0500 -@@ -64,6 +64,6 @@ - /* Print day of the week, month, day, hour, minute, and second */ - if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ", -- dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, -- et->tm_hour, et->tm_min, et->tm_sec); -+ dayOfWeek[et->tm_wday], month[et->tm_month], (long)et->tm_mday, -+ (long)et->tm_hour, (long)et->tm_min, (long)et->tm_sec); - - /* Print time zone */ -@@ -80,4 +80,4 @@ - minOffset = (totalOffset % 3600) / 60; - if (debug_mode) -- printf("%s%02ld%02ld ", sign, hourOffset, minOffset); -+ printf("%s%02ld%02ld ", sign, (long)hourOffset, (long)minOffset); - } ---- ../pr/tests/provider.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/provider.c 2009-11-04 16:29:30.000000000 -0500 -@@ -1082,5 +1082,5 @@ - PRUintn index; - PRBool boolean; -- CSClient_t *client; -+ CSClient_t *client = NULL; - PRStatus rv, joinStatus; - CSServer_t *server = NULL; ---- ../pr/tests/switch.c 2009-05-06 01:40:39.000000000 -0400 -+++ ../pr/tests/switch.c 2009-11-04 16:48:07.000000000 -0500 -@@ -113,5 +113,5 @@ - PRBool help = PR_FALSE; - PRUintn concurrency = 1; -- Shared *shared, *link; -+ Shared *shared = NULL, *link; - PRIntervalTime timein, timeout; - PRThreadScope thread_scope = PR_LOCAL_THREAD; Index: Mk/Uses/gecko.mk =================================================================== --- Mk/Uses/gecko.mk (revision 400595) +++ Mk/Uses/gecko.mk (working copy) @@ -37,12 +37,12 @@ .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 38 -_GECKO_VERSIONS= 38 41 +_GECKO_VERSIONS= 38 42 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +42_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null Index: www/firefox/Makefile =================================================================== --- www/firefox/Makefile (revision 400595) +++ www/firefox/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 41.0.2 +DISTVERSION= 42.0 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 @@ -12,7 +12,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \ nss>=3.19.2:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ @@ -25,8 +25,8 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip -# opus>=1.1:${PORTSDIR}/audio/opus \ + unzip:${PORTSDIR}/archivers/unzip \ + libav>0:${PORTSDIR}/multimedia/libav LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -40,6 +40,7 @@ QT_NONSTANDARD= yes USE_GL= gl USES= dos2unix tar:xz + DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp FIREFOX_ICON= ${MOZILLA}.png @@ -46,7 +47,7 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --enable-application=browser \ - --enable-official-branding + --enable-official-branding --with-system-av OPTIONS_EXCLUDE= LOGGING OPTIONS_DEFAULT= GTK2 @@ -57,7 +58,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC:= ${WRKDIR}/mozilla-release +WRKSRC:= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if ${PORT_OPTIONS:MALSA} RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib Index: www/firefox/distinfo =================================================================== --- www/firefox/distinfo (revision 400595) +++ www/firefox/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (firefox-41.0.2.source.tar.xz) = ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e -SIZE (firefox-41.0.2.source.tar.xz) = 159761468 +SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae +SIZE (firefox-42.0.source.tar.xz) = 165766832 Index: www/firefox/files/patch-browser-app-nsBrowserApp.cpp =================================================================== --- www/firefox/files/patch-browser-app-nsBrowserApp.cpp (revision 400595) +++ www/firefox/files/patch-browser-app-nsBrowserApp.cpp (working copy) @@ -1,6 +1,6 @@ --- browser/app/nsBrowserApp.cpp~ +++ browser/app/nsBrowserApp.cpp -@@ -417,6 +417,8 @@ int main(int argc, char* argv[]) +@@ -338,6 +338,8 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif Index: www/firefox/files/patch-bug1181382 =================================================================== --- www/firefox/files/patch-bug1181382 (revision 400595) +++ www/firefox/files/patch-bug1181382 (working copy) @@ -1,15 +0,0 @@ ---- dom/mobilemessage/MobileMessageManager.h.orig 2015-09-17 22:13:25 UTC -+++ dom/mobilemessage/MobileMessageManager.h -@@ -14,11 +14,11 @@ - class nsISmsService; - class nsIDOMMozSmsMessage; - class nsIDOMMozMmsMessage; --class Promise; - - namespace mozilla { - namespace dom { - -+class Promise; - class DOMRequest; - class DOMCursor; - struct MmsParameters; Index: www/firefox/files/patch-bug779713 =================================================================== --- www/firefox/files/patch-bug779713 (revision 400595) +++ www/firefox/files/patch-bug779713 (working copy) @@ -1,37 +1,6 @@ -diff --git mfbt/Alignment.h mfbt/Alignment.h -index e0843ca..353ec36 100644 ---- mfbt/Alignment.h -+++ mfbt/Alignment.h -@@ -9,11 +9,20 @@ - #ifndef mozilla_Alignment_h - #define mozilla_Alignment_h - -+#include "mozilla/Attributes.h" -+ - #include - #include - - namespace mozilla { - -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+#define MOZ_ALIGNOF(T) alignof(T) -+#elif defined(__GNUC__) -+#define MOZ_ALIGNOF(T) __alignof__(T) -+#elif defined(_MSC_VER) -+#define MOZ_ALIGNOF(T) __alignof(T) -+#else - /* - * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many - * bytes of alignment a given type needs. -@@ -32,6 +41,7 @@ public: - }; - - #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder::alignment -+#endif - - /* - * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types. -@@ -43,7 +53,10 @@ public: +--- mfbt/Alignment.h.orig 2015-10-29 22:17:54.000000000 +0000 ++++ mfbt/Alignment.h 2015-11-03 21:24:20.123910000 +0000 +@@ -44,7 +45,10 @@ * will declare a two-character array |arr| aligned to 8 bytes. */ @@ -43,33 +12,3 @@ # define MOZ_ALIGNED_DECL(_type, _align) \ _type __attribute__((aligned(_align))) #elif defined(_MSC_VER) -diff --git mfbt/Attributes.h mfbt/Attributes.h -index d317766..ddb13da 100644 ---- mfbt/Attributes.h -+++ mfbt/Attributes.h -@@ -50,6 +50,7 @@ - * don't indicate support for them here, due to - * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug - */ -+# define MOZ_HAVE_CXX11_ALIGNAS - # define MOZ_HAVE_NEVER_INLINE __declspec(noinline) - # define MOZ_HAVE_NORETURN __declspec(noreturn) - # ifdef __clang__ -@@ -70,6 +71,9 @@ - # ifndef __has_extension - # define __has_extension __has_feature /* compatibility, for older versions of clang */ - # endif -+# if __has_extension(cxx_alignas) -+# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # if __has_extension(cxx_constexpr) - # define MOZ_HAVE_CXX11_CONSTEXPR - # endif -@@ -86,6 +90,7 @@ - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L - # define MOZ_HAVE_CXX11_CONSTEXPR - # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) -+# define MOZ_HAVE_CXX11_ALIGNAS - # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES - # endif - # define MOZ_HAVE_EXPLICIT_CONVERSION Index: www/firefox/files/patch-bug847568 =================================================================== --- www/firefox/files/patch-bug847568 (revision 400595) +++ www/firefox/files/patch-bug847568 (working copy) @@ -174,7 +174,7 @@ index 1d0c2f9..adb8941 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']: +@@ -675,6 +675,9 @@ if CONFIG['GNU_CXX']: if CONFIG['CPU_ARCH'] == 'arm': SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] Index: www/firefox/files/patch-bug981348 =================================================================== --- www/firefox/files/patch-bug981348 (revision 400595) +++ www/firefox/files/patch-bug981348 (working copy) @@ -1,14 +1,12 @@ -diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp -index 4b21361..cb3be32 100644 --- dom/system/OSFileConstants.cpp +++ dom/system/OSFileConstants.cpp -@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] = +@@ -662,7 +662,7 @@ - { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) }, + { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) }, -- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) }, -+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) }, - { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) }, +- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) }, ++ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) }, + { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) }, #endif // defined(XP_UNIX) diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm Index: www/firefox/files/patch-memory-jemalloc-Makefile.in =================================================================== --- www/firefox/files/patch-memory-jemalloc-Makefile.in (revision 400595) +++ www/firefox/files/patch-memory-jemalloc-Makefile.in (working copy) @@ -1,10 +1,11 @@ ---- memory/jemalloc/Makefile.in~ -+++ memory/jemalloc/Makefile.in -@@ -7,3 +7,7 @@ include $(topsrcdir)/config/rules.mk - ifdef GNU_CC - CFLAGS += -std=gnu99 +--- memory/mozjemalloc/Makefile.in.orig 2015-11-03 22:02:29.393485000 +0000 ++++ memory/mozjemalloc/Makefile.in 2015-11-03 22:02:40.241624000 +0000 +@@ -17,3 +17,8 @@ endif endif -+ + endif + ++include $(topsrcdir)/config/config.mk ++ +# XXX startup crash workaround for gcc47 on amd64 +jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS)) +jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS= Index: www/firefox/files/patch-noyasm =================================================================== --- www/firefox/files/patch-noyasm (revision 0) +++ www/firefox/files/patch-noyasm (working copy) @@ -0,0 +1,77 @@ +--- configure.in ++++ configure.in +@@ -6404,74 +6404,6 @@ elif test -n "$MOZ_LIBJPEG_TURBO"; then + fi + + dnl ======================================================== +-dnl = libav-fft configuration +-dnl ======================================================== +- +-MOZ_LIBAV_FFT= +- +-dnl Turn on libav-fft for 32-bit windows, and all 64-bit supported platforms. +-dnl 32-bit linux/os x have text relocation issues. +- +-case "$OS_ARCH:$CPU_ARCH" in +- WINNT:x86) +- MOZ_LIBAV_FFT=1 +- ;; +- *:x86_64) +- MOZ_LIBAV_FFT=1 +- ;; +-esac +- +-dnl Detect if we can use yasm to compile libav's assembly +- +-if test -n "$MOZ_LIBAV_FFT"; then +- AC_DEFINE(MOZ_LIBAV_FFT) +- dnl Do we support libav-fft on this platform? +- case "$OS_ARCH:$CPU_ARCH" in +- Darwin:x86_64) +- LIBAV_FFT_ASFLAGS="-f macho64 -rnasm -pnasm -D__x86_64__ -DPIC -DMACHO" +- ;; +- WINNT:x86) +- LIBAV_FFT_ASFLAGS="-f win32 -rnasm -pnasm -DPIC -DWIN32" +- ;; +- WINNT:x86_64) +- LIBAV_FFT_ASFLAGS="-f win64 -rnasm -pnasm -D__x86_64__ -DPIC -DWIN64 -DMSVC" +- ;; +- *:x86_64) +- if $CC -E -dM -setSampleRate(mInRate); + mTimeStretcher->setChannels(mOutChannels); + mTimeStretcher->setPitch(1.0); +--- ./dom/media/AudioStream.h.orig 2015-10-29 22:17:56.000000000 +0000 ++++ ./dom/media/AudioStream.h 2015-11-04 04:07:11.783405000 +0000 +@@ -15,7 +15,7 @@ + #include "mozilla/RefPtr.h" + #include "mozilla/UniquePtr.h" + #include "CubebUtils.h" +-#include "soundtouch/SoundTouchFactory.h" ++#include "soundtouch/SoundTouch.h" + + namespace mozilla { + +@@ -329,7 +329,7 @@ private: + // Number of frames written to the buffers. + int64_t mWritten; + AudioClock mAudioClock; +- soundtouch::SoundTouch* mTimeStretcher; ++ nsAutoPtr mTimeStretcher; + nsRefPtr mLatencyLog; + + // copy of Latency logger's starting time for offset calculations +--- ./media/libsoundtouch/src/SoundTouchFactory.cpp.orig 2015-10-29 22:17:50.000000000 +0000 ++++ ./media/libsoundtouch/src/SoundTouchFactory.cpp 2015-11-04 04:07:11.783823000 +0000 +@@ -1,31 +0,0 @@ +-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* vim:set ts=2 sw=2 sts=2 et cindent: */ +-/* This Source Code Form is subject to the terms of the Mozilla Public +- * License, v. 2.0. If a copy of the MPL was not distributed with this +- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +- +-#include +- +-namespace soundtouch +-{ +- +-EXPORT +-soundtouch::SoundTouch* +-createSoundTouchObj() +-{ +- return new soundtouch::SoundTouch(); +-} +- +-EXPORT +-void +-destroySoundTouchObj(soundtouch::SoundTouch* aObj) +-{ +- // SoundTouch runs deletes in its destructor, meaning they need to be run in +- // the DLL context. Gecko should send its SoundTouch obj pointers here to be +- // cleaned up. +- if (aObj) { +- delete aObj; +- } +-} +- +-} +--- ./media/libsoundtouch/src/SoundTouchFactory.h.orig 2015-10-29 22:17:50.000000000 +0000 ++++ ./media/libsoundtouch/src/SoundTouchFactory.h 2015-11-04 04:07:11.784212000 +0000 +@@ -1,22 +0,0 @@ +-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* vim:set ts=2 sw=2 sts=2 et cindent: */ +-/* This Source Code Form is subject to the terms of the Mozilla Public +- * License, v. 2.0. If a copy of the MPL was not distributed with this +- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +- +-// Code for dealing with creating/deleting SoundTouch objects across DLL +-// boundaries. +- +-#include +-#include +- +-namespace soundtouch +-{ +-EXPORT +-soundtouch::SoundTouch* +-createSoundTouchObj(); +- +-EXPORT +-void +-destroySoundTouchObj(soundtouch::SoundTouch* aObj); +-} +--- ./media/libsoundtouch/src/moz.build.orig 2015-10-29 22:17:50.000000000 +0000 ++++ ./media/libsoundtouch/src/moz.build 2015-11-04 04:07:11.784640000 +0000 +@@ -8,7 +8,6 @@ EXPORTS.soundtouch += [ + 'FIFOSamplePipe.h', + 'SoundTouch.h', + 'soundtouch_config.h', +- 'SoundTouchFactory.h', + 'STTypes.h', + ] + +@@ -22,7 +21,6 @@ UNIFIED_SOURCES += [ + 'InterpolateShannon.cpp', + 'RateTransposer.cpp', + 'SoundTouch.cpp', +- 'SoundTouchFactory.cpp', + 'TDStretch.cpp', + ] + +--- ./media/libsoundtouch/src/soundtouch_perms.h.orig 2015-10-29 22:17:50.000000000 +0000 ++++ ./media/libsoundtouch/src/soundtouch_perms.h 2015-11-04 04:07:11.785026000 +0000 +@@ -12,7 +12,6 @@ + + #pragma GCC visibility push(default) + #include "SoundTouch.h" +-#include "SoundTouchFactory.h" + #pragma GCC visibility pop + + #endif // MOZILLA_SOUNDTOUCH_PERMS_H Property changes on: www/firefox/files/patch-soundtouch-revert ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/firefox/files/patch-z-bug517422 =================================================================== --- www/firefox/files/patch-z-bug517422 (revision 400595) +++ www/firefox/files/patch-z-bug517422 (working copy) @@ -67,19 +67,18 @@ ] DIRS += ['../../' + i for i in external_dirs] -diff --git config/system-headers config/system-headers -index bef567c..9807c29 100644 --- config/system-headers +++ config/system-headers -@@ -1263,7 +1263,6 @@ X11/Xlocale.h +@@ -1257,8 +1257,6 @@ X11/Xlocale.h X11/Xos.h X11/Xutil.h zmouse.h -soundtouch/SoundTouch.h - #if MOZ_NATIVE_PNG==1 - png.h +-soundtouch/SoundTouchFactory.h + #if MOZ_LIBAV_FFT==1 + libavcodec/avfft.h #endif -@@ -1325,6 +1324,7 @@ vorbis/codec.h +@@ -1323,6 +1321,7 @@ vorbis/codec.h theora/theoradec.h tremor/ivorbiscodec.h speex/speex_resampler.h @@ -87,7 +86,7 @@ ogg/ogg.h ogg/os_types.h nestegg/nestegg.h -@@ -1365,3 +1365,35 @@ graphite2/Segment.h +@@ -1364,3 +1363,35 @@ graphite2/Segment.h harfbuzz/hb-ot.h harfbuzz/hb.h #endif @@ -285,19 +284,6 @@ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 085676d..00c54fb 100644 ---- dom/media/AudioStream.h -+++ dom/media/AudioStream.h -@@ -17,7 +17,7 @@ - #include "CubebUtils.h" - - namespace soundtouch { --class SoundTouch; -+class MOZ_IMPORT_API SoundTouch; - } - - namespace mozilla { diff --git dom/media/moz.build dom/media/moz.build index 7526cff..e0a0ca0 100644 --- dom/media/moz.build Index: www/firefox-i18n/Makefile =================================================================== --- www/firefox-i18n/Makefile (revision 400595) +++ www/firefox-i18n/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 41.0.2 +PORTVERSION= 42.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi @@ -15,7 +15,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,41,build +USES= zip:infozip gecko:firefox,42,build USE_XPI= firefox linux-firefox NO_ARCH= yes Index: www/firefox-i18n/distinfo =================================================================== --- www/firefox-i18n/distinfo (revision 400595) +++ www/firefox-i18n/distinfo (working copy) @@ -1,178 +1,178 @@ -SHA256 (xpi/firefox-i18n-41.0.2/ach.xpi) = 3b332869d2deaf179015e59edc3f6c7ee0338018ae0c542d173f0805bfc22064 -SIZE (xpi/firefox-i18n-41.0.2/ach.xpi) = 483441 -SHA256 (xpi/firefox-i18n-41.0.2/af.xpi) = 483ebf4ad220bc63b00fc5ed14cc0daa5093e8618a1f766e27ef7ea702d88404 -SIZE (xpi/firefox-i18n-41.0.2/af.xpi) = 486122 -SHA256 (xpi/firefox-i18n-41.0.2/an.xpi) = 141e88b1570061128d7538b86f8a506c9ade736532127615470ab52d2305b43b -SIZE (xpi/firefox-i18n-41.0.2/an.xpi) = 464518 -SHA256 (xpi/firefox-i18n-41.0.2/ar.xpi) = fbe22a9b348c6a822c7578392d65f229be88da6d03908160ff1c84dc0712884f -SIZE (xpi/firefox-i18n-41.0.2/ar.xpi) = 521161 -SHA256 (xpi/firefox-i18n-41.0.2/as.xpi) = 95b7be1a421bd70d66f6564df38692230a6cbbcac8f9f49be8ec0a8fd1c11beb -SIZE (xpi/firefox-i18n-41.0.2/as.xpi) = 511220 -SHA256 (xpi/firefox-i18n-41.0.2/ast.xpi) = ab8e967adfefe0e91290f72617a073790ef279485c06745f9541b329db8051b7 -SIZE (xpi/firefox-i18n-41.0.2/ast.xpi) = 399124 -SHA256 (xpi/firefox-i18n-41.0.2/az.xpi) = b4427e377344c51f76b3707bfbf81d1f7a2bdd507dd06794cfd39a24de9e9017 -SIZE (xpi/firefox-i18n-41.0.2/az.xpi) = 492918 -SHA256 (xpi/firefox-i18n-41.0.2/be.xpi) = c225c0927f0855462c4157c3cdcb89660202c1dc16689a66ad8be7cef837fefd -SIZE (xpi/firefox-i18n-41.0.2/be.xpi) = 453405 -SHA256 (xpi/firefox-i18n-41.0.2/bg.xpi) = 7a8f79c1d0b2ec0a5838d2b94c0c920e7143d1be8186122663853ac9748a088d -SIZE (xpi/firefox-i18n-41.0.2/bg.xpi) = 492967 -SHA256 (xpi/firefox-i18n-41.0.2/bn-BD.xpi) = dafbf53ff047ccd787c6996989126feb4749b4569967d47bd6fba56f51055e43 -SIZE (xpi/firefox-i18n-41.0.2/bn-BD.xpi) = 527572 -SHA256 (xpi/firefox-i18n-41.0.2/bn-IN.xpi) = e12b7af83786242d78b28b6e398db791fe336bfda9cecde66b0275feabca0dca -SIZE (xpi/firefox-i18n-41.0.2/bn-IN.xpi) = 530270 -SHA256 (xpi/firefox-i18n-41.0.2/br.xpi) = f1b321fa81746f334c795555d6cc5e6196462a22bcd4e2f8092a413209ab1bb8 -SIZE (xpi/firefox-i18n-41.0.2/br.xpi) = 444532 -SHA256 (xpi/firefox-i18n-41.0.2/bs.xpi) = f0998f8e15698245757ce27b5b91bc228b3dc7e182029594f500cc7b6bb0ae03 -SIZE (xpi/firefox-i18n-41.0.2/bs.xpi) = 486282 -SHA256 (xpi/firefox-i18n-41.0.2/ca.xpi) = a81e043f4cae9e5aba31e904899d57aaf55001a4f7f1967e6262aa2632b7f3e8 -SIZE (xpi/firefox-i18n-41.0.2/ca.xpi) = 461322 -SHA256 (xpi/firefox-i18n-41.0.2/cs.xpi) = 3dd5156b50781e20caac4c96c42631f60c0c8d06a28f7e495f17bb43dff60bc0 -SIZE (xpi/firefox-i18n-41.0.2/cs.xpi) = 450334 -SHA256 (xpi/firefox-i18n-41.0.2/cy.xpi) = 93a3c98479aa4be8531e4665eef9b0051605cf1d4c897147b223e1a350a3221a -SIZE (xpi/firefox-i18n-41.0.2/cy.xpi) = 448184 -SHA256 (xpi/firefox-i18n-41.0.2/da.xpi) = 5cac7e3161cc1fc01cc22ba9b9f10a58dd111c241c5305589249987643877ad0 -SIZE (xpi/firefox-i18n-41.0.2/da.xpi) = 453404 -SHA256 (xpi/firefox-i18n-41.0.2/de.xpi) = d7d0130fe5dfadaffd2585665e53390dae2572209176070d810345145f9a86cf -SIZE (xpi/firefox-i18n-41.0.2/de.xpi) = 455711 -SHA256 (xpi/firefox-i18n-41.0.2/dsb.xpi) = f59b75f1a340a80ac4ddb781d77a3e3bf102496677828446aa2a79064195f41c -SIZE (xpi/firefox-i18n-41.0.2/dsb.xpi) = 474538 -SHA256 (xpi/firefox-i18n-41.0.2/el.xpi) = 36719f38269d0819ea05fe2a46c89cb4bd2859d26a740c46901e94e4bbd40175 -SIZE (xpi/firefox-i18n-41.0.2/el.xpi) = 501621 -SHA256 (xpi/firefox-i18n-41.0.2/en-GB.xpi) = 0c0029261b1f446e33aca64a3b6d42d5da1d3399770c3ace221d37fd44a9ca83 -SIZE (xpi/firefox-i18n-41.0.2/en-GB.xpi) = 441099 -SHA256 (xpi/firefox-i18n-41.0.2/en-US.xpi) = cb7eab8536840a63409b5480170046227540d89f1973d121f713e1d59240f150 -SIZE (xpi/firefox-i18n-41.0.2/en-US.xpi) = 471247 -SHA256 (xpi/firefox-i18n-41.0.2/en-ZA.xpi) = 830d11b44164e2a92a9bd68fb7b85b095de7e4fc2ea92bae1fa316688868b695 -SIZE (xpi/firefox-i18n-41.0.2/en-ZA.xpi) = 444146 -SHA256 (xpi/firefox-i18n-41.0.2/eo.xpi) = 2aa44595d2745809a989a533584de0ad4f3c63de2e1b5b8536645b5e05d88b28 -SIZE (xpi/firefox-i18n-41.0.2/eo.xpi) = 487996 -SHA256 (xpi/firefox-i18n-41.0.2/es-AR.xpi) = 2c70f52a537657073bc02530015a950c08d8248033426af2678e99c6680ec25c -SIZE (xpi/firefox-i18n-41.0.2/es-AR.xpi) = 456519 -SHA256 (xpi/firefox-i18n-41.0.2/es-CL.xpi) = d1cf2f9c65022cdc241ddaa168054467a53f32542744f79e85a8ee986bc4df4c -SIZE (xpi/firefox-i18n-41.0.2/es-CL.xpi) = 381634 -SHA256 (xpi/firefox-i18n-41.0.2/es-ES.xpi) = 719cbe56de47866677d1102dd3f962be403339f8979eaac619c5c8c2eceaecb3 -SIZE (xpi/firefox-i18n-41.0.2/es-ES.xpi) = 370112 -SHA256 (xpi/firefox-i18n-41.0.2/es-MX.xpi) = e55cd314abaa79123fec2bf8bae49afaf8771065c0698ac0ba996844bd608457 -SIZE (xpi/firefox-i18n-41.0.2/es-MX.xpi) = 460285 -SHA256 (xpi/firefox-i18n-41.0.2/et.xpi) = aa542ee5e33cbe402819741ded10402fa8e9f962cdb877cfbabf1d84290d982c -SIZE (xpi/firefox-i18n-41.0.2/et.xpi) = 445440 -SHA256 (xpi/firefox-i18n-41.0.2/eu.xpi) = e489687bff01f23761a2419d406885d0d0f21c9c5837994698ac037720a85145 -SIZE (xpi/firefox-i18n-41.0.2/eu.xpi) = 469718 -SHA256 (xpi/firefox-i18n-41.0.2/fa.xpi) = 229d1e5c884b8efdccb591d2b7a10cb58926bfab8c1bd4a71c3eb1aa155a1050 -SIZE (xpi/firefox-i18n-41.0.2/fa.xpi) = 516159 -SHA256 (xpi/firefox-i18n-41.0.2/ff.xpi) = d09fa597de20f69d7332a63abafd97edfada4b42a9f4e3cd55b2720adb644120 -SIZE (xpi/firefox-i18n-41.0.2/ff.xpi) = 454689 -SHA256 (xpi/firefox-i18n-41.0.2/fi.xpi) = 9e8a4e9446f614cafa6a7d712e6111f8443c255c5ed37fb2b67fc4936fa71c8c -SIZE (xpi/firefox-i18n-41.0.2/fi.xpi) = 447176 -SHA256 (xpi/firefox-i18n-41.0.2/fr.xpi) = fae768e7985278c934aefcdb00276e8c78b68ec84ef6247a83071be23f29a508 -SIZE (xpi/firefox-i18n-41.0.2/fr.xpi) = 465093 -SHA256 (xpi/firefox-i18n-41.0.2/fy-NL.xpi) = 2b44c34009035ce1b2745d2ad7a8e33075816064c5211ec2d7e1a952ae4ca448 -SIZE (xpi/firefox-i18n-41.0.2/fy-NL.xpi) = 458776 -SHA256 (xpi/firefox-i18n-41.0.2/ga-IE.xpi) = 9fcc57c31db1d99c10fc97836ab1c194f24ed9766e07f164f6696b63b0fe2c76 -SIZE (xpi/firefox-i18n-41.0.2/ga-IE.xpi) = 473257 -SHA256 (xpi/firefox-i18n-41.0.2/gd.xpi) = dca6278f751731680bc8c59d021e26f19a208e9c161721d9964ef12b400cc57a -SIZE (xpi/firefox-i18n-41.0.2/gd.xpi) = 457499 -SHA256 (xpi/firefox-i18n-41.0.2/gl.xpi) = 535273fc56ea8f96808e89946e4a9fe35b5aaffc8e519586a28bae82757048ad -SIZE (xpi/firefox-i18n-41.0.2/gl.xpi) = 452612 -SHA256 (xpi/firefox-i18n-41.0.2/gu-IN.xpi) = f35c50d2ed63af609b30e6f156b41313fe94597e387ddb1383e7805eedc603a8 -SIZE (xpi/firefox-i18n-41.0.2/gu-IN.xpi) = 487515 -SHA256 (xpi/firefox-i18n-41.0.2/he.xpi) = 999eab777e50e805afe8c6e56316debe7f975f2f4767a84abeec91ba93177551 -SIZE (xpi/firefox-i18n-41.0.2/he.xpi) = 486490 -SHA256 (xpi/firefox-i18n-41.0.2/hi-IN.xpi) = f71970e0324daed4cd7138bffe6eb1dc6188abfb3318c2ce05b64f8e49bb1c7d -SIZE (xpi/firefox-i18n-41.0.2/hi-IN.xpi) = 509163 -SHA256 (xpi/firefox-i18n-41.0.2/hr.xpi) = ab287bef0714c86b94b470c780fd67de6be945b3bc6b7621c2ed2592892978be -SIZE (xpi/firefox-i18n-41.0.2/hr.xpi) = 481336 -SHA256 (xpi/firefox-i18n-41.0.2/hsb.xpi) = 2ea56c387173b14dd9a869126681306acd71c2113c8e175c80d1b98bced01b5d -SIZE (xpi/firefox-i18n-41.0.2/hsb.xpi) = 472167 -SHA256 (xpi/firefox-i18n-41.0.2/hu.xpi) = decd311d7ac7627bf08826f7f4aa6950027737248aa3ce27b90e71c4e36e475b -SIZE (xpi/firefox-i18n-41.0.2/hu.xpi) = 457035 -SHA256 (xpi/firefox-i18n-41.0.2/hy-AM.xpi) = 40f60779decf80bc7700c90a82ec2a5fbc0aa1abfd42a5f0c682b32abb01773f -SIZE (xpi/firefox-i18n-41.0.2/hy-AM.xpi) = 538341 -SHA256 (xpi/firefox-i18n-41.0.2/id.xpi) = 753cc258df6a78e53a0d8ce45b512b13a71e1abdf2e9982dd60090271ac33ad9 -SIZE (xpi/firefox-i18n-41.0.2/id.xpi) = 433972 -SHA256 (xpi/firefox-i18n-41.0.2/is.xpi) = 6e1b57592d0d7e3f8436413d74563deed7d84b61e3c70f4ec39b9fb0eccbf83f -SIZE (xpi/firefox-i18n-41.0.2/is.xpi) = 488113 -SHA256 (xpi/firefox-i18n-41.0.2/it.xpi) = 1baa5e11d2eb38e55a71ad38a1418bdf5328cd1c264cb4dd2b9a491f796a69af -SIZE (xpi/firefox-i18n-41.0.2/it.xpi) = 363986 -SHA256 (xpi/firefox-i18n-41.0.2/ja.xpi) = 344b5893cee511bf143954a9280778888c8f8357a13ddd8985e682b62c3deae6 -SIZE (xpi/firefox-i18n-41.0.2/ja.xpi) = 483304 -SHA256 (xpi/firefox-i18n-41.0.2/kk.xpi) = 32ad8ce5f3d8e2fc06d2fbedf92dbbc125ffb7b70db92d75906587d5897d570e -SIZE (xpi/firefox-i18n-41.0.2/kk.xpi) = 508365 -SHA256 (xpi/firefox-i18n-41.0.2/km.xpi) = d7d37587be6f9fc03b6a40073fcb256cbc50c4b99beda32c2478763fea786e4c -SIZE (xpi/firefox-i18n-41.0.2/km.xpi) = 571709 -SHA256 (xpi/firefox-i18n-41.0.2/kn.xpi) = c6351d7aaebcb32763589185be4bd11a7e397feb19de97ad15033605a6e3b95d -SIZE (xpi/firefox-i18n-41.0.2/kn.xpi) = 539238 -SHA256 (xpi/firefox-i18n-41.0.2/ko.xpi) = acd6cd30ca2a6fd958090cd2479dfbb43e21d0e3985a39206d939f5c4e2a3697 -SIZE (xpi/firefox-i18n-41.0.2/ko.xpi) = 464905 -SHA256 (xpi/firefox-i18n-41.0.2/lij.xpi) = f436be27b037e20e43656e12ac130f6852be20ed7023c7a538f809bf6a571579 -SIZE (xpi/firefox-i18n-41.0.2/lij.xpi) = 451194 -SHA256 (xpi/firefox-i18n-41.0.2/lt.xpi) = 5563a4698e9638f68a9ebf488784dc51c6fd0c3daef4720fb85be852ecf454b3 -SIZE (xpi/firefox-i18n-41.0.2/lt.xpi) = 490119 -SHA256 (xpi/firefox-i18n-41.0.2/lv.xpi) = bdc3c617ee7a09f8aed475095c49e92eec9994ca2a78417596bf8ecc80ecd8eb -SIZE (xpi/firefox-i18n-41.0.2/lv.xpi) = 470365 -SHA256 (xpi/firefox-i18n-41.0.2/mai.xpi) = fdbb724710d2f1ed3e7dae9be8ef27b4cf89af14b1b9ca022798d1e148fd44aa -SIZE (xpi/firefox-i18n-41.0.2/mai.xpi) = 517161 -SHA256 (xpi/firefox-i18n-41.0.2/mk.xpi) = 28630b55e19e64b1a352a0f8520c74c47c109669dd0c8808b7f821e7db23c6c2 -SIZE (xpi/firefox-i18n-41.0.2/mk.xpi) = 530866 -SHA256 (xpi/firefox-i18n-41.0.2/ml.xpi) = ca41ab32a883c8ea15423b5ddfe70f84e699c110510ea5bb6aa686a7e4d849f1 -SIZE (xpi/firefox-i18n-41.0.2/ml.xpi) = 529032 -SHA256 (xpi/firefox-i18n-41.0.2/mr.xpi) = 8b0c214f69b0616a20e43dd2008b8a98a17cd81337ff463d3f3989d8c53720f9 -SIZE (xpi/firefox-i18n-41.0.2/mr.xpi) = 511325 -SHA256 (xpi/firefox-i18n-41.0.2/ms.xpi) = e78f4cb5c455803e2d8ee288f1332dd9cfd71995e07d5abdb192c1a14554ed4f -SIZE (xpi/firefox-i18n-41.0.2/ms.xpi) = 493484 -SHA256 (xpi/firefox-i18n-41.0.2/nb-NO.xpi) = a03636d86a7c1c889ad13b55c7f3b51acc611bc8eaf239a24096600772f5b0fb -SIZE (xpi/firefox-i18n-41.0.2/nb-NO.xpi) = 446372 -SHA256 (xpi/firefox-i18n-41.0.2/nl.xpi) = 84f8b2409d757f958ad2e8f4fd0a22a1d970972f532f18e13662b3216ce00a3d -SIZE (xpi/firefox-i18n-41.0.2/nl.xpi) = 446547 -SHA256 (xpi/firefox-i18n-41.0.2/nn-NO.xpi) = 55fb43569f6732f83381c1c98c7aaa9d910a2ca736f968d5e5be1307a6adae02 -SIZE (xpi/firefox-i18n-41.0.2/nn-NO.xpi) = 442562 -SHA256 (xpi/firefox-i18n-41.0.2/or.xpi) = 2894a6ab898304623de57ea34650e7a3aa2e5cf712f1f72c7c80156c173660a0 -SIZE (xpi/firefox-i18n-41.0.2/or.xpi) = 528106 -SHA256 (xpi/firefox-i18n-41.0.2/pa-IN.xpi) = 7703f4bc3520ed927742a1395c7d5a8783cb859406f37be521f593cc0927c588 -SIZE (xpi/firefox-i18n-41.0.2/pa-IN.xpi) = 498583 -SHA256 (xpi/firefox-i18n-41.0.2/pl.xpi) = 234067974ece5ee3cdec275236d0300425b255d172983e96f8ad28d5ebf490d3 -SIZE (xpi/firefox-i18n-41.0.2/pl.xpi) = 400466 -SHA256 (xpi/firefox-i18n-41.0.2/pt-BR.xpi) = 9f3cbce24801b9c123d31b5f9d5ecaffa17deca8fc48660a0361279882450a24 -SIZE (xpi/firefox-i18n-41.0.2/pt-BR.xpi) = 463059 -SHA256 (xpi/firefox-i18n-41.0.2/pt-PT.xpi) = 56f32e241341cb2ec49f8f5126172d9a300f14790303dc4bee516eb41204176c -SIZE (xpi/firefox-i18n-41.0.2/pt-PT.xpi) = 443383 -SHA256 (xpi/firefox-i18n-41.0.2/rm.xpi) = 3df17252f03697206305cd7e9b62f26eeffcba84b5e195263d4d47e0c0c0d0cb -SIZE (xpi/firefox-i18n-41.0.2/rm.xpi) = 450640 -SHA256 (xpi/firefox-i18n-41.0.2/ro.xpi) = 9bc4c4e037de7073614fbf28ac9ea0168bec75c1b270289a1455674de85b60a2 -SIZE (xpi/firefox-i18n-41.0.2/ro.xpi) = 497507 -SHA256 (xpi/firefox-i18n-41.0.2/ru.xpi) = 1ff21845c49dea827abec9cc4641a3aee002f640539af985f88eb40be077aeb5 -SIZE (xpi/firefox-i18n-41.0.2/ru.xpi) = 412447 -SHA256 (xpi/firefox-i18n-41.0.2/si.xpi) = ac952730b5591f503cfb30efbc25dfce92f54529413e39ae88ff30010da098e2 -SIZE (xpi/firefox-i18n-41.0.2/si.xpi) = 537934 -SHA256 (xpi/firefox-i18n-41.0.2/sk.xpi) = f4ad85d1fe87aa2ef449a1f5a5de2b59b4867c1e8f854464154edf4f2f39c138 -SIZE (xpi/firefox-i18n-41.0.2/sk.xpi) = 472935 -SHA256 (xpi/firefox-i18n-41.0.2/sl.xpi) = 43eb2da1524e905740782567ae9dfa5a4adbeec2ec04ef93a8cb3f7d570982c5 -SIZE (xpi/firefox-i18n-41.0.2/sl.xpi) = 445746 -SHA256 (xpi/firefox-i18n-41.0.2/son.xpi) = 88b3a01be297e83a99ca9bcc4643184d9bbccd19d1ac116995acacfc13a58486 -SIZE (xpi/firefox-i18n-41.0.2/son.xpi) = 453253 -SHA256 (xpi/firefox-i18n-41.0.2/sq.xpi) = fae5953665c35ffc5171830ccabeb21bd1692abb67d42633f8de4e909b12dcf2 -SIZE (xpi/firefox-i18n-41.0.2/sq.xpi) = 491168 -SHA256 (xpi/firefox-i18n-41.0.2/sr.xpi) = ce99e8e6b04601855de447bbfcc7b00fe626e1e3e06c60a132e87c7cabf5d017 -SIZE (xpi/firefox-i18n-41.0.2/sr.xpi) = 482971 -SHA256 (xpi/firefox-i18n-41.0.2/sv-SE.xpi) = fb86b719756909ee167bb2ddfa399d5afaf9393100245065ec84b81fadcbf5da -SIZE (xpi/firefox-i18n-41.0.2/sv-SE.xpi) = 455382 -SHA256 (xpi/firefox-i18n-41.0.2/ta.xpi) = 7c077f044283b145ce62680981bb1f2631f918813d5e389489f0a209a0d72df0 -SIZE (xpi/firefox-i18n-41.0.2/ta.xpi) = 509544 -SHA256 (xpi/firefox-i18n-41.0.2/te.xpi) = 93ed5ffa7e4533bc406bc8a86c000bdd9fc098e9a65c729ce9fca5cce8f177ba -SIZE (xpi/firefox-i18n-41.0.2/te.xpi) = 530204 -SHA256 (xpi/firefox-i18n-41.0.2/th.xpi) = e9144da3dcc69956e0c6b4223afcf483941858e3d9dd8dc94ead6c062a9d098b -SIZE (xpi/firefox-i18n-41.0.2/th.xpi) = 539600 -SHA256 (xpi/firefox-i18n-41.0.2/tr.xpi) = 45225ade5b3311689b6372c7e45b765a6e58d2047750c5f4a1b906bccd903d70 -SIZE (xpi/firefox-i18n-41.0.2/tr.xpi) = 484232 -SHA256 (xpi/firefox-i18n-41.0.2/uk.xpi) = d94b1aafe66728445d1a886bbf2cf05bc3d56c3ab9dd892ad5f37b3f32d3763f -SIZE (xpi/firefox-i18n-41.0.2/uk.xpi) = 500110 -SHA256 (xpi/firefox-i18n-41.0.2/uz.xpi) = 555465a0162d8b2b3fbc1f69d944d0fc94cd642cbac584ed30664cffebaa964b -SIZE (xpi/firefox-i18n-41.0.2/uz.xpi) = 501948 -SHA256 (xpi/firefox-i18n-41.0.2/vi.xpi) = c296449a51d669439369f63aa943f55bf6cfaab901ac033322e137afe7bdeae6 -SIZE (xpi/firefox-i18n-41.0.2/vi.xpi) = 470336 -SHA256 (xpi/firefox-i18n-41.0.2/xh.xpi) = 8e145e9ccfde00cf0ab3da91ea4686893e274f3fb5e4da460b44ce201c714f70 -SIZE (xpi/firefox-i18n-41.0.2/xh.xpi) = 450079 -SHA256 (xpi/firefox-i18n-41.0.2/zh-CN.xpi) = 8c49c52b80937a00da8953ecb1bdd1c6505efb62ac89beb879c400846b7f8c85 -SIZE (xpi/firefox-i18n-41.0.2/zh-CN.xpi) = 486222 -SHA256 (xpi/firefox-i18n-41.0.2/zh-TW.xpi) = a1b3661c004ead49b5b1adac7515de402319ae82b06121313deb51b1ec7fcb20 -SIZE (xpi/firefox-i18n-41.0.2/zh-TW.xpi) = 479033 +SHA256 (xpi/firefox-i18n-42.0/ach.xpi) = 80b7f285d462ea72b49e482519c8d6265ad4767e89b1bfdc2e2d82eabff45be8 +SIZE (xpi/firefox-i18n-42.0/ach.xpi) = 484101 +SHA256 (xpi/firefox-i18n-42.0/af.xpi) = 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6 +SIZE (xpi/firefox-i18n-42.0/af.xpi) = 491004 +SHA256 (xpi/firefox-i18n-42.0/an.xpi) = 7b99498a270e20066f9791e92841ee61a1da88b883c36e611cfe79a4abeb7285 +SIZE (xpi/firefox-i18n-42.0/an.xpi) = 469526 +SHA256 (xpi/firefox-i18n-42.0/ar.xpi) = c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69 +SIZE (xpi/firefox-i18n-42.0/ar.xpi) = 527045 +SHA256 (xpi/firefox-i18n-42.0/as.xpi) = 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8 +SIZE (xpi/firefox-i18n-42.0/as.xpi) = 516804 +SHA256 (xpi/firefox-i18n-42.0/ast.xpi) = a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096 +SIZE (xpi/firefox-i18n-42.0/ast.xpi) = 409860 +SHA256 (xpi/firefox-i18n-42.0/az.xpi) = fe56a7bd0694dd42946cfc1723c4c7d2075f2588baff2ca742afd2761df434d0 +SIZE (xpi/firefox-i18n-42.0/az.xpi) = 498264 +SHA256 (xpi/firefox-i18n-42.0/be.xpi) = 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d +SIZE (xpi/firefox-i18n-42.0/be.xpi) = 458684 +SHA256 (xpi/firefox-i18n-42.0/bg.xpi) = 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35 +SIZE (xpi/firefox-i18n-42.0/bg.xpi) = 497770 +SHA256 (xpi/firefox-i18n-42.0/bn-BD.xpi) = c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e +SIZE (xpi/firefox-i18n-42.0/bn-BD.xpi) = 545583 +SHA256 (xpi/firefox-i18n-42.0/bn-IN.xpi) = 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba +SIZE (xpi/firefox-i18n-42.0/bn-IN.xpi) = 537276 +SHA256 (xpi/firefox-i18n-42.0/br.xpi) = 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f +SIZE (xpi/firefox-i18n-42.0/br.xpi) = 449190 +SHA256 (xpi/firefox-i18n-42.0/bs.xpi) = 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48 +SIZE (xpi/firefox-i18n-42.0/bs.xpi) = 488131 +SHA256 (xpi/firefox-i18n-42.0/ca.xpi) = f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9 +SIZE (xpi/firefox-i18n-42.0/ca.xpi) = 465823 +SHA256 (xpi/firefox-i18n-42.0/cs.xpi) = ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6 +SIZE (xpi/firefox-i18n-42.0/cs.xpi) = 455106 +SHA256 (xpi/firefox-i18n-42.0/cy.xpi) = 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb +SIZE (xpi/firefox-i18n-42.0/cy.xpi) = 451680 +SHA256 (xpi/firefox-i18n-42.0/da.xpi) = af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368 +SIZE (xpi/firefox-i18n-42.0/da.xpi) = 458413 +SHA256 (xpi/firefox-i18n-42.0/de.xpi) = 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790 +SIZE (xpi/firefox-i18n-42.0/de.xpi) = 460744 +SHA256 (xpi/firefox-i18n-42.0/dsb.xpi) = b6a5a998fad95e082b4c94b69c36680de7c5908efb85e222c4f9448f233458ee +SIZE (xpi/firefox-i18n-42.0/dsb.xpi) = 479637 +SHA256 (xpi/firefox-i18n-42.0/el.xpi) = 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6 +SIZE (xpi/firefox-i18n-42.0/el.xpi) = 505735 +SHA256 (xpi/firefox-i18n-42.0/en-GB.xpi) = e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57 +SIZE (xpi/firefox-i18n-42.0/en-GB.xpi) = 443856 +SHA256 (xpi/firefox-i18n-42.0/en-US.xpi) = 9bf74eaccbe740c513be7e406f582907c578838b6d0f14e4c346689490517167 +SIZE (xpi/firefox-i18n-42.0/en-US.xpi) = 475844 +SHA256 (xpi/firefox-i18n-42.0/en-ZA.xpi) = 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d +SIZE (xpi/firefox-i18n-42.0/en-ZA.xpi) = 449903 +SHA256 (xpi/firefox-i18n-42.0/eo.xpi) = f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527 +SIZE (xpi/firefox-i18n-42.0/eo.xpi) = 491605 +SHA256 (xpi/firefox-i18n-42.0/es-AR.xpi) = 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127 +SIZE (xpi/firefox-i18n-42.0/es-AR.xpi) = 459408 +SHA256 (xpi/firefox-i18n-42.0/es-CL.xpi) = 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9 +SIZE (xpi/firefox-i18n-42.0/es-CL.xpi) = 386944 +SHA256 (xpi/firefox-i18n-42.0/es-ES.xpi) = 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629 +SIZE (xpi/firefox-i18n-42.0/es-ES.xpi) = 373753 +SHA256 (xpi/firefox-i18n-42.0/es-MX.xpi) = 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b +SIZE (xpi/firefox-i18n-42.0/es-MX.xpi) = 465414 +SHA256 (xpi/firefox-i18n-42.0/et.xpi) = af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07 +SIZE (xpi/firefox-i18n-42.0/et.xpi) = 450258 +SHA256 (xpi/firefox-i18n-42.0/eu.xpi) = cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64 +SIZE (xpi/firefox-i18n-42.0/eu.xpi) = 474713 +SHA256 (xpi/firefox-i18n-42.0/fa.xpi) = 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce +SIZE (xpi/firefox-i18n-42.0/fa.xpi) = 526702 +SHA256 (xpi/firefox-i18n-42.0/ff.xpi) = d43f31eae539b6616f88e7dc0023eef4e4e64940ca4f625ab983fc52e7135321 +SIZE (xpi/firefox-i18n-42.0/ff.xpi) = 461016 +SHA256 (xpi/firefox-i18n-42.0/fi.xpi) = 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269 +SIZE (xpi/firefox-i18n-42.0/fi.xpi) = 452032 +SHA256 (xpi/firefox-i18n-42.0/fr.xpi) = 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce +SIZE (xpi/firefox-i18n-42.0/fr.xpi) = 470271 +SHA256 (xpi/firefox-i18n-42.0/fy-NL.xpi) = 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f +SIZE (xpi/firefox-i18n-42.0/fy-NL.xpi) = 463484 +SHA256 (xpi/firefox-i18n-42.0/ga-IE.xpi) = fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37 +SIZE (xpi/firefox-i18n-42.0/ga-IE.xpi) = 476090 +SHA256 (xpi/firefox-i18n-42.0/gd.xpi) = a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0 +SIZE (xpi/firefox-i18n-42.0/gd.xpi) = 462140 +SHA256 (xpi/firefox-i18n-42.0/gl.xpi) = fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587 +SIZE (xpi/firefox-i18n-42.0/gl.xpi) = 451687 +SHA256 (xpi/firefox-i18n-42.0/gu-IN.xpi) = 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb +SIZE (xpi/firefox-i18n-42.0/gu-IN.xpi) = 492282 +SHA256 (xpi/firefox-i18n-42.0/he.xpi) = c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff +SIZE (xpi/firefox-i18n-42.0/he.xpi) = 481468 +SHA256 (xpi/firefox-i18n-42.0/hi-IN.xpi) = 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602 +SIZE (xpi/firefox-i18n-42.0/hi-IN.xpi) = 515516 +SHA256 (xpi/firefox-i18n-42.0/hr.xpi) = f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7 +SIZE (xpi/firefox-i18n-42.0/hr.xpi) = 486308 +SHA256 (xpi/firefox-i18n-42.0/hsb.xpi) = ba43533196c1de882708e3f2c5f33508bdbedbf3987a060e51891b3cbdfdb5df +SIZE (xpi/firefox-i18n-42.0/hsb.xpi) = 477291 +SHA256 (xpi/firefox-i18n-42.0/hu.xpi) = d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02 +SIZE (xpi/firefox-i18n-42.0/hu.xpi) = 461934 +SHA256 (xpi/firefox-i18n-42.0/hy-AM.xpi) = 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0 +SIZE (xpi/firefox-i18n-42.0/hy-AM.xpi) = 544379 +SHA256 (xpi/firefox-i18n-42.0/id.xpi) = a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361 +SIZE (xpi/firefox-i18n-42.0/id.xpi) = 438845 +SHA256 (xpi/firefox-i18n-42.0/is.xpi) = 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e +SIZE (xpi/firefox-i18n-42.0/is.xpi) = 493033 +SHA256 (xpi/firefox-i18n-42.0/it.xpi) = 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659 +SIZE (xpi/firefox-i18n-42.0/it.xpi) = 367659 +SHA256 (xpi/firefox-i18n-42.0/ja.xpi) = 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8 +SIZE (xpi/firefox-i18n-42.0/ja.xpi) = 488656 +SHA256 (xpi/firefox-i18n-42.0/kk.xpi) = c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9 +SIZE (xpi/firefox-i18n-42.0/kk.xpi) = 513387 +SHA256 (xpi/firefox-i18n-42.0/km.xpi) = 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055 +SIZE (xpi/firefox-i18n-42.0/km.xpi) = 578547 +SHA256 (xpi/firefox-i18n-42.0/kn.xpi) = 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5 +SIZE (xpi/firefox-i18n-42.0/kn.xpi) = 544136 +SHA256 (xpi/firefox-i18n-42.0/ko.xpi) = 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277 +SIZE (xpi/firefox-i18n-42.0/ko.xpi) = 474547 +SHA256 (xpi/firefox-i18n-42.0/lij.xpi) = 7b926543d7ba6e3ba3bcd62846715f88ba2b08ccb069174e1c93817c4ed30270 +SIZE (xpi/firefox-i18n-42.0/lij.xpi) = 456396 +SHA256 (xpi/firefox-i18n-42.0/lt.xpi) = 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d +SIZE (xpi/firefox-i18n-42.0/lt.xpi) = 495227 +SHA256 (xpi/firefox-i18n-42.0/lv.xpi) = dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5 +SIZE (xpi/firefox-i18n-42.0/lv.xpi) = 475294 +SHA256 (xpi/firefox-i18n-42.0/mai.xpi) = 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284 +SIZE (xpi/firefox-i18n-42.0/mai.xpi) = 523801 +SHA256 (xpi/firefox-i18n-42.0/mk.xpi) = 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1 +SIZE (xpi/firefox-i18n-42.0/mk.xpi) = 535199 +SHA256 (xpi/firefox-i18n-42.0/ml.xpi) = 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a +SIZE (xpi/firefox-i18n-42.0/ml.xpi) = 533776 +SHA256 (xpi/firefox-i18n-42.0/mr.xpi) = 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8 +SIZE (xpi/firefox-i18n-42.0/mr.xpi) = 522304 +SHA256 (xpi/firefox-i18n-42.0/ms.xpi) = cf16f7c807915297a132ad8d71fe20012c54eb82f8153f66b954b71a143cccc7 +SIZE (xpi/firefox-i18n-42.0/ms.xpi) = 497644 +SHA256 (xpi/firefox-i18n-42.0/nb-NO.xpi) = f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2 +SIZE (xpi/firefox-i18n-42.0/nb-NO.xpi) = 453245 +SHA256 (xpi/firefox-i18n-42.0/nl.xpi) = a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd +SIZE (xpi/firefox-i18n-42.0/nl.xpi) = 451272 +SHA256 (xpi/firefox-i18n-42.0/nn-NO.xpi) = 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 +SIZE (xpi/firefox-i18n-42.0/nn-NO.xpi) = 447406 +SHA256 (xpi/firefox-i18n-42.0/or.xpi) = c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 +SIZE (xpi/firefox-i18n-42.0/or.xpi) = 533314 +SHA256 (xpi/firefox-i18n-42.0/pa-IN.xpi) = af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a +SIZE (xpi/firefox-i18n-42.0/pa-IN.xpi) = 507205 +SHA256 (xpi/firefox-i18n-42.0/pl.xpi) = 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 +SIZE (xpi/firefox-i18n-42.0/pl.xpi) = 403227 +SHA256 (xpi/firefox-i18n-42.0/pt-BR.xpi) = b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf +SIZE (xpi/firefox-i18n-42.0/pt-BR.xpi) = 468096 +SHA256 (xpi/firefox-i18n-42.0/pt-PT.xpi) = 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 +SIZE (xpi/firefox-i18n-42.0/pt-PT.xpi) = 448920 +SHA256 (xpi/firefox-i18n-42.0/rm.xpi) = d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681 +SIZE (xpi/firefox-i18n-42.0/rm.xpi) = 454529 +SHA256 (xpi/firefox-i18n-42.0/ro.xpi) = d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef +SIZE (xpi/firefox-i18n-42.0/ro.xpi) = 502634 +SHA256 (xpi/firefox-i18n-42.0/ru.xpi) = ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712 +SIZE (xpi/firefox-i18n-42.0/ru.xpi) = 416137 +SHA256 (xpi/firefox-i18n-42.0/si.xpi) = 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688 +SIZE (xpi/firefox-i18n-42.0/si.xpi) = 543889 +SHA256 (xpi/firefox-i18n-42.0/sk.xpi) = beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca +SIZE (xpi/firefox-i18n-42.0/sk.xpi) = 477255 +SHA256 (xpi/firefox-i18n-42.0/sl.xpi) = 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8 +SIZE (xpi/firefox-i18n-42.0/sl.xpi) = 450532 +SHA256 (xpi/firefox-i18n-42.0/son.xpi) = 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d +SIZE (xpi/firefox-i18n-42.0/son.xpi) = 457298 +SHA256 (xpi/firefox-i18n-42.0/sq.xpi) = fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81 +SIZE (xpi/firefox-i18n-42.0/sq.xpi) = 494612 +SHA256 (xpi/firefox-i18n-42.0/sr.xpi) = 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc +SIZE (xpi/firefox-i18n-42.0/sr.xpi) = 486210 +SHA256 (xpi/firefox-i18n-42.0/sv-SE.xpi) = 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5 +SIZE (xpi/firefox-i18n-42.0/sv-SE.xpi) = 460188 +SHA256 (xpi/firefox-i18n-42.0/ta.xpi) = 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a +SIZE (xpi/firefox-i18n-42.0/ta.xpi) = 515601 +SHA256 (xpi/firefox-i18n-42.0/te.xpi) = 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e +SIZE (xpi/firefox-i18n-42.0/te.xpi) = 532920 +SHA256 (xpi/firefox-i18n-42.0/th.xpi) = f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad +SIZE (xpi/firefox-i18n-42.0/th.xpi) = 542239 +SHA256 (xpi/firefox-i18n-42.0/tr.xpi) = f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b +SIZE (xpi/firefox-i18n-42.0/tr.xpi) = 489512 +SHA256 (xpi/firefox-i18n-42.0/uk.xpi) = 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32 +SIZE (xpi/firefox-i18n-42.0/uk.xpi) = 505718 +SHA256 (xpi/firefox-i18n-42.0/uz.xpi) = faeacd2ec9af20cde5032415f0bbeba487ed4d276f778672ae6a340615099725 +SIZE (xpi/firefox-i18n-42.0/uz.xpi) = 505180 +SHA256 (xpi/firefox-i18n-42.0/vi.xpi) = 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd +SIZE (xpi/firefox-i18n-42.0/vi.xpi) = 472290 +SHA256 (xpi/firefox-i18n-42.0/xh.xpi) = 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e +SIZE (xpi/firefox-i18n-42.0/xh.xpi) = 455527 +SHA256 (xpi/firefox-i18n-42.0/zh-CN.xpi) = 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834 +SIZE (xpi/firefox-i18n-42.0/zh-CN.xpi) = 491278 +SHA256 (xpi/firefox-i18n-42.0/zh-TW.xpi) = ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458 +SIZE (xpi/firefox-i18n-42.0/zh-TW.xpi) = 482387