From a0174b96833e668ffb3f11c0b144a85387b19d71 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sat, 17 Jul 2021 17:05:17 -0400 Subject: wf 2021.07 rpm --- .../26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch | 38 --------------- waterfox/mozilla-1436242.patch | 56 ---------------------- waterfox/waterfox.spec | 13 +++-- 3 files changed, 6 insertions(+), 101 deletions(-) delete mode 100644 waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch delete mode 100644 waterfox/mozilla-1436242.patch diff --git a/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch b/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch deleted file mode 100644 index f600f17..0000000 --- a/waterfox/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 26459c47f867dc1882fa7b87e32a9e8fc5e125e5 Mon Sep 17 00:00:00 2001 -From: Andrea Marchesini -Date: Mon, 13 Jul 2020 08:34:07 +0000 -Subject: [PATCH] Bug 1650811 - Make Base64 compatible with ReadSegments() with - small buffers. r=asuth, a=RyanVM - -Differential Revision: https://phabricator.services.mozilla.com/D82522 ---- - netwerk/test/gtest/moz.build | 1 + - xpcom/io/Base64.cpp | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/netwerk/test/gtest/moz.build b/netwerk/test/gtest/moz.build -index 34a06c9943ac..fa7c90ff3bdd 100644 ---- a/netwerk/test/gtest/moz.build -+++ b/netwerk/test/gtest/moz.build -@@ -6,6 +6,7 @@ - - UNIFIED_SOURCES += [ - 'TestBase64Stream.cpp', -+ 'TestBufferedInputStream.cpp', - 'TestHeaders.cpp', - 'TestHttpAuthUtils.cpp', - 'TestProtocolProxyService.cpp', -diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp -index 2f9f50b6528b..72ad070c4bf5 100644 ---- a/xpcom/io/Base64.cpp -+++ b/xpcom/io/Base64.cpp -@@ -107,6 +107,9 @@ nsresult EncodeInputStream_Encoder(nsIInputStream* aStream, void* aClosure, - // We consume the whole data always. - *aWriteCount = aCount; - -+ // We consume the whole data always. -+ *aWriteCount = aCount; -+ - // If we have any data left from last time, encode it now. - uint32_t countRemaining = aCount; - const unsigned char* src = (const unsigned char*)aFromSegment; diff --git a/waterfox/mozilla-1436242.patch b/waterfox/mozilla-1436242.patch deleted file mode 100644 index 570b7c5..0000000 --- a/waterfox/mozilla-1436242.patch +++ /dev/null @@ -1,56 +0,0 @@ - -# HG changeset patch -# User Jed Davis -# Date 1526943705 21600 -# Node ID 6bb3adfa15c6877f7874429462dad88f8c978c4f -# Parent 4c71c8454879c841871ecf3afb7dbdc96bad97fc -Bug 1436242 - Avoid undefined behavior in IPC fd-passing code. r=froydnj - -MozReview-Commit-ID: 3szIPUssgF5 - -diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc ---- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -418,20 +418,37 @@ bool Channel::ChannelImpl::ProcessIncomi - const int* fds; - unsigned num_fds; - unsigned fds_i = 0; // the index of the first unused descriptor - - if (input_overflow_fds_.empty()) { - fds = wire_fds; - num_fds = num_wire_fds; - } else { -- const size_t prev_size = input_overflow_fds_.size(); -- input_overflow_fds_.resize(prev_size + num_wire_fds); -- memcpy(&input_overflow_fds_[prev_size], wire_fds, -- num_wire_fds * sizeof(int)); -+ // This code may look like a no-op in the case where -+ // num_wire_fds == 0, but in fact: -+ // -+ // 1. wire_fds will be nullptr, so passing it to memcpy is -+ // undefined behavior according to the C standard, even though -+ // the memcpy length is 0. -+ // -+ // 2. prev_size will be an out-of-bounds index for -+ // input_overflow_fds_; this is undefined behavior according to -+ // the C++ standard, even though the element only has its -+ // pointer taken and isn't accessed (and the corresponding -+ // operation on a C array would be defined). -+ // -+ // UBSan makes #1 a fatal error, and assertions in libstdc++ do -+ // the same for #2 if enabled. -+ if (num_wire_fds > 0) { -+ const size_t prev_size = input_overflow_fds_.size(); -+ input_overflow_fds_.resize(prev_size + num_wire_fds); -+ memcpy(&input_overflow_fds_[prev_size], wire_fds, -+ num_wire_fds * sizeof(int)); -+ } - fds = &input_overflow_fds_[0]; - num_fds = input_overflow_fds_.size(); - } - - // The data for the message we're currently reading consists of any data - // stored in incoming_message_ followed by data in input_buf_ (followed by - // other messages). - - diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index b7d6799..0c3358a 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.06 +Version: 2021.07 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -226,7 +226,6 @@ Patch226: rhbz-1354671.patch Patch402: mozilla-1196777.patch Patch413: mozilla-1353817.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch -Patch417: mozilla-1436242.patch Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mozilla-1389436.patch @@ -445,12 +444,9 @@ This package contains results of tests executed during build. %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 %endif -%patch417 -p1 -b .mozilla-1436242 %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 -%patch450 -p1 -b .gh26459c4 -R - # Debian extension patch %patch500 -p1 -b .440908 @@ -488,7 +484,7 @@ done # 5: uncertain for i in \ 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \ - 1395486 1396722 1398021 1399412 1401909 1419762 1427126 1430508 1433747 \ + 1395486 1396722 1398021 1399412 1401909 1417751 1419762 1427126 1430508 1433747 \ 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \ 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \ 1447519 @@ -1120,11 +1116,14 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Jun 15 2021 B. Stack - 2021.06-11.classic +* Sat Jul 17 2021 B. Stack - 2021.07-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Sat Jul 17 2021 Phantom X - 2021.07-1.classic +- 2021.07 + * Mon Jun 07 2021 Phantom X - 2021.06-1.classic - 2021.06 -- cgit