From 33052db79121138116094c73a01f98b9d95f42b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Sat, 4 Apr 2020 15:53:05 +0300 Subject: [PATCH] Updated to 80.0.3987.163 --- .abf.yml | 6 +++--- Makefile.gost | 30 ------------------------------ chromium-browser-stable.spec | 6 +++--- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 Makefile.gost diff --git a/.abf.yml b/.abf.yml index 4950744..ce2837d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,7 @@ sources: - chromium-80.0.3987.149.tar.xz: 9329edd5c55078f20a1fddd7e6fb79c78c2240e9 - chromium-gost-4232a74fcd4458ff17e273c5cfb99804906b9085.tar.gz: 30e8e423cdd2e1a64cb1ae2c2915d1cb1b8afa0e + chromium-80.0.3987.163.tar.xz: 10d06118d2d6cd2a244e2737d939536f3d3ea287 + chromium-gost-87eb6320b6bd28d3c26ae498c85832539fd2dfa8.tar.gz: 972627c899bc00b6040ed005133654c377350975 depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 - msspi-299e461b3a2be5f8118407359a616a1ed4b7798e.tar.gz: c77fceff95f90ebfa205c1b82b46495443aa4b23 + msspi-c3f967aedd8e40134a6d70e424d29398599d7cc7.tar.gz: d5723193114c59bc5623f76a90a6f46b3f710816 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 diff --git a/Makefile.gost b/Makefile.gost deleted file mode 100644 index e39f66c..0000000 --- a/Makefile.gost +++ /dev/null @@ -1,30 +0,0 @@ -# Put https://github.com/deemru/chromium-gost with msspi submodule to %{_gostsourcedir} -# Run this as: -# make -C Makefile.gost SDIR=%{_gostsourcedir} CC=%{__cc} CXX=%{__cxx} CFLAGS=%{optflags} -# Idea how to build this originates from ALT Linux - -SDIR ?= chromium-gost -OUTDIR ?= . -TMPDIR ?= $(shell mktemp -d) -CC ?= gcc -CXX ?= g++ -CRYPTOPRO_MAJOR_VERSION ?= 4 -CFLAGS ?= -O2 -g -GOSTCFLAGS ?= - -make: - cd $(TMPDIR) ; \ - ar r empty.a ; \ - $(CC) -shared empty.a -Wl,-soname=libcapi20.so.$(CRYPTOPRO_MAJOR_VERSION) -o libcapi20.so ; \ - $(CC) -shared empty.a -Wl,-soname=libcapi10.so.$(CRYPTOPRO_MAJOR_VERSION) -o libcapi10.so - - $(CXX) $(CFLAGS) $(GOSTCFLAGS) \ - -Wall -Wl,--no-as-needed -std=c++11 -fPIC -shared -s -Werror -Wno-unused-function -ldl \ - $(SDIR)/src/gostssl.cpp \ - $(SDIR)/src/msspi/src/msspi.cpp \ - -I $(SDIR)/src/msspi/src \ - -I $(SDIR)/src/msspi/third_party/cprocsp/include \ - -I third_party/boringssl/src/include \ - -lcapi10 -lcapi20 \ - -L$(TMPDIR) \ - -o $(OUTDIR)/libgostssl.so diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 2a62b84..de98f65 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -41,13 +41,13 @@ %define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ # GOST patches and sources -%define chromium_gost_commit 4232a74fcd4458ff17e273c5cfb99804906b9085 -%define msspi_commit 299e461b3a2be5f8118407359a616a1ed4b7798e +%define chromium_gost_commit 87eb6320b6bd28d3c26ae498c85832539fd2dfa8 +%define msspi_commit c3f967aedd8e40134a6d70e424d29398599d7cc7 %define _gostsourcedir %{_builddir}/chromium-gost Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 80.0.3987.149 +Version: 80.0.3987.163 Release: 1 License: BSD, LGPL Group: Networking/WWW