Fix GOST on v89, avoid different SRPMs on different architectures

chromium-browser-stable.spec

@@ -81,10 +81,10 @@ Source100:	icons.tar.bz2
 Source997:	depot_tools.tar.xz
 Source999:	new-system-icons.tar.xz
 
-%if %{with gost}
+# GOST
 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
-%endif
+Source1103: gost-88-89.diff
 
 # needs with gost
 # https://github.com/deemru/chromium-gost/blob/master/patch/chromium.patch
@@ -323,6 +323,10 @@ sed -i \
 tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
 sed -i 's/ (Chromium GOST)//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
 %patch1 -p1 -R
 ( cd ./third_party/boringssl/src

gost-88-89.diff

@@ -0,0 +1,23 @@
+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