Accepting request 904697 from mozilla

Update to SeaMonkey 2.53.8

OBS-URL: https://build.opensuse.org/request/show/904697
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/seamonkey?expand=0&rev=7
This commit is contained in:
Tristan Miller 2021-07-08 06:15:33 +00:00 committed by Git OBS Bridge
parent d31abd614c
commit 60ec12d0da
8 changed files with 51 additions and 172 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ff5fd4f536ab3230172c9e11154ece585c2fceb3d6b8a5a6b804ff5ee72f821
size 13540652

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:432206fe787ffb560e811d32103658d676dccb012fc7092d2071bb59729603ea
size 283452108

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b59bc70d0a3c72c0ef2da7eca5a5efe85dc22507e0d7f1643f2bb14de632041a
size 13542220

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c8f2a82cc9895235fd84eca5d1bb702d8e0428ae04a97a2f31af86d68cdba15
size 282833240

View File

@ -1,55 +0,0 @@
# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1613598448 0
# Node ID b182a3466285a41aa7393af0359eeee16be1350a
# Parent 83d58b5de13b57d482f6e5e3744c98ca96b6669c
Bug 1670538 - Use an allow-list in RUSTC_BOOTSTRAP for rustc >= 1.50.0. r=firefox-build-system-reviewers,andi,sheehan,mhentges
While we could change qcms, encoding_rs and packed_simd to not emit
RUSTC_BOOTSTRAP on newer versions of rust, like we do for gkrust-shared,
it's not worth the effort (especially for those that are vendored).
Differential Revision: https://phabricator.services.mozilla.com/D105423
diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -866,6 +866,17 @@
endif
endif
+ifndef RUSTC_BOOTSTRAP
+ifeq (,$(filter 1.47.% 1.48.% 1.49.%,$(RUSTC_VERSION)))
+# RUSTC_BOOTSTRAP := gkrust_shared,qcms for later
+RUSTC_BOOTSTRAP := gkrust_shared
+ifdef MOZ_RUST_SIMD
+RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd
+endif
+export RUSTC_BOOTSTRAP
+endif
+endif
+
rustflags_override = RUSTFLAGS='$(MOZ_RUST_DEFAULT_FLAGS) $(RUSTFLAGS)'
ifdef MOZ_MSVCBITS
diff --git a/toolkit/library/rust/shared/build.rs.1670538.later b/toolkit/library/rust/shared/build.rs.1670538.later
new file mode 100644
--- /dev/null
+++ b/toolkit/library/rust/shared/build.rs.1670538.later
@@ -0,0 +1,16 @@
+--- build.rs
++++ build.rs
+@@ -17,12 +17,12 @@ fn main() {
+ } else if std::env::var("MOZ_AUTOMATION").is_ok() {
+ panic!("Builds on automation must use a version of rust for which we know how to hook OOM: want < {}, have {}",
+ max_oom_hook_version, ver);
+ }
+
+ // This is a rather awful thing to do, but we're only doing it on
+ // versions of rustc that are not going to change the unstable APIs
+ // we use from under us, all being already released or beta.
+- if bootstrap {
++ if bootstrap && ver < Version::parse("1.50.0").unwrap() {
+ println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
+ }
+ }

View File

