update to 85.0.4183.121 && apply upstream fix for networking issue with CookieMonster

epel8
Tom Callaway 4 years ago
parent 1cf910d43f
commit 60b6ca24d4

@ -0,0 +1,30 @@
diff -up chromium-85.0.4183.102/net/cookies/cookie_monster.cc.fixme chromium-85.0.4183.102/net/cookies/cookie_monster.cc
--- chromium-85.0.4183.102/net/cookies/cookie_monster.cc.fixme 2020-09-21 14:52:06.606722391 -0400
+++ chromium-85.0.4183.102/net/cookies/cookie_monster.cc 2020-09-21 14:53:40.247366159 -0400
@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator Cooki
// |num_keys_| counter.
bool different_prev =
inserted == cookies_.begin() || std::prev(inserted)->first != key;
- bool different_next =
- inserted == cookies_.end() || std::next(inserted)->first != key;
- if (different_prev && different_next)
+ // According to std::multiqueue documentation:
+ // "If the container has elements with equivalent key, inserts at the upper
+ // bound of that range. (since C++11)"
+ // This means that "inserted" iterator either points to the last element in
+ // the map, or the element succeeding it has to have different key.
+ DCHECK(std::next(inserted) == cookies_.end() ||
+ std::next(inserted)->first != key);
+ if (different_prev)
++num_keys_;
return inserted;
@@ -1373,7 +1378,7 @@ void CookieMonster::InternalDeleteCookie
bool different_prev =
it == cookies_.begin() || std::prev(it)->first != it->first;
bool different_next =
- it == cookies_.end() || std::next(it)->first != it->first;
+ std::next(it) == cookies_.end() || std::next(it)->first != it->first;
if (different_prev && different_next)
--num_keys_;

@ -177,7 +177,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else %else
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
%endif %endif
Version: %{majorversion}.0.4183.102 Version: %{majorversion}.0.4183.121
Release: 1%{?dist} Release: 1%{?dist}
%if %{?freeworld} %if %{?freeworld}
%if %{?shared} %if %{?shared}
@ -285,7 +285,8 @@ Patch80: chromium-85-DelayNode-cast.patch
Patch81: chromium-85-NearbyShareEncryptedMetadataKey-include.patch Patch81: chromium-85-NearbyShareEncryptedMetadataKey-include.patch
# https://chromium.googlesource.com/chromium/src/+/17edd5225a9e6a388a9560efe20362a1a0d86694 # https://chromium.googlesource.com/chromium/src/+/17edd5225a9e6a388a9560efe20362a1a0d86694
Patch82: chromium-85.0.4183.83-gcc-not-auto.patch Patch82: chromium-85.0.4183.83-gcc-not-auto.patch
# https://github.com/chromium/chromium/commit/53478caee862624fc6d73516f8d64253854b146f
Patch83: chromium-85.0.4183.102-invalid-end-CookieMonster-53478ca.patch
# Use lstdc++ on EPEL7 only # Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@ -905,6 +906,7 @@ udev.
%patch80 -p1 -b .DelayNode-cast %patch80 -p1 -b .DelayNode-cast
%patch81 -p1 -b .NearbyShareEncryptedMetadataKey-include %patch81 -p1 -b .NearbyShareEncryptedMetadataKey-include
%patch82 -p1 -b .gcc-not-auto %patch82 -p1 -b .gcc-not-auto
%patch83 -p1 -b .invalid-end-CookieMonster
# Fedora branded user agent # Fedora branded user agent
%if 0%{?fedora} %if 0%{?fedora}
@ -1922,6 +1924,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog %changelog
* Mon Sep 21 2020 Tom Callaway <spot@fedoraproject.org> - 85.0.4183.121-1
- update to 85.0.4183.121
- apply upstream fix for networking issue with CookieMonster
* Tue Sep 8 2020 Tom Callaway <spot@fedoraproject.org> - 85.0.4183.102-1 * Tue Sep 8 2020 Tom Callaway <spot@fedoraproject.org> - 85.0.4183.102-1
- update to 85.0.4183.102 - update to 85.0.4183.102
- install ANGLE so files (libEGL.so, libGLESv2.so) - install ANGLE so files (libEGL.so, libGLESv2.so)

@ -20,4 +20,4 @@ SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a7813786
SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708 SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
SHA512 (chromium-85.0.4183.102-clean.tar.xz) = 5a08d61061b226fa8f88641b47706707822280e137518cd3cc7837089a7207a9c003821a6a3b901e275587d6f7fd2dbdc5a3ae66291d4a3e8e574ecb2742cfa6 SHA512 (chromium-85.0.4183.121-clean.tar.xz) = 32d91d91c4fee52b278b18eaa757c1cea069e77c3aa577311a8c47f3d2136f4cd814250ff81f8e296b45ab15ce2fdfb2aff00676ca69ecc38d7e1019d61885c0

Loading…
Cancel
Save