mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-25 07:32:51 +00:00
Update GOST
Commit 81854066c6
("Remove odd crap from new tab page") fixed what most of removed diff adjustment tried to fix.
This commit is contained in:
parent
c20c59aaf8
commit
264aef5908
3 changed files with 4 additions and 32 deletions
4
.abf.yml
4
.abf.yml
|
@ -1,8 +1,8 @@
|
||||||
sources:
|
sources:
|
||||||
chromium-89.0.4389.90.tar.xz: d0826ac53536e82ec517468bd8f299340125bfe3
|
chromium-89.0.4389.90.tar.xz: d0826ac53536e82ec517468bd8f299340125bfe3
|
||||||
chromium-gost-88.0.4324.182.tar.gz: 7ca94ebb0dbd147c6f806100b520ffdd7e0ee851
|
chromium-gost-89.0.4389.82.tar.gz: a75dee803497d36bf2fe7ee31f7111f6a6aced89
|
||||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||||
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||||
msspi-0.1.42.tar.gz: 8b490baeea6839cac1bd44bae7940fa2f1828192
|
msspi-0.1.43.tar.gz: c02cf6ca4c99e5dcd340212c29512f02253cd3a2
|
||||||
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
|
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
|
||||||
xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022
|
xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022
|
||||||
|
|
|
@ -38,8 +38,8 @@
|
||||||
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
|
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
|
||||||
|
|
||||||
# GOST patches and sources
|
# GOST patches and sources
|
||||||
%define chromium_gost_ver 88.0.4324.182
|
%define chromium_gost_ver 89.0.4389.82
|
||||||
%define msspi_ver 0.1.42
|
%define msspi_ver 0.1.43
|
||||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||||
|
|
||||||
%define xcb_version 1.14.1
|
%define xcb_version 1.14.1
|
||||||
|
@ -84,7 +84,6 @@ Source999: new-system-icons.tar.xz
|
||||||
# GOST
|
# GOST
|
||||||
Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_ver}.tar.gz?/chromium-gost-%{chromium_gost_ver}.tar.gz
|
Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_ver}.tar.gz?/chromium-gost-%{chromium_gost_ver}.tar.gz
|
||||||
Source1102: https://github.com/deemru/msspi/archive/%{msspi_ver}.tar.gz?/msspi-%{msspi_ver}.tar.gz
|
Source1102: https://github.com/deemru/msspi/archive/%{msspi_ver}.tar.gz?/msspi-%{msspi_ver}.tar.gz
|
||||||
Source1103: gost-88-89.diff
|
|
||||||
|
|
||||||
# needs with gost
|
# needs with gost
|
||||||
# https://github.com/deemru/chromium-gost/blob/master/patch/chromium.patch
|
# https://github.com/deemru/chromium-gost/blob/master/patch/chromium.patch
|
||||||
|
@ -323,10 +322,6 @@ sed -i \
|
||||||
tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
|
tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
|
||||||
sed -i 's/ (Chromium GOST)//g' %{_gostsourcedir}/patch/chromium.patch
|
sed -i 's/ (Chromium GOST)//g' %{_gostsourcedir}/patch/chromium.patch
|
||||||
sed -i 's/Chromium GOST/Chromium/g' %{_gostsourcedir}/patch/chromium.patch
|
sed -i 's/Chromium GOST/Chromium/g' %{_gostsourcedir}/patch/chromium.patch
|
||||||
# adapt patch from v88 to v89
|
|
||||||
( cd %{_gostsourcedir}/patch
|
|
||||||
patch -p0 < %{SOURCE1103}
|
|
||||||
)
|
|
||||||
patch -p1 < %{_gostsourcedir}/patch/chromium.patch
|
patch -p1 < %{_gostsourcedir}/patch/chromium.patch
|
||||||
%patch1 -p1 -R
|
%patch1 -p1 -R
|
||||||
( cd ./third_party/boringssl/src
|
( cd ./third_party/boringssl/src
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
Adaptation of GOST patch from v88 to v89
|
|
||||||
|
|
||||||
Upstream commit https://github.com/chromium/chromium/commit/aa2a8b5fb112e7e0d90 changed the code.
|
|
||||||
--- chromium.patch.orig 2021-03-07 21:10:32.163222162 +0300
|
|
||||||
+++ chromium.patch 2021-03-07 21:10:16.723847910 +0300
|
|
||||||
@@ -349,14 +349,14 @@
|
|
||||||
index d0b91b754498..8edc5d0c393e 100644
|
|
||||||
--- a/net/socket/socket.h
|
|
||||||
+++ b/net/socket/socket.h
|
|
||||||
-@@ -18,6 +18,9 @@ class IOBuffer;
|
|
||||||
- // Represents a read/write socket.
|
|
||||||
+@@ -22,6 +22,9 @@
|
|
||||||
class NET_EXPORT Socket {
|
|
||||||
public:
|
|
||||||
+ Socket();
|
|
||||||
+#ifndef NO_GOSTSSL
|
|
||||||
+ virtual int IsMSSPI() { return 0; }
|
|
||||||
+#endif // GOSTSSL
|
|
||||||
- virtual ~Socket() {}
|
|
||||||
+ virtual ~Socket();
|
|
||||||
|
|
||||||
// Reads data, up to |buf_len| bytes, from the socket. The number of bytes
|
|
||||||
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
|
|
Loading…
Add table
Reference in a new issue