summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* u-boot: embiggen RPi kernel allocation again, again•••(cherry picked from commit ff391e0f0d2a12bc8ee80b5d683cefe4b5f54736) origin/backport-174762-to-release-21.11K9002022-05-291-7/+7
* Merge pull request #175175 from NixOS/backport-173132-to-release-21.11•••[Backport release-21.11] sigi: 3.3.0 -> 3.4.0Rick van Schijndel2022-05-281-3/+3
|\
| * sigi: 3.3.0 -> 3.4.0•••(cherry picked from commit 96467f286f85f0d937ec3c4e8c02c5d84a8358e8) hiljusti2022-05-281-3/+3
|/
* mastodon: 3.5.2 -> 3.5.3•••(cherry picked from commit db795b8f2b7c6d315f50acba15c0491b4f0f1907) Kerstin Humm2022-05-274-86/+65
* Merge pull request #174812 from NixOS/backport-174773-to-release-21.11•••[Backport release-21.11] Linux kernel updates 2022-05-25Maximilian Bosch2022-05-278-44/+44
|\
| * linux/hardened/patches/5.4: 5.4.195-hardened1 -> 5.4.196-hardened1•••(cherry picked from commit 75f4c627752abc98bc2e25f9e754856ff864e021) Maximilian Bosch2022-05-261-5/+5
| * linux/hardened/patches/5.17: 5.17.9-hardened1 -> 5.17.11-hardened1•••(cherry picked from commit ec4b2a871ddc77c26d309bb116786bddcd9975dc) Maximilian Bosch2022-05-261-5/+5
| * linux/hardened/patches/5.15: 5.15.41-hardened1 -> 5.15.43-hardened1•••(cherry picked from commit e97b03a780de6ae4f877d6c0092258555d713001) Maximilian Bosch2022-05-261-5/+5
| * linux/hardened/patches/5.10: 5.10.117-hardened1 -> 5.10.118-hardened1•••(cherry picked from commit d8d0dd929e55bbbaeb8044fdb7ebe365b1faea68) Maximilian Bosch2022-05-261-5/+5
| * linux/hardened/patches/4.19: 4.19.244-hardened1 -> 4.19.245-hardened1•••(cherry picked from commit 63192641bb82315f5484ace66b6e1c336c73bda2) Maximilian Bosch2022-05-261-5/+5
| * linux/hardened/patches/4.14: 4.14.280-hardened1 -> 4.14.281-hardened1•••(cherry picked from commit 08daee172eb0143f01656f69d093330fc42ac9a3) Maximilian Bosch2022-05-261-5/+5
| * linux: 5.4.195 -> 5.4.196•••(cherry picked from commit d505557a2916803206da007b8d925299eb672d62) Maximilian Bosch2022-05-261-2/+2
| * linux: 5.17.9 -> 5.17.11•••(cherry picked from commit c57d757e1bec95bf22a4b6d5a47ed53f6a8fcc0d) Maximilian Bosch2022-05-261-2/+2
| * linux: 5.15.41 -> 5.15.43•••(cherry picked from commit bc0db57d5398c6b66c39e15465a51b299e1174ac) Maximilian Bosch2022-05-261-2/+2
| * linux: 5.10.117 -> 5.10.118•••(cherry picked from commit ec5629f3f2910c4475b7af27c87112a96d32ec00) Maximilian Bosch2022-05-261-2/+2
| * linux: 4.9.315 -> 4.9.316•••(cherry picked from commit 110b58f77ef304c23a3cbaf2a06cb92dcd79ca0c) Maximilian Bosch2022-05-261-2/+2
| * linux: 4.19.244 -> 4.19.245•••(cherry picked from commit b5c4a60bbec652e964afff309686a38097a21b1d) Maximilian Bosch2022-05-261-2/+2
| * linux: 4.14.280 -> 4.14.281•••(cherry picked from commit f2e1f34e4c258e6a41768113252fea6a35d8d30f) Maximilian Bosch2022-05-261-2/+2
|/
* Merge pull request #174780 from NixOS/backport-174623-to-release-21.11•••[Backport release-21.11] ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61Michael Weiss2022-05-262-11/+10
|\
| * ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61•••(cherry picked from commit 6226fc5cf05b14c81517a1ea7119564efcdfb9b9) origin/backport-174623-to-release-21.11Michael Weiss2022-05-262-11/+10
* | Merge pull request #174781 from NixOS/backport-174338-to-release-21.11•••[Backport release-21.11] chromium: 101.0.4951.64 -> 102.0.5005.61Michael Weiss2022-05-261-10/+10
|\ \ | |/ |/|
| * chromium: 101.0.4951.64 -> 102.0.5005.61•••https://chromereleases.googleblog.com/2022/05/stable-channel-update-for-desktop_24.html This update includes 32 security fixes. CVEs: CVE-2022-1853 CVE-2022-1854 CVE-2022-1855 CVE-2022-1856 CVE-2022-1857 CVE-2022-1858 CVE-2022-1859 CVE-2022-1860 CVE-2022-1861 CVE-2022-1862 CVE-2022-1863 CVE-2022-1864 CVE-2022-1865 CVE-2022-1866 CVE-2022-1867 CVE-2022-1868 CVE-2022-1869 CVE-2022-1870 CVE-2022-1871 CVE-2022-1872 CVE-2022-1873 CVE-2022-1874 CVE-2022-1875 CVE-2022-1876 (cherry picked from commit e48814a245e08d8af5441d27a78b63701c1ba7ec) origin/backport-174338-to-release-21.11Michael Weiss2022-05-261-10/+10
|/
* Merge pull request #174703 from primeos/chromium-backport•••[21.11] Prepare for backporting Chromium M102Michael Weiss2022-05-264-14/+70
|\
| * chromiumBeta: Fix the build•••The build was failing with: [4758/49762] ACTION //third_party/dawn/src/dawn/common:dawn_version_gen__json_tarball(//build/toolchain/linux/unbundle:default)Ke:default)ux/unbundle:default)[Kuide/optimization_guide_internals/resources/optimization_guide_internals.mojom-webui.js FAILED: gen/third_party/dawn/dawn_version_gen.json_tarball python3 ../../third_party/dawn/generator/dawn_version_generator.py --dawn-dir ../../third_party/dawn/ --template-dir /build/chromium-102.0.5005.49/third_party/dawn/generator/templates --jinja2-path /build/chromium-102.0.5005.49/third_party/jinja2 --output-json-tarball gen/third_party/dawn/dawn_version_gen.json_tarball --depfile gen/third_party/dawn/dawn_version_gen.json_tarball.d --expected-outputs-file gen/third_party/dawn/dawn_version_gen.expected_outputs --allowed-output-dirs-file gen/third_party/dawn/dawn_version_gen.allowed_output_dirs Traceback (most recent call last): [...] FileNotFoundError: [Errno 2] No such file or directory: 'git' [4761/49762] ACTION //third_party/blink/renderer/bindings:generate_bindings_all(//build/toolchain/linux/unbundle:default)fault) ninja: build stopped: subcommand failed. More details here: https://bugs.chromium.org/p/chromium/issues/detail?id=1321370 The patch doesn't apply to M102 so I had to cherry-pick it manually. (cherry picked from commit 37a13a3d4d838de3faa2431aab52bf19b5ca4930) Michael Weiss2022-05-262-0/+47
| * chromiumDev: 103.0.5042.0 -> 103.0.5056.0•••(cherry picked from commit e1fb27152d5d107f54dedc616ee4adbd6e7ae890) Michael Weiss2022-05-261-6/+6
| * chromiumBeta: 102.0.5005.40 -> 102.0.5005.49•••(cherry picked from commit 46a14c6a370f36c395261c59af356976145482b3) Michael Weiss2022-05-261-3/+3
| * chromiumDev: 103.0.5028.0 -> 103.0.5042.0•••(cherry picked from commit fdeff962623f3d161d93c18db6ed8475b0fe2b07) Michael Weiss2022-05-261-6/+6
| * chromiumBeta: 102.0.5005.27 -> 102.0.5005.40•••(cherry picked from commit e1ae57055baa91b537bff1174624bb6544148932) Michael Weiss2022-05-261-3/+3
| * chromiumBeta: Fix a compilation error•••LLVM 14 doesn't support those build flags yet (-no-opaque-pointers is the argument for -Xclang): error: unknown argument: '-no-opaque-pointers' Those build flags were added in the following commit: https://source.chromium.org/chromium/chromium/src/+/003067c130958bb2f867324cd675b4e5d1efbf00 (cherry picked from commit 7f684c2ba0a35ecdee3c1dcc5fb15e0fcb4be581) Michael Weiss2022-05-261-0/+4
| * chromiumBeta: Fix the configuration phase•••This fixes the following error: configuring ERROR at //infra/orchestrator/BUILD.gn:38:17: Could not read file. pydeps_file = "//third_party/blink/tools/merge_web_test_results.pydeps" ^-------------------------------------------------------- I resolved this to "/build/chromium-102.0.5005.27/third_party/blink/tools/merge_web_test_results.pydeps". See //infra/orchestrator/BUILD.gn:37:1: whence it was called. python_library("blink_merge_web_test_results_py") { ^-------------------------------------------------- See //BUILD.gn:89:5: which caused the file to be included. "//infra/orchestrator:orchestrator_all", ^-------------------------------------- It's a known upstream issue when building from the generated tarballs: - https://bugs.chromium.org/p/chromium/issues/detail?id=1313361 - https://chromium-review.googlesource.com/c/chromium/src/+/3457503 (cherry picked from commit 73e094bf3cdb836c3afa48bfd3628af980bb6f3e) Michael Weiss2022-05-261-1/+5
| * google-chrome: remove legacy ? null•••(cherry picked from commit 60c44828720168f1ddf307540ebb3ffad03f2b46) Sandro Jäckel2022-05-261-1/+1
| * chromiumBeta: 101.0.4951.41 -> 102.0.5005.27•••(cherry picked from commit b446b38810c283b427c88dcf23f05a48e978b18b) Michael Weiss2022-05-261-6/+6
| * chromiumDev: 102.0.5005.22 -> 103.0.5028.0•••(cherry picked from commit 2f3629b3abdc0a1a4a8b68114ef2e564239b8860) Michael Weiss2022-05-261-6/+6
| * chromiumDev: 102.0.5005.12 -> 102.0.5005.22•••(cherry picked from commit 9cdfc7d6121711b5a56fc727963261eacb84d7c4) Michael Weiss2022-05-261-3/+3
| * chromiumDev: Fix the patch phase•••This fixes the following error during patchShebangs: ./third_party/dawn/third_party/webgpu-cts/tools/run_deno: unsupported interpreter directive "#!/usr/bin/env -S deno run --unstable --allow-read --allow-write --allow-env --allow-net=deno.land --no-check" (set dontPatchShebangs=1 and handle shebang patching yourself) (cherry picked from commit 3e8d4d62374cd66b4e8dd000857c09cb830f227b) Michael Weiss2022-05-261-0/+1
* | Merge pull request #174584 from oxzi/logrotate-3.20.1-21.11•••[Backport release-21.11] logrotate: fix CVE-2022-1348ajs1242022-05-262-0/+77
|\ \ | |/ |/|
| * logrotate: fix CVE-2022-1348Alvar Penning2022-05-262-0/+77
* | linuxPackages.vendor-reset: enable parallel building•••Tested at -j48. (cherry picked from commit 9dab6bc07744790f5ca081fd9af07db1547bfaf5) Alyssa Ross2022-05-251-0/+2
* | linuxPackages.vendor-reset: patch for Linux 5.18•••(cherry picked from commit d851e2f78a2c270e0f8ba1954cd884830796c8d0) Alyssa Ross2022-05-251-1/+10
* | linuxPackages.netatop: fix build with Linux 5.18•••With 5.18, implicit fallthrough is an error, and netatop hasn't caught up yet. (cherry picked from commit 197e9ba286917cf32ed85efa117a14285b21a998) Alyssa Ross2022-05-251-0/+1
* | Merge pull request #174310 from NixOS/backport-174280-to-release-21.11•••[Backport release-21.11] element-{web,desktop}: 1.10.12 -> 1.10.13Pascal Bach2022-05-252-5/+5
|\ \ | |/ |/|
| * element-{web,desktop}: 1.10.12 -> 1.10.13•••(cherry picked from commit 402e5fe40d1184154e6ace4d2743fe53e7e83842) Sumner Evans2022-05-242-5/+5
* | Merge pull request #174427 from wamserma/backport-173474-to-release-21.11•••[21.11] zoom-us: 5.9.6.2225 -> 5.10.6.3192 (x86_64-linux)/5.10.4.6592 (darwin) (backport, security)Doron Behar2022-05-251-4/+36
|\ \
| * | zoom-us: 5.10.4.2845 -> 5.10.6.3192 on x86_64-linux•••Fixes #174147 (cherry picked from commit 1b27e162e537681b318b4610d0bffb2a74c47b70) Sebastian Reuße2022-05-251-2/+2
| * | zoom-us: change wrapper name to fix IPC•••(cherry picked from commit fa585a07f65f4ee954758c67db6c75463a6f6560) Thomas Nixon2022-05-251-1/+3
| * | zoom: add dep for udev, fix launching•••(cherry picked from commit 215155b44065e6b2652535f720fa04ac20e8980f) Will Dietz2022-05-251-1/+3
| * | zoom-us: Update dependencies•••(cherry picked from commit 5791f1c43f97a00ed4c6daf2394e759448620636) Clemens Lutz2022-05-251-0/+19
| * | zoom-us: 5.9.6.2225 -> 5.10.4.2845 on x86_64-linux•••(cherry picked from commit bb17d93a56ae3bc47255c6f2136f56afee87d231) Thomas Nixon2022-05-251-2/+11
|/ /
* | Merge pull request #174262 from NixOS/backport-174220-to-release-21.11•••[Backport release-21.11] pantheon.gala: save/restore easing on workspace switchBobby Rong2022-05-251-0/+8
|\ \
| * | pantheon.gala: save/restore easing on workspace switch•••(cherry picked from commit 7d48c204efd169837a75c752d8c13515388c2a1b) Bobby Rong2022-05-241-0/+8