diff --git a/dev-libs/nspr/nspr-4.30.recipe b/dev-libs/nspr/nspr-4.32.recipe similarity index 96% rename from dev-libs/nspr/nspr-4.30.recipe rename to dev-libs/nspr/nspr-4.32.recipe index 4fd2b19f7..479ee3541 100644 --- a/dev-libs/nspr/nspr-4.30.recipe +++ b/dev-libs/nspr/nspr-4.32.recipe @@ -11,7 +11,7 @@ LICENSE="GNU GPL v2 " REVISION="1" SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz" -CHECKSUM_SHA256="8d4cd8f8409484dc4c3d31e180354bfc506573eccf86cd691106a1ef7edc913b" +CHECKSUM_SHA256="bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c" SOURCE_DIR="nspr-$portVersion/nspr" PATCHES="nspr-$portVersion.patchset" if [ $effectiveTargetArchitecture == 'x86' ]; then diff --git a/dev-libs/nspr/patches/nspr-4.30.patchset b/dev-libs/nspr/patches/nspr-4.32.patchset similarity index 92% rename from dev-libs/nspr/patches/nspr-4.30.patchset rename to dev-libs/nspr/patches/nspr-4.32.patchset index 1916e2c98..89d32fca5 100644 --- a/dev-libs/nspr/patches/nspr-4.30.patchset +++ b/dev-libs/nspr/patches/nspr-4.32.patchset @@ -1,4 +1,4 @@ -From 4b77ba361db250c1a59829dfaf97d64c0f8351c5 Mon Sep 17 00:00:00 2001 +From 99a463022a0cfc77e308f5fcd0276ad7e4b255b0 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Sat, 27 Jun 2020 00:09:11 +0200 Subject: Migrated NSPR 4.19 patchset to NSPR 4.26 @@ -12,10 +12,10 @@ Subject: Migrated NSPR 4.19 patchset to NSPR 4.26 Fix build of NSS. NSS uses XP_BEOS and defs for BeOS fail on GCC7. diff --git a/configure.in b/configure.in -index b62f1cd..a3b6610 100644 +index d0c1769..ffe0a0c 100644 --- a/configure.in +++ b/configure.in -@@ -1483,6 +1483,30 @@ tools are selected during the Xcode/Developer Tools installation.]) +@@ -1488,6 +1488,30 @@ tools are selected during the Xcode/Developer Tools installation.]) PR_MD_CSRCS=freebsd.c ;; @@ -46,7 +46,7 @@ index b62f1cd..a3b6610 100644 *-hpux*) AC_DEFINE(XP_UNIX) AC_DEFINE(HPUX) -@@ -1632,7 +1656,7 @@ tools are selected during the Xcode/Developer Tools installation.]) +@@ -1637,7 +1661,7 @@ tools are selected during the Xcode/Developer Tools installation.]) fi ;; @@ -55,7 +55,7 @@ index b62f1cd..a3b6610 100644 if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 IMPL_STRATEGY=_PTH -@@ -2514,7 +2538,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2519,7 +2543,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS=-pthread fi ;; @@ -65,10 +65,10 @@ index b62f1cd..a3b6610 100644 ;; esac diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h -index 9c0cff3..3e9874c 100644 +index a26291a..e93858b 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h -@@ -299,7 +299,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) +@@ -301,7 +301,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) #endif /* __arm__ */ #define USE_SETJMP @@ -77,7 +77,7 @@ index 9c0cff3..3e9874c 100644 #define _PR_POLL_AVAILABLE #endif #undef _PR_USE_POLL -@@ -320,7 +320,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) +@@ -322,7 +322,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) #define _PR_HAVE_GETADDRINFO #define _PR_INET6_PROBE #endif @@ -295,10 +295,10 @@ index 4798590..ad10a18 100644 #include #include diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c -index 6ad0242..32984fa 100644 +index baf49d8..d96803c 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c -@@ -1198,7 +1198,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( +@@ -1196,7 +1196,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( * any usable implementation. */ @@ -308,7 +308,7 @@ index 6ad0242..32984fa 100644 * but doesn't actually include implementations. It uses the 5-arg form, * so these functions end up not matching the prototype. So just rename diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c -index 3ad2d80..8f685c9 100644 +index a2bc3e7..442bc06 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -28,7 +28,7 @@ @@ -320,7 +320,7 @@ index 3ad2d80..8f685c9 100644 #include /* for uname */ #endif #if defined(SOLARIS) || defined(UNIXWARE) -@@ -183,7 +183,7 @@ static PRBool _pr_ipv6_v6only_on_by_default; +@@ -192,7 +192,7 @@ static PRBool _pr_ipv6_v6only_on_by_default; || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ @@ -329,7 +329,7 @@ index 3ad2d80..8f685c9 100644 #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" -@@ -3477,7 +3477,7 @@ static PRIOMethods _pr_socketpollfd_methods = { +@@ -3524,7 +3524,7 @@ static PRIOMethods _pr_socketpollfd_methods = { || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ @@ -368,20 +368,20 @@ index a58a846..c5bd9a7 100644 $(OBJDIR)/attach: $(OBJDIR)/attach.o $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ -- -2.30.0 +2.30.2 -From 4140a54407dc15ec54dfa0e4ff07779265a83cce Mon Sep 17 00:00:00 2001 +From 4a0a9a16f44a41750553dda6c51b5fb37093a3dd Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 22 Feb 2021 19:11:19 +0100 Subject: Haiku library path diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c -index 1f34307..dd0b1e9 100644 +index 011ff17..e6b5a15 100644 --- a/pr/src/linking/prlink.c +++ b/pr/src/linking/prlink.c -@@ -275,7 +275,11 @@ PR_GetLibraryPath(void) +@@ -257,7 +257,11 @@ PR_GetLibraryPath(void) char *p=NULL; int len; @@ -422,20 +422,20 @@ index 8d31440..e5e6b1f 100755 # -- -2.30.0 +2.30.2 -From 847bc98cf2148b0a3829922bc5f2181fbace208c Mon Sep 17 00:00:00 2001 +From 33464158636710568177b7c196083f80decb1ed6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Feb 2021 17:33:32 +0100 Subject: _haiku.cfg for Haiku diff --git a/configure.in b/configure.in -index a3b6610..8b3003e 100644 +index ffe0a0c..203f687 100644 --- a/configure.in +++ b/configure.in -@@ -1492,7 +1492,7 @@ tools are selected during the Xcode/Developer Tools installation.]) +@@ -1497,7 +1497,7 @@ tools are selected during the Xcode/Developer Tools installation.]) DSO_CFLAGS="-fPIC" USE_PTHREADS=1 IMPL_STRATEGY=_PTH @@ -672,10 +672,10 @@ index 0000000..3cf3cd9 +#endif /* nspr_cpucfg___ */ diff --git a/pr/include/md/_haiku.h b/pr/include/md/_haiku.h new file mode 100644 -index 0000000..fb9dbc7 +index 0000000..a9bde33 --- /dev/null +++ b/pr/include/md/_haiku.h -@@ -0,0 +1,85 @@ +@@ -0,0 +1,86 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* 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 @@ -735,6 +735,7 @@ index 0000000..fb9dbc7 +#undef _PR_USE_POLL + +#define _PR_HAVE_SYSV_SEMAPHORES ++#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY + +#define _PR_INET6 +#define _PR_HAVE_INET_NTOP @@ -781,7 +782,7 @@ index e372315..4ee4f67 100644 #elif defined(DARWIN) diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c -index 8f685c9..34119e4 100644 +index 442bc06..23d49f7 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -34,6 +34,7 @@ @@ -798,9 +799,33 @@ index 8f685c9..34119e4 100644 -#include "primpl.h" - - #ifdef HAVE_NETINET_TCP_H - #include /* TCP_NODELAY, TCP_MAXSEG */ + #if defined(LINUX) || defined(ANDROID) + #include #endif -- -2.30.0 +2.30.2 + + +From 5e1146babffc6a8256994e3e455caca928bedb68 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 18 Dec 2021 19:19:25 +0100 +Subject: Haiku: add padding for sockaddr + + +diff --git a/pr/include/prio.h b/pr/include/prio.h +index 8b331a3..e6c8d6f 100644 +--- a/pr/include/prio.h ++++ b/pr/include/prio.h +@@ -152,6 +152,9 @@ union PRNetAddr { + PRUint16 port; /* port number */ + PRUint32 ip; /* The actual 32 bits of address */ + char pad[8]; ++#if defined(HAIKU) ++ char pad2[16]; ++#endif + } inet; + struct { + PRUint16 family; /* address family (AF_INET6) */ +-- +2.30.2