CVS commit: [pkgsrc-2024Q3] pkgsrc/www/palemoon

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Oct 16 09:01:50 UTC 2024

Modified Files:
        pkgsrc/www/palemoon [pkgsrc-2024Q3]: Makefile distinfo
Added Files:
        pkgsrc/www/palemoon/patches [pkgsrc-2024Q3]:
            patch-platform_nsprpub_pr_include_private_pprthred.h
            patch-platform_nsprpub_pr_src_pthreads_ptsynch.c
            patch-platform_nsprpub_pr_src_pthreads_ptthread.c
Removed Files:
        pkgsrc/www/palemoon/patches [pkgsrc-2024Q3]:
            patch-platform_js_src_jit_AtomicOperations.h
            patch-platform_js_src_jit_ProcessExecutableMemory.cpp
            patch-platform_js_src_vm_ArrayBufferObject.cpp
            patch-platform_media_libcubeb_src_moz.build
            patch-platform_media_libjpeg_moz.build
            patch-platform_media_libjpeg_simd_powerpc_jsimd.c
            patch-platform_old-configure.in
            patch-platform_xpcom_reflect_xptcall_md_unix_moz.build

Log Message:
Pullup ticket #6905 - requested by nia
www/palemoon: security fix

Revisions pulled up:
- www/palemoon/Makefile                                         1.12-1.13
- www/palemoon/distinfo                                         1.14-1.15
- www/palemoon/patches/patch-platform_js_src_jit_AtomicOperations.h deleted
- www/palemoon/patches/patch-platform_js_src_jit_ProcessExecutableMemory.cpp deleted
- www/palemoon/patches/patch-platform_js_src_vm_ArrayBufferObject.cpp deleted
- www/palemoon/patches/patch-platform_media_libcubeb_src_moz.build deleted
- www/palemoon/patches/patch-platform_media_libjpeg_moz.build   deleted
- www/palemoon/patches/patch-platform_media_libjpeg_simd_powerpc_jsimd.c deleted
- www/palemoon/patches/patch-platform_nsprpub_pr_include_private_pprthred.h 1.1
- www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptsynch.c 1.1
- www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptthread.c 1.1
- www/palemoon/patches/patch-platform_old-configure.in          deleted
- www/palemoon/patches/patch-platform_xpcom_reflect_xptcall_md_unix_moz.build deleted

---
   Module Name:    pkgsrc
   Committed By:   nia
   Date:           Tue Oct  1 12:20:29 UTC 2024

   Modified Files:
           pkgsrc/www/palemoon: Makefile distinfo
   Added Files:
           pkgsrc/www/palemoon/patches:
               patch-platform_nsprpub_pr_include_private_pprthred.h
               patch-platform_nsprpub_pr_src_pthreads_ptsynch.c
               patch-platform_nsprpub_pr_src_pthreads_ptthread.c

   Log Message:
   palemoon: Import the rest of our nsprpub patches

   It's unclear to me if these are strictly necessary with Pale Moon.
   They appear to not affect browser stability for me.  However, since
   they're bugs in the nsprpub library that Mozilla doesn't want to fix
   (likely due to API compatibility?), and previously triggered crashes on
   NetBSD, better safe than sorry.

---
   Module Name:    pkgsrc
   Committed By:   nia
   Date:           Wed Oct  9 14:07:42 UTC 2024

   Modified Files:
           pkgsrc/www/palemoon: Makefile distinfo
   Removed Files:
           pkgsrc/www/palemoon/patches:
               patch-platform_js_src_jit_AtomicOperations.h
               patch-platform_js_src_jit_ProcessExecutableMemory.cpp
               patch-platform_js_src_vm_ArrayBufferObject.cpp
               patch-platform_media_libcubeb_src_moz.build
               patch-platform_media_libjpeg_moz.build
               patch-platform_media_libjpeg_simd_powerpc_jsimd.c
               patch-platform_old-configure.in
               patch-platform_xpcom_reflect_xptcall_md_unix_moz.build

   Log Message:
   palemoon: Update to 33.4.0

        v33.4.0 (2024-10-08)

      This is a development, bugfix and security release.

      Changes/fixes:
        * Introduced the "ghostbuster" concept; this is an automated internal
          mechanism to attempt cleanup of particularly problematic web content
          after a tab or window is closed. See implementation notes.
        * Added support for the PROT_MPROTECT security feature on targets that
          use it (notably PaX and NetBSD).
        * Implemented preferences to give the user control over the Same-Origin
          Policy (SOP) and CORS preflight. See implementation notes.
        * Improved buildability on NetBSD and Altivec architectures.
        * Fixed building issues on Apple Silicon Mac with XCode 16.
        * Added workarounds for non-standard MSE/WebM/VPx encoding on YouTube
          that could cause video buffering and halting issues.
        * Dev: Changed the default credentials mode for module scripts from
          'omit' to 'same-origin', aligning with mainstream.
        * Dev: Implemented getTransform and setTransform with DOMMatrix
          arguments.
        * Dev: Implemented ES2023 Hashbang grammar proposal.
        * Fixed an issue with JavaScript's StructuredClone.
        * Security issues addressed: CVE-2024-9396.
        * Rejected: CVE-2024-9398 (properly informing the user about attempts to
          use unhandled protocols by web pages is considered more important than
          potential determination whether a handler for such a protocol is
          installed)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.2.1 pkgsrc/www/palemoon/Makefile
