Received: by mail.netbsd.org (Postfix, from userid 605) id 5DA6B84D87; Sat, 8 Feb 2020 22:06:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D9E3C84D53 for ; Sat, 8 Feb 2020 22:06:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1izU5uf6DIqc for ; Sat, 8 Feb 2020 22:06:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B2F3584CE8 for ; Sat, 8 Feb 2020 22:06:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A6E2EFBF4; Sat, 8 Feb 2020 22:06:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1581199598121330" MIME-Version: 1.0 Date: Sat, 8 Feb 2020 22:06:38 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/www/firefox68 To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20200208220638.A6E2EFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1581199598121330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Sat Feb 8 22:06:38 UTC 2020 Modified Files: pkgsrc/www/firefox68: Makefile distinfo Added Files: pkgsrc/www/firefox68/patches: patch-nsprpub_pr_src_pthreads_ptsynch.c Log Message: firefox68: Workaround broken pthread_equal() usage Switch to an internal version of pthread_equal() without sanity checks. Problems detected on NetBSD 9.99.46. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/firefox68/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox68/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox68/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1581199598121330 Content-Disposition: inline Content-Length: 6677 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox68/Makefile diff -u pkgsrc/www/firefox68/Makefile:1.10 pkgsrc/www/firefox68/Makefile:1.11 --- pkgsrc/www/firefox68/Makefile:1.10 Wed Jan 22 13:36:27 2020 +++ pkgsrc/www/firefox68/Makefile Sat Feb 8 22:06:38 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/01/22 13:36:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.11 2020/02/08 22:06:38 kamil Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 68.4 @@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= .2esr DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/www/firefox68/distinfo diff -u pkgsrc/www/firefox68/distinfo:1.8 pkgsrc/www/firefox68/distinfo:1.9 --- pkgsrc/www/firefox68/distinfo:1.8 Wed Jan 22 13:36:27 2020 +++ pkgsrc/www/firefox68/distinfo Sat Feb 8 22:06:38 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2020/01/22 13:36:27 ryoon Exp $ +$NetBSD: distinfo,v 1.9 2020/02/08 22:06:38 kamil Exp $ SHA1 (firefox-68.4.2esr.source.tar.xz) = 005701cf6dda606500dfd1bdc5158c0dff8329aa RMD160 (firefox-68.4.2esr.source.tar.xz) = 177b128696b1d55e19ffb57029c325c8de3d59b5 @@ -30,6 +30,7 @@ SHA1 (patch-media_libcubeb_src_cubeb__os SHA1 (patch-media_libcubeb_src_moz.build) = dcca90cb5132442877712cd7b1f4e832c93d2655 SHA1 (patch-media_libcubeb_update.sh) = 4508319d8534a0cc983e4767c2142169af9e5033 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc +SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 Added files: Index: pkgsrc/www/firefox68/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c diff -u /dev/null pkgsrc/www/firefox68/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c:1.1 --- /dev/null Sat Feb 8 22:06:38 2020 +++ pkgsrc/www/firefox68/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c Sat Feb 8 22:06:38 2020 @@ -0,0 +1,106 @@ +$NetBSD: patch-nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/08 22:06:38 kamil Exp $ + +Workaround buggy usage of pthread_equal(). + +--- nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-01-17 19:27:05.000000000 +0000 ++++ 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. +@@ -192,9 +199,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; + + lock->locked = PR_FALSE; +@@ -217,7 +224,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())); + } + + /**************************************************************/ +@@ -273,7 +280,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) +@@ -356,7 +363,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; + +@@ -554,7 +561,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); + PR_ASSERT(0 == rv); +@@ -569,7 +576,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 +@@ -585,7 +592,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) + { +@@ -616,8 +623,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); +@@ -664,7 +671,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; --_----------=_1581199598121330--