@ -1,104 +0,0 @@
# HG changeset patch
# User Dmitry Butskoy <dmitry@butskoy.name>
# Date 1619303931 -7200
# Parent f113610c2ced0b266dbad3626b7f43580d412d15
Bug 1633339 - Fix infinite loop when network changes and e10s is disabled. r=frg a=frg
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -1265,52 +1265,54 @@ WebSocketChannel::Observe(nsISupports *s
if (!mSocketThread) {
// there has not been an asyncopen yet on the object and then we need
// no ping.
LOG(("WebSocket: early object, no ping needed"));
} else {
// Next we check mDataStarted, which we need to do on mTargetThread.
if (!IsOnTargetThread()) {
mTargetThread->Dispatch(
- NewRunnableMethod("net::WebSocketChannel::OnNetworkChanged",
+ NewRunnableMethod("net::WebSocketChannel::OnNetworkChangedTargetThread",
this,
- &WebSocketChannel::OnNetworkChanged),
+ &WebSocketChannel::OnNetworkChangedTargetThread),
NS_DISPATCH_NORMAL);
} else {
- nsresult rv = OnNetworkChanged();
+ nsresult rv = OnNetworkChangedTargetThread();
if (NS_FAILED(rv)) {
- LOG(("WebSocket: OnNetworkChanged failed (%08" PRIx32 ")",
+ LOG(("WebSocket: OnNetworkChangedTargetThread failed (%08" PRIx32 ")",
static_cast<uint32_t>(rv)));
}
}
}
}
}
return NS_OK;
}
nsresult
+WebSocketChannel::OnNetworkChangedTargetThread()
+{
+ LOG(("WebSocketChannel::OnNetworkChangedTargetThread() - on target thread %p", this));
+
+ if (!mDataStarted) {
+ LOG(("WebSocket: data not started yet, no ping needed"));
+ return NS_OK;
+ }
+
+ return mSocketThread->Dispatch(
+ NewRunnableMethod("net::WebSocketChannel::OnNetworkChanged",
+ this,
+ &WebSocketChannel::OnNetworkChanged),
+ NS_DISPATCH_NORMAL);
+}
+
+nsresult
WebSocketChannel::OnNetworkChanged()
{
- if (IsOnTargetThread()) {
- LOG(("WebSocketChannel::OnNetworkChanged() - on target thread %p", this));
-
- if (!mDataStarted) {
- LOG(("WebSocket: data not started yet, no ping needed"));
- return NS_OK;
- }
-
- return mSocketThread->Dispatch(
- NewRunnableMethod("net::WebSocketChannel::OnNetworkChanged",
- this,
- &WebSocketChannel::OnNetworkChanged),
- NS_DISPATCH_NORMAL);
- }
-
MOZ_ASSERT(OnSocketThread(), "not on socket thread");
LOG(("WebSocketChannel::OnNetworkChanged() - on socket thread %p", this));
if (mPingOutstanding) {
// If there's an outstanding ping that's expected to get a pong back
// we let that do its thing.
LOG(("WebSocket: pong already pending"));
diff --git a/netwerk/protocol/websocket/WebSocketChannel.h b/netwerk/protocol/websocket/WebSocketChannel.h
--- a/netwerk/protocol/websocket/WebSocketChannel.h
+++ b/netwerk/protocol/websocket/WebSocketChannel.h
@@ -146,16 +146,17 @@ private:
void EnqueueOutgoingMessage(nsDeque &aQueue, OutboundMessage *aMsg);
void PrimeNewOutgoingMessage();
void DeleteCurrentOutGoingMessage();
void GeneratePong(uint8_t *payload, uint32_t len);
void GeneratePing();
+ MOZ_MUST_USE nsresult OnNetworkChangedTargetThread();
MOZ_MUST_USE nsresult OnNetworkChanged();
MOZ_MUST_USE nsresult StartPinging();
void BeginOpen(bool aCalledFromAdmissionManager);
void BeginOpenInternal();
MOZ_MUST_USE nsresult HandleExtensions();
MOZ_MUST_USE nsresult SetupRequest();
MOZ_MUST_USE nsresult ApplyForAdmission();

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Wed Jul 07 13:50:05 UTC 2021 - Tristan Miller <psychonaut@nothingisreal.com>
- update to SeaMonkey 2.53.8
* Serious performance improvements and bug fixes tracked in bug
1633339 and bug 1711050.
* Language attributes with country codes not recognized when
building the Website Navigation Bar link toolbar bug 134436 and
bug 1709443.
* Optimize SeaMonkey icons for speed and optional higher quality for
branding bug 1362210 and bug 1699322.
* Support from= option when opening email compose window from the
command line bug 1628671.
* Update subject handling and GenericSendMessage function in compose
window bug 1693994.
* All message windows should update when view preferences are
changed bug 1694765.
* Improve marking of multiple messages as read / unread bug 1700530.
* Show version numbers again in the add-on manager by the partial
backout of bug 1161183.
* Update available networks in chatZilla (including adding
libera.chat)bug 1704392 and bug 1712505.
* Change default port for IRC via TLS/SSL to 6697 bug 1704280.
* Remove chatZilla and Lightning extension language packs and
incorpate localisations within the main language pack bug 1604663.
* Fix address drag and drop handling in compose window bug 1712002
and bug 1712227.
* Further fixes for legacy generators and the deprecated for each
statement in add-ons and the Add-on SDK bug 1702903.
* For developers, fork DOMi repo into main SeaMonkey one which means
no need to separately checkout the extension bug 1700003.
* SeaMonkey 2.53.8 uses the same backend as Firefox and contains the
relevant Firefox 60.8 security fixes.
* SeaMonkey 2.53.8 shares most parts of the mail and news code with
Thunderbird. Please read the Thunderbird 60.0 release notes for
specific changes and security fixes in this release.
* Additional important security fixes up to Current Firefox 78.11
ESR and a few enhancements have been backported. We will continue
to enhance SeaMonkey security in subsequent 2.53.x beta and
release versions as fast as we are able to.
- removed obsolete seamonkey-websocketloop.patch and
seamonkey-rustc-bootstrap.patch (now integrated upstream)
-------------------------------------------------------------------
Tue May 18 07:04:59 UTC 2021 - Tristan Miller <psychonaut@nothingisreal.com>

View File

@ -65,9 +65,9 @@ BuildRequires: git
BuildRequires: nasm >= 2.13
Provides: web_browser
Provides: browser(npapi)
Version: 2.53.7.1
Version: 2.53.8
Release: 0
%define releasedate 20210415000000
%define releasedate 20210630000000
Summary: An integrated web browser, composer, mail/news client, and IRC client
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
@ -86,8 +86,6 @@ Patch2: mozilla-language.patch
Patch3: mozilla-ntlm-full-path.patch
Patch4: seamonkey-lto.patch
Patch5: seamonkey-man-page.patch
Patch6: seamonkey-websocketloop.patch
Patch7: seamonkey-rustc-bootstrap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/sh coreutils
Provides: seamonkey-mail = %{version}
@ -220,8 +218,6 @@ cp %{SOURCE12} GNUmakefile
%patch3 -p2
%patch4 -p2
%patch5 -p0
%patch6 -p1
%patch7 -p1
cat << EOF > .mozconfig
mk_add_options MOZILLA_OFFICIAL=1
@ -414,7 +410,6 @@ rm -rf %{_tmppath}/translations.*
%{progdir}/extensions/modern@themes.mozilla.org.xpi
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
%{progdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
%{progdir}/pingsender
%{progdir}/fonts/
%{progdir}/isp/
%{progdir}/application.ini