cvs rdiff -u -r1.13 -r1.13.2.1 pkgsrc/www/palemoon/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/www/palemoon/patches/patch-platform_js_src_jit_AtomicOperations.h \
    pkgsrc/www/palemoon/patches/patch-platform_media_libjpeg_moz.build \
    pkgsrc/www/palemoon/patches/patch-platform_xpcom_reflect_xptcall_md_unix_moz.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/palemoon/patches/patch-platform_js_src_jit_ProcessExecutableMemory.cpp \
    pkgsrc/www/palemoon/patches/patch-platform_js_src_vm_ArrayBufferObject.cpp \
    pkgsrc/www/palemoon/patches/patch-platform_media_libcubeb_src_moz.build \
    pkgsrc/www/palemoon/patches/patch-platform_media_libjpeg_simd_powerpc_jsimd.c \
    pkgsrc/www/palemoon/patches/patch-platform_old-configure.in
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_include_private_pprthred.h \
    pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptsynch.c \
    pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptthread.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/palemoon/Makefile
diff -u pkgsrc/www/palemoon/Makefile:1.11 pkgsrc/www/palemoon/Makefile:1.11.2.1
--- pkgsrc/www/palemoon/Makefile:1.11   Tue Sep 17 06:24:18 2024
+++ pkgsrc/www/palemoon/Makefile        Wed Oct 16 09:01:50 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2024/09/17 06:24:18 martin Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2024/10/16 09:01:50 bsiegert Exp $
 # for build instructions see
 # https://developer.palemoon.org/build/linux/
 
-PKGNAME=       palemoon-33.3.1
+PKGNAME=       palemoon-33.4.0
 CATEGORIES=    www
 
 DIST_SUBDIR=   palemoon-${PKGVERSION_NOREV}
@@ -14,7 +14,7 @@ SITES.palemoon.tar.gz= \
        -https://repo.palemoon.org/MoonchildProductions/Pale-Moon/archive/${PKGVERSION_NOREV}_Release.tar.gz
 
 SITES.uxp.tar.gz= \
-       -https://repo.palemoon.org/MoonchildProductions/UXP/archive/RB_20240909.tar.gz
+       -https://repo.palemoon.org/MoonchildProductions/UXP/archive/RB_20241008.tar.gz
 
 SITES.psutil.tar.gz= \
        -https://files.pythonhosted.org/packages/7b/58/2675697b6831e6ac4b7b7bc4e5dcdb24a2f39f8411186573eb0de16eb6d5/psutil-3.4.2.tar.gz

Index: pkgsrc/www/palemoon/distinfo
diff -u pkgsrc/www/palemoon/distinfo:1.13 pkgsrc/www/palemoon/distinfo:1.13.2.1
--- pkgsrc/www/palemoon/distinfo:1.13   Mon Sep 23 11:12:10 2024
+++ pkgsrc/www/palemoon/distinfo        Wed Oct 16 09:01:50 2024
@@ -1,37 +1,32 @@
-$NetBSD: distinfo,v 1.13 2024/09/23 11:12:10 martin Exp $
+$NetBSD: distinfo,v 1.13.2.1 2024/10/16 09:01:50 bsiegert Exp $
 
