diff options
author | Ivan Kozik <ivan@ludios.org> | 2019-10-22 19:40:34 +0000 |
---|---|---|
committer | Ivan Kozik <ivan@ludios.org> | 2019-10-23 03:54:39 +0000 |
commit | 908b24ea045bd08405183aaad8b84ecadae17071 (patch) | |
tree | d84c6b4f9452b18024d0a0765ce8d9d757788448 | |
parent | 1550417b51f21a948c0f813ba758737b75362cbd (diff) | |
download | nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar.gz nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar.bz2 nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar.lz nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar.xz nixlib-908b24ea045bd08405183aaad8b84ecadae17071.tar.zst nixlib-908b24ea045bd08405183aaad8b84ecadae17071.zip |
chromium: 77.0.3865.120 -> 78.0.3904.70
CVE-2019-13699 CVE-2019-13700 CVE-2019-13701 CVE-2019-13702 CVE-2019-13703 CVE-2019-13704 CVE-2019-13705 CVE-2019-13706 CVE-2019-13707 CVE-2019-13708 CVE-2019-13709 CVE-2019-13710 CVE-2019-13711 CVE-2019-15903 CVE-2019-13713 CVE-2019-13714 CVE-2019-13715 CVE-2019-13716 CVE-2019-13717 CVE-2019-13718 CVE-2019-13719 https://chromereleases.googleblog.com/2019/10/stable-channel-update-for-desktop_22.html
3 files changed, 12 insertions, 25 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 01793c4ee630..256e645bbd07 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -140,15 +140,6 @@ let ./patches/widevine.patch ] ++ optionals (channel == "dev") [ ./patches/widevine-79.patch - ] ++ optionals (channel == "stable") [ - # Revert "Implement GetFallbackFont on Linux" to fix a performance regression - # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed - (fetchpatch { - url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch"; - sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy"; - revert = true; - }) - # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. # Good sources for such patches and other hints: diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7bfb597e8055..8a3ae2a06a74 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -60,7 +60,7 @@ in let unpackCmd = let soPath = if upstream-info.channel == "stable" then - "./opt/google/chrome/libwidevinecdm.so" + "./opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" else if upstream-info.channel == "beta" then "./opt/google/chrome-beta/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" else if upstream-info.channel == "dev" then @@ -112,12 +112,8 @@ in let mkdir -p $out cp -a ${browser}/* $out/ chmod u+w $out/libexec/chromium - if [[ ${channel} != "dev" ]]; then - cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ - else - mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64 - cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/ - fi + mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64 + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/ '' else browser; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 06bf68778939..e2f1a6fc0fc5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0al26nfcxa00gvgn02iasjm53wq089r3c6b3rqqanljffng565y7"; - sha256bin64 = "0qfj08adqn19sxsgd98fy5l23cikvfkpzkz9mqq90mlabmhhrp0z"; - version = "78.0.3904.50"; + sha256 = "0qklm2wyixa5xkaykbxp71xix4h8gc2w4ng33afa2nynjx07kifx"; + sha256bin64 = "1y18fcql8sv0vg8zc97f1iasx660hhgdfpr3k1rlan8jzlzdnrkk"; + version = "78.0.3904.70"; }; dev = { - sha256 = "0ck52j5acdns7vqqvb665xpc68yl6qz0ca8lwjfhriw5hn8g1pjy"; - sha256bin64 = "073gxyfayrb1dqsq8ngmnrs8ajwwrr2qbs311ns64davn1z3sscf"; - version = "79.0.3928.4"; + sha256 = "01g05pqcxrk6110jfi8arkh4cq5y18n0mgbxrjd3acyirpl43s75"; + sha256bin64 = "1xm9fhqlc15wrz96f1zp00jwm1hkrjql41bbs95yvdmpdjvif34b"; + version = "79.0.3941.4"; }; stable = { - sha256 = "1y3ay0ppwakbw2hqrmxbv4ykil8dahf62ypld17ddkqxkfqgk4np"; - sha256bin64 = "0j1sk36nfmhx6nk8lmsdi93vcrmn58pidhb5hzkapx8mgk6xraq7"; - version = "77.0.3865.120"; + sha256 = "0qklm2wyixa5xkaykbxp71xix4h8gc2w4ng33afa2nynjx07kifx"; + sha256bin64 = "0vwgi8q0zs0aclvdi91g8b0knbrlaj6dwgzb0qh6c1n5blx0dmkm"; + version = "78.0.3904.70"; }; } |