From 688d6d243589cc57e326e2b2eca52329db7997aa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 21 Mar 2022 20:29:10 +0100 Subject: [PATCH 1/2] chromium: get-commit-message.py: Support releases with 0 security fixes Wow, a Chrome release without any (known!) security fixes: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_20.html --- .../networking/browsers/chromium/get-commit-message.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b935..833b6b8283d0 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fixes\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): From 073c33c3a6f9283e47f59758ac9155b71ed34f71 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 2/2] chromiumBeta: 101.0.4951.15 -> 101.0.4951.26 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b83aae6c34be..a27752bda8a6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", + "version": "101.0.4951.26", + "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", + "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", "deps": { "gn": { "version": "2022-03-14",