-BLAKE2s (palemoon-33.3.1/palemoon.tar.gz) = c62225d8c487edddcfb5c2ea544ea87accc48556351610593a339d1ab765f7d5
-SHA512 (palemoon-33.3.1/palemoon.tar.gz) = b9dc0c0f65afc818fc4b5a5483893a8a87685405df3d8b4bf3b557c237eb8f3c75490e8a61305d367aebbd325bd419ad8dd9798c6a9bc77e48d061febaf31c88
-Size (palemoon-33.3.1/palemoon.tar.gz) = 8568276 bytes
-BLAKE2s (palemoon-33.3.1/psutil.tar.gz) = 7a2c5c938910795453cf1cdfd5fbfa4dc8cac15e6eb43a5e9aba91ac032b37ce
-SHA512 (palemoon-33.3.1/psutil.tar.gz) = 95c246ed4ce68a476f83868312101d88dafa9d4cef96ff60af646a443c00e6cc447d37cc1ac4e85224db16c24390575174bb7ef76f48cb839fe2e93749107ffb
-Size (palemoon-33.3.1/psutil.tar.gz) = 274361 bytes
-BLAKE2s (palemoon-33.3.1/uxp.tar.gz) = 60f8918f3501d795029c8505592fb7b7eca11fa9057863bec88523771182a253
-SHA512 (palemoon-33.3.1/uxp.tar.gz) = e01f495513db5fed1c1d337616734a40f38fe553bf4d42587e3fc8fb75dae8ccff80561d8eea7d8ee5ecba31cfcd20bc05c91e179dbad3f03a68bffca5db1416
-Size (palemoon-33.3.1/uxp.tar.gz) = 264084359 bytes
+BLAKE2s (palemoon-33.4.0/palemoon.tar.gz) = 9d6277d7b5d564fb421bae8a15aebc89b9821339630370c28e2fcc622b3387e1
+SHA512 (palemoon-33.4.0/palemoon.tar.gz) = 0ead48d6071371f0c87546994c0854e8124c76268687e84ae4b8fd5734a13f4dfb1f6eb50344d5ddf372e2fb8459ce38a61a2f56ba545be9e431072e9ef50321
+Size (palemoon-33.4.0/palemoon.tar.gz) = 8568779 bytes
+BLAKE2s (palemoon-33.4.0/psutil.tar.gz) = 7a2c5c938910795453cf1cdfd5fbfa4dc8cac15e6eb43a5e9aba91ac032b37ce
+SHA512 (palemoon-33.4.0/psutil.tar.gz) = 95c246ed4ce68a476f83868312101d88dafa9d4cef96ff60af646a443c00e6cc447d37cc1ac4e85224db16c24390575174bb7ef76f48cb839fe2e93749107ffb
+Size (palemoon-33.4.0/psutil.tar.gz) = 274361 bytes
+BLAKE2s (palemoon-33.4.0/uxp.tar.gz) = 2699b5b233dadea22f2fdb4f499639ada2131782ecba412831d8b1b2ada38a16
+SHA512 (palemoon-33.4.0/uxp.tar.gz) = 812cf750144c4051dc3ebb189f2e9d81c48b3db0d81367ebfa0f2b07a3c34558e59b4436465dc9ab03df4e8791e96ee7815af180fa4d70c8a25cc39b2adfa953
+Size (palemoon-33.4.0/uxp.tar.gz) = 264079839 bytes
 SHA1 (patch-palemoon_app_profile_palemoon.js) = 0687dccbb5adff1ee0ea71fef4ebd46174a434d4
 SHA1 (patch-platform_build_moz.build) = 7b45929d58ad0963423f7c859922df6d98413c67
 SHA1 (patch-platform_gfx_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp) = 502d79eb3ef41e08328bbac9fbb5048b96660bbb
 SHA1 (patch-platform_intl_icu_source_configure) = 87d19e9212b4340d9b052b5a89be84432ad1cff2
 SHA1 (patch-platform_ipc_chromium_src_base_atomicops.h) = ab4b489e9f9c22a861a275924ef34a909d210828
 SHA1 (patch-platform_ipc_chromium_src_base_atomicops__internals__arm__gcc.h) = f33b6c391689c52d0a6855e29ff25d863a7f15e5
-SHA1 (patch-platform_js_src_jit_AtomicOperations.h) = 1cd5a87f727389007d67a0d79edce3e855e15536
-SHA1 (patch-platform_js_src_jit_ProcessExecutableMemory.cpp) = 5cf5a2205a2b38fb8785e6c255231fbcdbd13949
-SHA1 (patch-platform_js_src_vm_ArrayBufferObject.cpp) = 652db4b78ecaba840c0cba945b4af39a6b1362b9
 SHA1 (patch-platform_media_libaom_config_linux_arm_config_aom__config.h) = 69ef22fe9892c2288accb6eb00b4533d8cee0299
 SHA1 (patch-platform_media_libcubeb_src_cubeb__sun.c) = ce27774d772d65fa60b6be5bee82fbe4f787f3d1
