mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
devel/nspr: update to 4.39
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
COMMENT = Netscape Portable Runtime
|
||||
|
||||
VER= 4.38.2
|
||||
VER= 4.39
|
||||
DISTNAME= nspr-${VER}
|
||||
DEBUG_PACKAGES= ${BUILD_PACKAGES}
|
||||
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
SHA256 (nspr-4.38.2.tar.gz) = 5Akvrqt3vcmzLbERPkIVlI7naOJsRmbbO1pgs18skQU=
|
||||
SIZE (nspr-4.38.2.tar.gz) = 1025394
|
||||
SHA256 (nspr-4.39.tar.gz) = u9Au6HpVZ2Bjpj5byBngIn3iZmtHMHsqATRBTN9CNo4=
|
||||
SIZE (nspr-4.39.tar.gz) = 1014093
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/include/md/_openbsd.cfg
|
||||
--- nspr/pr/include/md/_openbsd.cfg.orig
|
||||
+++ nspr/pr/include/md/_openbsd.cfg
|
||||
@@ -161,7 +161,7 @@
|
||||
@@ -160,7 +160,7 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 3
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
@@ -10,7 +10,7 @@ Index: nspr/pr/include/md/_openbsd.cfg
|
||||
|
||||
#undef IS_LITTLE_ENDIAN
|
||||
#define IS_BIG_ENDIAN 1
|
||||
@@ -206,7 +206,7 @@
|
||||
@@ -205,7 +205,7 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 4
|
||||
|
||||
@@ -19,7 +19,7 @@ Index: nspr/pr/include/md/_openbsd.cfg
|
||||
#define IS_LITTLE_ENDIAN 1
|
||||
#undef IS_BIG_ENDIAN
|
||||
#define HAVE_ALIGNED_DOUBLES
|
||||
@@ -294,6 +294,58 @@
|
||||
@@ -293,6 +293,58 @@
|
||||
#define PR_ALIGN_OF_FLOAT 4
|
||||
#define PR_ALIGN_OF_DOUBLE 4
|
||||
#define PR_ALIGN_OF_POINTER 4
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/include/md/_openbsd.h
|
||||
--- nspr/pr/include/md/_openbsd.h.orig
|
||||
+++ nspr/pr/include/md/_openbsd.h
|
||||
@@ -26,6 +26,12 @@
|
||||
@@ -25,6 +25,12 @@
|
||||
#define _PR_SI_ARCHITECTURE "sparc"
|
||||
#elif defined(__arm__)
|
||||
#define _PR_SI_ARCHITECTURE "arm"
|
||||
@@ -14,7 +14,7 @@ Index: nspr/pr/include/md/_openbsd.h
|
||||
#endif
|
||||
|
||||
#define PR_DLL_SUFFIX ".so"
|
||||
@@ -35,7 +41,11 @@
|
||||
@@ -34,7 +40,11 @@
|
||||
#define _MD_DEFAULT_STACK_SIZE 65536L
|
||||
#define _MD_MMAP_FLAGS MAP_PRIVATE
|
||||
|
||||
@@ -26,7 +26,7 @@ Index: nspr/pr/include/md/_openbsd.h
|
||||
#define HAVE_DLL
|
||||
#define USE_DLFCN
|
||||
#define _PR_HAVE_SOCKADDR_LEN
|
||||
@@ -69,8 +79,12 @@
|
||||
@@ -68,8 +78,12 @@
|
||||
#define JB_SP_INDEX 34
|
||||
#elif defined(__amd64__)
|
||||
#define JB_SP_INDEX 6
|
||||
|
||||
@@ -3,7 +3,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650772
|
||||
Index: nspr/pr/src/linking/prlink.c
|
||||
--- nspr/pr/src/linking/prlink.c.orig
|
||||
+++ nspr/pr/src/linking/prlink.c
|
||||
@@ -7,6 +7,10 @@
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@@ -14,7 +14,7 @@ Index: nspr/pr/src/linking/prlink.c
|
||||
#ifdef XP_UNIX
|
||||
# ifdef USE_DLFCN
|
||||
# include <dlfcn.h>
|
||||
@@ -384,6 +388,7 @@ PR_LoadLibrary(const char* name) {
|
||||
@@ -383,6 +387,7 @@ PR_LoadLibrary(const char* name) {
|
||||
** map first.
|
||||
*/
|
||||
static PRLibrary* pr_LoadLibraryByPathname(const char* name, PRIntn flags) {
|
||||
@@ -22,7 +22,7 @@ Index: nspr/pr/src/linking/prlink.c
|
||||
PRLibrary* lm;
|
||||
PRLibrary* result = NULL;
|
||||
PRInt32 oserr;
|
||||
@@ -478,6 +483,10 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
@@ -477,6 +482,10 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
# else
|
||||
int dl_flags = 0;
|
||||
# endif
|
||||
@@ -33,7 +33,7 @@ Index: nspr/pr/src/linking/prlink.c
|
||||
void* h = NULL;
|
||||
# if defined(DARWIN)
|
||||
PRBool okToLoad = PR_FALSE;
|
||||
@@ -529,6 +538,18 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
@@ -528,6 +537,18 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
}
|
||||
# else
|
||||
h = dlopen(name, dl_flags);
|
||||
@@ -52,7 +52,7 @@ Index: nspr/pr/src/linking/prlink.c
|
||||
# endif
|
||||
# elif defined(USE_HPSHL)
|
||||
int shl_flags = 0;
|
||||
@@ -558,7 +579,11 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
@@ -557,7 +578,11 @@ static PRLibrary* pr_LoadLibraryByPathname(const char*
|
||||
PR_DELETE(lm);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/src/misc/prdtoa.c
|
||||
--- nspr/pr/src/misc/prdtoa.c.orig
|
||||
+++ nspr/pr/src/misc/prdtoa.c
|
||||
@@ -16,41 +16,10 @@
|
||||
@@ -15,41 +15,10 @@
|
||||
#include "primpl.h"
|
||||
#include "prbit.h"
|
||||
|
||||
@@ -45,7 +45,7 @@ Index: nspr/pr/src/misc/prdtoa.c
|
||||
/****************************************************************
|
||||
*
|
||||
* The author of this software is David M. Gay.
|
||||
@@ -70,3441 +39,82 @@ void _PR_CleanupDtoa(void) {
|
||||
@@ -69,3441 +38,82 @@ void _PR_CleanupDtoa(void) {
|
||||
*
|
||||
***************************************************************/
|
||||
|
||||
@@ -3523,7 +3523,7 @@ Index: nspr/pr/src/misc/prdtoa.c
|
||||
PR_IMPLEMENT(PRStatus)
|
||||
PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PRIntn* decpt, PRIntn* sign,
|
||||
char** rve, char* buf, PRSize bufsize) {
|
||||
@@ -3512,15 +122,13 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PRIn
|
||||
@@ -3511,15 +121,13 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PRIn
|
||||
PRSize resultlen;
|
||||
PRStatus rv = PR_FAILURE;
|
||||
|
||||
@@ -3541,7 +3541,7 @@ Index: nspr/pr/src/misc/prdtoa.c
|
||||
if (!result) {
|
||||
PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
|
||||
return rv;
|
||||
@@ -3535,7 +143,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PRIn
|
||||
@@ -3534,7 +142,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PRIn
|
||||
}
|
||||
rv = PR_SUCCESS;
|
||||
}
|
||||
@@ -3550,7 +3550,7 @@ Index: nspr/pr/src/misc/prdtoa.c
|
||||
return rv;
|
||||
}
|
||||
|
||||
@@ -3556,9 +164,9 @@ PR_cnvtf(char* buf, int bufsz, int prcsn, double dfval
|
||||
@@ -3555,9 +163,9 @@ PR_cnvtf(char* buf, int bufsz, int prcsn, double dfval
|
||||
char *num, *nump;
|
||||
char* bufp = buf;
|
||||
char* endnum;
|
||||
@@ -3562,7 +3562,7 @@ Index: nspr/pr/src/misc/prdtoa.c
|
||||
/* If anything fails, we store an empty string in 'buf' */
|
||||
num = (char*)PR_MALLOC(bufsz);
|
||||
if (num == NULL) {
|
||||
@@ -3566,7 +174,7 @@ PR_cnvtf(char* buf, int bufsz, int prcsn, double dfval
|
||||
@@ -3565,7 +173,7 @@ PR_cnvtf(char* buf, int bufsz, int prcsn, double dfval
|
||||
return;
|
||||
}
|
||||
/* XXX Why use mode 1? */
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/src/misc/prinit.c
|
||||
--- nspr/pr/src/misc/prinit.c.orig
|
||||
+++ nspr/pr/src/misc/prinit.c
|
||||
@@ -350,8 +350,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
@@ -349,8 +349,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
_PR_CleanupDtoa();
|
||||
_PR_CleanupCallOnce();
|
||||
_PR_ShutdownLinker();
|
||||
@@ -10,7 +10,7 @@ Index: nspr/pr/src/misc/prinit.c
|
||||
/* Release the primordial thread's private data, etc. */
|
||||
_PR_CleanupThread(me);
|
||||
|
||||
@@ -362,6 +360,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
@@ -361,6 +359,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
_PR_LogCleanup();
|
||||
|
||||
/*
|
||||
@@ -23,7 +23,7 @@ Index: nspr/pr/src/misc/prinit.c
|
||||
* This part should look like the end of _PR_NativeRunThread
|
||||
* and _PR_UserRunThread.
|
||||
*/
|
||||
@@ -373,6 +377,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
@@ -372,6 +376,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() {
|
||||
PR_DELETE(me->stack);
|
||||
PR_DELETE(me);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/src/misc/prnetdb.c
|
||||
--- nspr/pr/src/misc/prnetdb.c.orig
|
||||
+++ nspr/pr/src/misc/prnetdb.c
|
||||
@@ -2011,7 +2011,9 @@ PR_GetAddrInfoByName(const char* hostname, PRUint16 af
|
||||
@@ -2010,7 +2010,9 @@ PR_GetAddrInfoByName(const char* hostname, PRUint16 af
|
||||
*/
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: nspr/pr/tests/nameshm1.c
|
||||
--- nspr/pr/tests/nameshm1.c.orig
|
||||
+++ nspr/pr/tests/nameshm1.c
|
||||
@@ -520,7 +520,9 @@ int main(int argc, char** argv) {
|
||||
@@ -519,7 +519,9 @@ int main(int argc, char** argv) {
|
||||
if (failed_already != 0) {
|
||||
goto Finished;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ disable ipv6 socket tests, they hang ?
|
||||
Index: nspr/pr/tests/socket.c
|
||||
--- nspr/pr/tests/socket.c.orig
|
||||
+++ nspr/pr/tests/socket.c
|
||||
@@ -2084,6 +2084,7 @@ int main(int argc, char** argv) {
|
||||
@@ -2083,6 +2083,7 @@ int main(int argc, char** argv) {
|
||||
/*
|
||||
* client-server test, Ipv6-Ipv4
|
||||
*/
|
||||
@@ -11,7 +11,7 @@ Index: nspr/pr/tests/socket.c
|
||||
client_domain = PR_AF_INET6;
|
||||
printf("TCP Client/Server Test - IPv6/Ipv4\n");
|
||||
if (TCP_Socket_Client_Server_Test() < 0) {
|
||||
@@ -2118,6 +2119,7 @@ int main(int argc, char** argv) {
|
||||
@@ -2117,6 +2118,7 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
test_cancelio = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user