Received: by mail.netbsd.org (Postfix, from userid 605) id 3BE5884E09; Fri, 18 Jun 2021 13:30:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 77CE484DFC for ; Fri, 18 Jun 2021 13:30:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id pE9ErYFStjGK for ; Fri, 18 Jun 2021 13:30:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4DFA684CDC for ; Fri, 18 Jun 2021 13:30:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48060FA95; Fri, 18 Jun 2021 13:30:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162402303256180" MIME-Version: 1.0 Date: Fri, 18 Jun 2021 13:30:32 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/firefox68 To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210618133032.48060FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162402303256180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jun 18 13:30:32 UTC 2021 Modified Files: pkgsrc/www/firefox68: distinfo Added Files: pkgsrc/www/firefox68/patches: patch-dom_indexedDB_ActorsParent.cpp patch-dom_indexedDB_IDBCursor.cpp patch-dom_indexedDB_IDBDatabase.cpp patch-dom_indexedDB_IDBObjectStore.cpp patch-dom_indexedDB_IDBTransaction.cpp patch-dom_indexedDB_IDBTransaction.h patch-dom_indexedDB_ProfilerHelpers.h Log Message: firefox68: Fix build with latest NSS. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/firefox68/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ActorsParent.cpp \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBCursor.cpp \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBDatabase.cpp \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBObjectStore.cpp \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.cpp \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.h \ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ProfilerHelpers.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162402303256180 Content-Disposition: inline Content-Length: 15290 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox68/distinfo diff -u pkgsrc/www/firefox68/distinfo:1.23 pkgsrc/www/firefox68/distinfo:1.24 --- pkgsrc/www/firefox68/distinfo:1.23 Sat Aug 29 18:39:34 2020 +++ pkgsrc/www/firefox68/distinfo Fri Jun 18 13:30:31 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2020/08/29 18:39:34 nia Exp $ +$NetBSD: distinfo,v 1.24 2021/06/18 13:30:31 nia Exp $ SHA1 (firefox-68.12.0esr.source.tar.xz) = 976fae5c3cdee8b7929e4f17eca6cf44513d08b4 RMD160 (firefox-68.12.0esr.source.tar.xz) = c7871e1d9f8eaff2c0eaff7c70f49c2488e616f8 @@ -10,6 +10,13 @@ SHA1 (patch-build_moz.configure_rust.con SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89 SHA1 (patch-config_makefiles_rust.mk) = 564169b2a1ef7f378caa8ba8962b9cf3baf01735 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 +SHA1 (patch-dom_indexedDB_ActorsParent.cpp) = ebc9890d2973bcb59d387033509cb158799d4778 +SHA1 (patch-dom_indexedDB_IDBCursor.cpp) = 5a4120964c983526c877d19d9b2bdacb1b1f951a +SHA1 (patch-dom_indexedDB_IDBDatabase.cpp) = a617b2ed89809b7026580e315329114b1e87a939 +SHA1 (patch-dom_indexedDB_IDBObjectStore.cpp) = cf2bcb19bf24f82a0bab181999ad44f5d297e16e +SHA1 (patch-dom_indexedDB_IDBTransaction.cpp) = c07207e5c95425f5f291857a4fa130879463d09a +SHA1 (patch-dom_indexedDB_IDBTransaction.h) = 7a8f72531abd14a7763e21898135aa3032b41d00 +SHA1 (patch-dom_indexedDB_ProfilerHelpers.h) = 755a20c5d4c84968e1759f189d24bd9b3c8c7d30 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7 SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs) = 091ffab5bd6a15425acb2ab023cc26f6b23324c6 Added files: Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ActorsParent.cpp diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ActorsParent.cpp:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ActorsParent.cpp Fri Jun 18 13:30:32 2021 @@ -0,0 +1,106 @@ +$NetBSD: patch-dom_indexedDB_ActorsParent.cpp,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/ActorsParent.cpp.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/ActorsParent.cpp +@@ -10071,7 +10071,7 @@ DatabaseConnection::AutoSavepoint::~Auto + MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE || + mDEBUGTransaction->GetMode() == + IDBTransaction::READ_WRITE_FLUSH || +- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mDEBUGTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || + mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + if (NS_FAILED(mConnection->RollbackSavepoint())) { +@@ -10085,7 +10085,7 @@ nsresult DatabaseConnection::AutoSavepoi + MOZ_ASSERT(aTransaction); + MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE || + aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- aTransaction->GetMode() == IDBTransaction::CLEANUP || ++ aTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || + aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection(); +@@ -12947,7 +12947,7 @@ PBackgroundIDBTransactionParent* Databas + if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY && + aMode != IDBTransaction::READ_WRITE && + aMode != IDBTransaction::READ_WRITE_FLUSH && +- aMode != IDBTransaction::CLEANUP)) { ++ aMode != IDBTransaction::TRANSACTION_CLEANUP)) { + ASSERT_UNLESS_FUZZING(); + return nullptr; + } +@@ -12956,7 +12956,7 @@ PBackgroundIDBTransactionParent* Databas + // has write access. + if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP) && ++ aMode == IDBTransaction::TRANSACTION_CLEANUP) && + mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo && + !mChromeWriteAccessAllowed)) { + return nullptr; +@@ -13019,7 +13019,7 @@ mozilla::ipc::IPCResult Database::RecvPB + MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY || + aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP); ++ aMode == IDBTransaction::TRANSACTION_CLEANUP); + MOZ_ASSERT(!mClosed); + + if (IsInvalidated()) { +@@ -13161,7 +13161,7 @@ nsresult Database::StartTransactionOp::D + + Transaction()->SetActiveOnConnectionThread(); + +- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) { ++ if (Transaction()->GetMode() == IDBTransaction::TRANSACTION_CLEANUP) { + nsresult rv = aConnection->DisableQuotaChecks(); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; +@@ -13453,7 +13453,7 @@ bool TransactionBase::VerifyRequestParam + case RequestParams::TObjectStoreDeleteParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::TRANSACTION_CLEANUP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -13477,7 +13477,7 @@ bool TransactionBase::VerifyRequestParam + case RequestParams::TObjectStoreClearParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::TRANSACTION_CLEANUP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -21975,7 +21975,7 @@ nsresult TransactionBase::CommitOp::Writ + mTransaction->AssertIsOnConnectionThread(); + MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE || + mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + const nsTArray>& metadataArray = +@@ -22039,7 +22039,7 @@ void TransactionBase::CommitOp::CommitOr + mTransaction->AssertIsOnConnectionThread(); + MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE || + mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + nsTArray>& metadataArray = +@@ -22163,7 +22163,7 @@ TransactionBase::CommitOp::Run() { + + connection->FinishWriteTransaction(); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) { ++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP) { + connection->DoIdleProcessing(/* aNeedsCheckpoint */ true); + + connection->EnableQuotaChecks(); Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBCursor.cpp diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBCursor.cpp:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBCursor.cpp Fri Jun 18 13:30:32 2021 @@ -0,0 +1,16 @@ +$NetBSD: patch-dom_indexedDB_IDBCursor.cpp,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/IDBCursor.cpp.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/IDBCursor.cpp +@@ -630,7 +630,7 @@ already_AddRefed IDBCursor:: + return nullptr; + } + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || IsSourceDeleted() || ++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || IsSourceDeleted() || + !mHaveValue || mType == Type_ObjectStoreKey || mType == Type_IndexKey || + mContinueCalled) { + aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR); Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBDatabase.cpp diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBDatabase.cpp:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBDatabase.cpp Fri Jun 18 13:30:32 2021 @@ -0,0 +1,43 @@ +$NetBSD: patch-dom_indexedDB_IDBDatabase.cpp,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/IDBDatabase.cpp.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/IDBDatabase.cpp +@@ -599,7 +599,7 @@ nsresult IDBDatabase::Transaction(JSCont + break; + case IDBTransactionMode::Readwrite: + if (mQuotaExceeded) { +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::TRANSACTION_CLEANUP; + mQuotaExceeded = false; + } else { + mode = IDBTransaction::READ_WRITE; +@@ -609,7 +609,7 @@ nsresult IDBDatabase::Transaction(JSCont + mode = IDBTransaction::READ_WRITE_FLUSH; + break; + case IDBTransactionMode::Cleanup: +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::TRANSACTION_CLEANUP; + mQuotaExceeded = false; + break; + case IDBTransactionMode::Versionchange: +@@ -643,7 +643,7 @@ nsresult IDBDatabase::Transaction(JSCont + + transaction->SetBackgroundActor(actor); + +- if (mode == IDBTransaction::CLEANUP) { ++ if (mode == IDBTransaction::TRANSACTION_CLEANUP) { + ExpireFileActors(/* aExpireAll */ true); + } + +@@ -787,7 +787,7 @@ void IDBDatabase::AbortTransactions(bool + // We warn for any transactions that could have written data. + case IDBTransaction::READ_WRITE: + case IDBTransaction::READ_WRITE_FLUSH: +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::TRANSACTION_CLEANUP: + case IDBTransaction::VERSION_CHANGE: + transactionsThatNeedWarning.AppendElement(transaction); + break; Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBObjectStore.cpp diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBObjectStore.cpp:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBObjectStore.cpp Fri Jun 18 13:30:32 2021 @@ -0,0 +1,16 @@ +$NetBSD: patch-dom_indexedDB_IDBObjectStore.cpp,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/IDBObjectStore.cpp.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/IDBObjectStore.cpp +@@ -1526,7 +1526,7 @@ already_AddRefed IDBObjectSt + MOZ_ASSERT(aCx); + MOZ_ASSERT_IF(aFromCursor, aOverwrite); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || mDeletedSpec) { ++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP || mDeletedSpec) { + aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR); + return nullptr; + } Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.cpp diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.cpp:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.cpp Fri Jun 18 13:30:32 2021 @@ -0,0 +1,25 @@ +$NetBSD: patch-dom_indexedDB_IDBTransaction.cpp,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/IDBTransaction.cpp.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/IDBTransaction.cpp +@@ -177,7 +177,7 @@ already_AddRefed IDBTran + aDatabase->AssertIsOnOwningThread(); + MOZ_ASSERT(!aObjectStoreNames.IsEmpty()); + MOZ_ASSERT(aMode == READ_ONLY || aMode == READ_WRITE || +- aMode == READ_WRITE_FLUSH || aMode == CLEANUP); ++ aMode == READ_WRITE_FLUSH || aMode == TRANSACTION_CLEANUP); + + RefPtr transaction = + new IDBTransaction(aDatabase, aObjectStoreNames, aMode); +@@ -819,7 +819,7 @@ IDBTransactionMode IDBTransaction::GetMo + case READ_WRITE_FLUSH: + return IDBTransactionMode::Readwriteflush; + +- case CLEANUP: ++ case TRANSACTION_CLEANUP: + return IDBTransactionMode::Cleanup; + + case VERSION_CHANGE: Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.h diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.h:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_IDBTransaction.h Fri Jun 18 13:30:32 2021 @@ -0,0 +1,25 @@ +$NetBSD: patch-dom_indexedDB_IDBTransaction.h,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/IDBTransaction.h.orig 2020-08-17 18:26:23.000000000 +0000 ++++ dom/indexedDB/IDBTransaction.h +@@ -54,7 +54,7 @@ class IDBTransaction final : public DOME + READ_ONLY = 0, + READ_WRITE, + READ_WRITE_FLUSH, +- CLEANUP, ++ TRANSACTION_CLEANUP, + VERSION_CHANGE, + + // Only needed for IPC serialization helper, should never be used in code. +@@ -169,7 +169,7 @@ class IDBTransaction final : public DOME + bool IsWriteAllowed() const { + AssertIsOnOwningThread(); + return mMode == READ_WRITE || mMode == READ_WRITE_FLUSH || +- mMode == CLEANUP || mMode == VERSION_CHANGE; ++ mMode == TRANSACTION_CLEANUP || mMode == VERSION_CHANGE; + } + + bool IsAborted() const { Index: pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ProfilerHelpers.h diff -u /dev/null pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ProfilerHelpers.h:1.1 --- /dev/null Fri Jun 18 13:30:32 2021 +++ pkgsrc/www/firefox68/patches/patch-dom_indexedDB_ProfilerHelpers.h Fri Jun 18 13:30:32 2021 @@ -0,0 +1,16 @@ +$NetBSD: patch-dom_indexedDB_ProfilerHelpers.h,v 1.1 2021/06/18 13:30:32 nia Exp $ + +Avoid macro conflict with NSS 3.66 +https://bugzilla.mozilla.org/show_bug.cgi?id=1714311 + +--- dom/indexedDB/ProfilerHelpers.h.orig 2020-08-17 18:26:22.000000000 +0000 ++++ dom/indexedDB/ProfilerHelpers.h +@@ -119,7 +119,7 @@ class MOZ_STACK_CLASS LoggingString fina + case IDBTransaction::READ_WRITE_FLUSH: + AppendLiteral("\"readwriteflush\""); + break; +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::TRANSACTION_CLEANUP: + AppendLiteral("\"cleanup\""); + break; + case IDBTransaction::VERSION_CHANGE: --_----------=_162402303256180--