-SHA1 (patch-platform_media_libcubeb_src_moz.build) = 5f9f7656bf9d251edb395cb19fae8cd614c0b287
-SHA1 (patch-platform_media_libjpeg_moz.build) = 2c7ecf49b1caaf2550c667b90ff403c8d1d03639
-SHA1 (patch-platform_media_libjpeg_simd_powerpc_jsimd.c) = 2c5dfdc422e956d55845472ddb320dd857d41fb7
 SHA1 (patch-platform_media_libtheora_moz.build) = a7bad662dabb87c6a85542a4a50f8ed693064bc6
 SHA1 (patch-platform_media_libvpx_config_linux_arm_vpx__config.h) = a580208cd342d7dc27985118e1707772e0cccf02
 SHA1 (patch-platform_nsprpub_pr_include_md__netbsd.cfg) = 1dc06ad2dc49eb3297dc0651dce546cff6882f7b
 SHA1 (patch-platform_nsprpub_pr_include_md__netbsd.h) = 72de23f42dc38d9cfacf41776e53af613a0c4f19
-SHA1 (patch-platform_old-configure.in) = 05711cd91f7adca8c7325d01dc6e6553ce5bedb5
+SHA1 (patch-platform_nsprpub_pr_include_private_pprthred.h) = eeee6714ba27e6465701bffbc404915ceb0c9e55
+SHA1 (patch-platform_nsprpub_pr_src_pthreads_ptsynch.c) = f99271490a983d0a1d101cb0d2b593a3987549d7
+SHA1 (patch-platform_nsprpub_pr_src_pthreads_ptthread.c) = a04b06e39c289ac32dfbb6cbd79b1d7ecf0b560d
 SHA1 (patch-platform_security_generate__mapfile.py) = ae457a8e85c4ce95014dff442b8afd0e20ded543
 SHA1 (patch-platform_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 73b57772d29b0567c0aa1faea8a3f345dbc0488a
 SHA1 (patch-platform_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 2a5ccc95fb5860b1be97947f3aee8307f4a25bc1
 SHA1 (patch-platform_toolkit_xre_nsX11ErrorHandler.cpp) = 164d93a5b1aaeba15b524fdaef0483b4a9400ac1
-SHA1 (patch-platform_xpcom_reflect_xptcall_md_unix_moz.build) = 9e89b80bb43da9e00dfa6a166230b90bb0ba3c3b
 SHA1 (patch-platform_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 5b6a5c6eea2668cc5eaaf775400c382114876d86
 SHA1 (patch-platform_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = de7188f7ac09fd3d4a65968a12ae324b3a0415c4

Added files:

Index: pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_include_private_pprthred.h
diff -u /dev/null pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_include_private_pprthred.h:1.1.2.2
--- /dev/null   Wed Oct 16 09:01:50 2024
+++ pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_include_private_pprthred.h    Wed Oct 16 09:01:50 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-platform_nsprpub_pr_include_private_pprthred.h,v 1.1.2.2 2024/10/16 09:01:50 bsiegert Exp $
+
+pthread_t may be 64-bit, avoid integer truncation. 
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
+
+--- platform/nsprpub/pr/include/private/pprthred.h.orig        2024-09-05 08:13:09.000000000 +0000
++++ platform/nsprpub/pr/include/private/pprthred.h
+@@ -19,6 +19,8 @@
+ #include <os2.h>
+ #endif
+ 
++#include <pthread.h>
++
+ PR_BEGIN_EXTERN_C
+ 
+ /*---------------------------------------------------------------------------
+@@ -59,7 +61,7 @@ NSPR_API(void) PR_DetachThread(void);
+ ** Get the id of the named thread. Each thread is assigned a unique id
+ ** when it is created or attached.
+ */
+-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
++NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
+ 
+ /*
+ ** Set the procedure that is called when a thread is dumped. The procedure
Index: pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptsynch.c
diff -u /dev/null pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptsynch.c:1.1.2.2
--- /dev/null   Wed Oct 16 09:01:50 2024
+++ pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptsynch.c        Wed Oct 16 09:01:50 2024
@@ -0,0 +1,110 @@
+$NetBSD: patch-platform_nsprpub_pr_src_pthreads_ptsynch.c,v 1.1.2.2 2024/10/16 09:01:50 bsiegert Exp $
+
+* Do not use pthread_equal() for non-valid thread pointers.
+  From kamin@ on source-changes-d%NetBSD.org@localhost.
+  https://mail-index.netbsd.org/source-changes-d/2020/02/03/msg012143.html
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718838
+
+--- platform/nsprpub/pr/src/pthreads/ptsynch.c.orig    2024-09-05 08:13:09.000000000 +0000
++++ platform/nsprpub/pr/src/pthreads/ptsynch.c
+@@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
+ extern PTDebug pt_debug;  /* this is shared between several modules */
+ #endif  /* defined(DEBUG) */
+ 
++/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++static int
++pt_pthread_equal(pthread_t t1, pthread_t t2)
++{
++      return t1 == t2;
++}
++
+ #if defined(FREEBSD)
+ /*
+  * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
+@@ -197,9 +204,9 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock 
+     PR_ASSERT(lock != NULL);
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
+     PR_ASSERT(PR_TRUE == lock->locked);
+-    PR_ASSERT(pthread_equal(lock->owner, self));
++    PR_ASSERT(pt_pthread_equal(lock->owner, self));
+ 
+-    if (!lock->locked || !pthread_equal(lock->owner, self)) {
++    if (!lock->locked || !pt_pthread_equal(lock->owner, self)) {
+         return PR_FAILURE;
+     }
+ 
+@@ -225,7 +232,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
+      * to the correctness of PR_AssertCurrentThreadOwnsLock(), but
+      * this particular order makes the assertion more likely to
+      * catch errors. */
+-    PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
++    PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
+ }
+ 
+ /**************************************************************/
+@@ -281,7 +288,7 @@ static void pt_PostNotifyToCvar(PRCondVa
+     _PT_Notified *notified = &cvar->lock->notified;
+ 
+     PR_ASSERT(PR_TRUE == cvar->lock->locked);
+-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+ 
+     while (1)
+@@ -369,7 +376,7 @@ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PR
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+     PR_ASSERT(PR_TRUE == cvar->lock->locked);
+     /* and it better be by us */
+-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+ 
+     if (_PT_THREAD_INTERRUPTED(thred)) {
+         goto aborted;
+@@ -582,7 +589,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
+ 
+     rv = pthread_mutex_lock(&mon->lock);
+     PR_ASSERT(0 == rv);
+-    if (pthread_equal(mon->owner, self)) {
++    if (pt_pthread_equal(mon->owner, self)) {
+         count = mon->entryCount;
+     }
+     rv = pthread_mutex_unlock(&mon->lock);
+@@ -598,7 +605,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
+     rv = pthread_mutex_lock(&mon->lock);
+     PR_ASSERT(0 == rv);
+     PR_ASSERT(mon->entryCount != 0 &&
+-              pthread_equal(mon->owner, pthread_self()));
++              pt_pthread_equal(mon->owner, pthread_self()));
+     rv = pthread_mutex_unlock(&mon->lock);
+     PR_ASSERT(0 == rv);
+ #endif
+@@ -614,7 +621,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
+     PR_ASSERT(0 == rv);
+     if (mon->entryCount != 0)
+     {
+-        if (pthread_equal(mon->owner, self)) {
++        if (pt_pthread_equal(mon->owner, self)) {
+             goto done;
+         }
+         while (mon->entryCount != 0)
+@@ -646,8 +653,8 @@ PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PR
+     PR_ASSERT(0 == rv);
+     /* the entries should be > 0 and we'd better be the owner */
+     PR_ASSERT(mon->entryCount > 0);
+-    PR_ASSERT(pthread_equal(mon->owner, self));
+-    if (mon->entryCount == 0 || !pthread_equal(mon->owner, self))
++    PR_ASSERT(pt_pthread_equal(mon->owner, self));
++    if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self))
+     {
+         rv = pthread_mutex_unlock(&mon->lock);
+         PR_ASSERT(0 == rv);
+@@ -695,7 +702,7 @@ PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor
+     /* the entries better be positive */
+     PR_ASSERT(mon->entryCount > 0);
+     /* and it better be owned by us */
+-    PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
+ 
+     /* tuck these away 'till later */
+     saved_entries = mon->entryCount;
Index: pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptthread.c
diff -u /dev/null pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptthread.c:1.1.2.2
--- /dev/null   Wed Oct 16 09:01:50 2024
+++ pkgsrc/www/palemoon/patches/patch-platform_nsprpub_pr_src_pthreads_ptthread.c       Wed Oct 16 09:01:50 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-platform_nsprpub_pr_src_pthreads_ptthread.c,v 1.1.2.2 2024/10/16 09:01:50 bsiegert Exp $
+
+pthread_t may be 64-bit, avoid integer truncation.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
+
+--- platform/nsprpub/pr/src/pthreads/ptthread.c.orig   2024-09-05 08:13:09.000000000 +0000
++++ platform/nsprpub/pr/src/pthreads/ptthread.c
+@@ -1183,9 +1183,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+     _exit(status);
+ }
+ 
+-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
++PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
+ {
+-    return (PRUint32)thred->id;  /* and I don't know what they will do with it */
++    return (pthread_t)thred->id;  /* and I don't know what they will do with it */
+ }
+ 
+ /*