Commit Graph

947 Commits

Author SHA1 Message Date
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Michael Weiss
eb335f697e
chromium: Warn about and cleanup old chromiumVersionAtLeast conditionals 2021-04-24 12:47:12 +02:00
Michael Weiss
a82f2a0146
ungoogled-chromium: 89.0.4389.114 -> 90.0.4430.85 2021-04-24 12:21:28 +02:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next 2021-04-24 00:16:17 +00:00
Michael Weiss
0dee033ce7
chromiumDev: Fix the configuration phase (#120464)
The Python 3 support still isn't ready...
2021-04-23 23:24:13 +02:00
Alyssa Ross
4f4d95bbc2
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyvex/default.nix
	pkgs/top-level/python-packages.nix
2021-04-23 13:49:12 +00:00
Michael Weiss
a75b5add13
chromiumDev: 91.0.4472.19 -> 92.0.4484.7 2021-04-23 12:03:56 +02:00
github-actions[bot]
481a9bc47c
Merge master into staging-next 2021-04-23 00:15:39 +00:00
Michael Weiss
6664b74af1
chromiumBeta: 90.0.4430.85 -> 91.0.4472.19 2021-04-22 21:18:26 +02:00
github-actions[bot]
120744d620
Merge master into staging-next 2021-04-22 12:06:24 +00:00
Michael Weiss
7495ee4f5f
chromiumDev: 91.0.4472.10 -> 91.0.4472.19 2021-04-22 12:04:15 +02:00
Martin Weinelt
6292be499b
Merge branch 'master' into staging-next 2021-04-22 00:54:14 +02:00
Michael Weiss
3b1b544b8f
Merge pull request #120056 from primeos/chromium
chromium: 90.0.4430.72 -> 90.0.4430.85
2021-04-21 22:31:44 +02:00
github-actions[bot]
799ebbc91d
Merge master into staging-next 2021-04-21 18:13:29 +00:00
Michael Weiss
a2dd59e0ff
chromium: 90.0.4430.72 -> 90.0.4430.85
https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_20.html

This update includes 7 security fixes. Google is aware of reports that
exploits for CVE-2021-21224 exist in the wild.

CVEs:
CVE-2021-21222 CVE-2021-21223 CVE-2021-21224 CVE-2021-21225
CVE-2021-21226
2021-04-21 15:03:11 +02:00
Michael Weiss
951e888cbd
chromiumBeta: 90.0.4430.72 -> 90.0.4430.85 2021-04-21 15:01:05 +02:00
Michael Weiss
80f4cce6fa
chromiumDev: Fix the patch phase 2021-04-21 15:00:14 +02:00
github-actions[bot]
d4f421cad9
Merge master into staging-next 2021-04-16 12:06:14 +00:00
Michael Weiss
37f8212780
chromiumDev: 91.0.4469.4 -> 91.0.4472.10 2021-04-16 11:45:58 +02:00
github-actions[bot]
9c190d28df
Merge master into staging-next 2021-04-15 12:06:13 +00:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Michael Weiss
6720b034aa
chromium: 89.0.4389.128 -> 90.0.4430.72
https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_14.html

This update includes 37 security fixes.

CVEs:
CVE-2021-21201 CVE-2021-21202 CVE-2021-21203 CVE-2021-21204
CVE-2021-21205 CVE-2021-21221 CVE-2021-21207 CVE-2021-21208
CVE-2021-21209 CVE-2021-21210 CVE-2021-21211 CVE-2021-21212
CVE-2021-21213 CVE-2021-21214 CVE-2021-21215 CVE-2021-21216
CVE-2021-21217 CVE-2021-21218 CVE-2021-21219
2021-04-15 00:53:31 +02:00
Michael Weiss
14ec94a2fe
chromiumBeta: 90.0.4430.70 -> 90.0.4430.72 2021-04-15 00:53:04 +02:00
Michael Weiss
96e4c599de
Merge pull request #119401 from primeos/chromium
chromium: 89.0.4389.114 -> 89.0.4389.128
2021-04-15 00:40:44 +02:00
github-actions[bot]
eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
Michael Weiss
de2edb81da
chromium: get-commit-message.py: Deduplicate the CVE list 2021-04-14 14:33:34 +02:00
Michael Weiss
a8937cc97b
chromium: 89.0.4389.114 -> 89.0.4389.128
https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop.html

This update includes 2 security fixes. Google is aware of reports that
exploits for CVE-2021-21206 and CVE-2021-21220 exist in the wild.

CVEs:
CVE-2021-21206 CVE-2021-21220
2021-04-14 10:49:34 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Michael Weiss
acf402b0c0
chromiumDev: Fix the build
Mixing Python 2 and Python 3 causes issues with the Python dependencies.
2021-04-13 13:30:54 +02:00
Michael Weiss
fc586861ee
chromiumBeta: 90.0.4430.61 -> 90.0.4430.70 2021-04-13 10:19:51 +02:00
Michael Weiss
8c60448e26
chromiumDev: Fix two build errors
Python 3 is now required (hard-coded in some scripts, but other scripts
still require Python 2) and a patch is required for [0].

[0]: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
2021-04-13 10:19:51 +02:00
Luke Granger-Brown
08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Michael Weiss
5d775bb2b0
chromiumBeta: Fix the build (#119087) 2021-04-11 10:43:29 +02:00
Michael Weiss
227efbd318
chromium: Fix the build (libva redefinition)
The recent libva 2.11.0 update (780fa55) broke the chromium and
ungoogled-chromium builds. Fix #118931.
2021-04-10 12:06:42 +02:00
Michael Weiss
5768ccf6fe
chromium{Beta,Dev}: Fix the linking
Linking with ThinLTO (required for CFI) was failing as I forgot use
stdenv from llvmPackages_12 in 166520812e (need to refactor that part).
2021-04-09 12:09:59 +02:00
Michael Weiss
d5fcfcb3de
chromiumDev: 91.0.4464.5 -> 91.0.4469.4 2021-04-09 12:09:58 +02:00
Gabriel Ebner
aa0b68b26a chromium: add explicit mesa dependency 2021-04-09 09:26:12 +02:00
Michael Weiss
705e5ae6fb
chromiumBeta: 90.0.4430.51 -> 90.0.4430.61 2021-04-08 16:13:28 +02:00
Sandro Jäckel
dcb501f993
kerberos: deprecate alias 2021-04-04 03:18:56 +02:00
Michael Weiss
d832cb56dd
Merge pull request #118166 from primeos/ungoogled-chromium
ungoogled-chromium: 89.0.4389.90 -> 89.0.4389.114
2021-04-02 23:05:08 +02:00
Michael Weiss
166520812e
chromium{Beta,Dev}: Use LLVM 12
LLVM 12 is required but the build still fails due to other changes that
where introduced in the meantime (and Chromium 90.0.4430.51 introduced
another LLVM failure).
2021-04-02 13:32:17 +02:00
Michael Weiss
985e98f4c4
chromiumDev: 91.0.4455.2 -> 91.0.4464.5 2021-04-01 20:17:45 +02:00
Michael Weiss
e8c1d93f49
chromiumBeta: 90.0.4430.40 -> 90.0.4430.51 2021-04-01 13:48:45 +02:00
Michael Weiss
d40c8f6279
ungoogled-chromium: 89.0.4389.90 -> 89.0.4389.114 2021-03-31 21:11:22 +02:00
Michael Weiss
9495de73dd
chromium: 89.0.4389.90 -> 89.0.4389.114
https://chromereleases.googleblog.com/2021/03/stable-channel-update-for-desktop_30.html

This update includes 8 security fixes.

CVEs:
CVE-2021-21194 CVE-2021-21195 CVE-2021-21196 CVE-2021-21197
CVE-2021-21198 CVE-2021-21199
2021-03-31 12:54:36 +02:00
Michael Weiss
dbdab5b83b
chromiumBeta: 90.0.4430.30 -> 90.0.4430.40 2021-03-25 14:55:51 +01:00
Michael Weiss
14efa32fa5
chromiumDev: 91.0.4449.6 -> 91.0.4455.2 2021-03-24 13:40:40 +01:00
Michael Weiss
33bd43d2ea
chromiumDev: 91.0.4442.4 -> 91.0.4449.6 2021-03-19 11:26:49 +01:00
Michael Weiss
622a4a2dd5
chromiumBeta: 90.0.4430.19 -> 90.0.4430.30 2021-03-18 13:11:08 +01:00
Michael Weiss
5e42fea124
chromiumBeta,chromiumDev: Mark as broken
The builds currently fail with (should work with LLVM 12 [0]):
../../base/check.h:88:3: error: 'nomerge' attribute cannot be applied to a declaration
  NOMERGE ~CheckError();
  ^       ~
../../base/compiler_specific.h:344:19: note: expanded from macro 'NOMERGE'
#define NOMERGE [[clang::nomerge]]
                  ^
1 error generated.

[0]: fb0f728805
2021-03-17 15:04:53 +01:00